Hi All,
I am new to this field. we are developing a embedded PC based on Celeron PC
of 1 GHZ frequency. i have following queries regarding BISO
1. If I am new, how long it takes to write BIOS for embedded PC?
2. What knowledge is need to write BISO?
3. Suppose i purchase BIOS from AMI, Award or Phoenix, do i customize BIOS
according to my Board.
4. What tools are needed to write BIOS?
5. From where do i get complete understating of BIOS?
6.I have ARM7 LPC Board. Can I write Sample BIOS for this Board?
7. What is difference between BIOS and Boot Loader?
I would be very much grateful if any body address this questions
Lots of thanks in advance
Dharmendra
3
2
I hava a ppc board and want to port openbios to firmware..
I do on my host (x86) freebsd machine
config/scripts/switch-arch cross-ppc
gmake
and then?
how do it next?
I didn't found a ppcboot image in obj-ppc dirc.
sorry.I am a newbie..trouble you .
--
Best regards,
Tongyi ,Zhao
1
1
I have read README file
and
#config/scripts/switch-arch cross-ppc
#gmake
/usr/local/bin/xsltproc
Building OpenBIOS on x86 for ppc
Cleaning up... ok
Initializing build tree...ok.
Creating target Makefile...ok.
Creating config files...ok.
Building...error:
gmake[1]: Entering directory `/usr/home/icesky/openbios-devel'
gcc -Os -Wall -W -DFCOMPILER -DBOOTSTRAP -USWAP_ENDIANNESS
-DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -Iinclude -Ikernel/include
-Iobj-ppc/target/include -c -o obj-ppc/host/kernel/bootstrap.o
kernel/bootstrap.c
In file included from include/openbios/sysinclude.h:5,
from kernel/bootstrap.c:9:
obj-ppc/target/include/asm/types.h:34:20: endian.h: No such file or
directory
gmake[1]: *** [obj-ppc/host/kernel/bootstrap.o] Error 1
gmake[1]: Leaving directory `/usr/home/icesky/openbios-devel'
I check the types.h
/* endianess */
#ifdef HAVE_ENDIAN_H
#include <endian.h>
#else
#include <machine/endian.h>
#endif
--
Best regards,
Tongyi ,Zhao
1
1
Wei.Zhang(a)freescale.com wrote:
>Hi, friends,
>
>I'm a newbie to OpenBIOS, and I want to make OpenBIOS on cross-ppc architecture. But I got below error messages:
>
>Building OpenBIOS on x86 for ppc
>Cleaning up... ok
>Initializing build tree...ok.
>Creating target Makefile...runtime error: file config/xml/dictionary.xsl line 13 element param
>Unexpected XSLT element 'param'.
>runtime error: file config/xml/dictionary.xsl line 22 element if
>Variable 'conditions' has not been declared.
>make: *** [xml] Error 10
>
>How to fix it?
>
>Thanks!
>
>Best Regards,
>Zhang Wei
>
>
>
I don't have a host-system handy on which to test, so this is just a
guess but...
Did you remember to run "make configure" (or "make config" --
different host environments
seem to have a preference one wya or the other) first?
--
David L. Paktor DLPaktor(a)netscape.net
2
1
I have a emedded machine,I want to know if openbios can redirect information
to the serial?
2
1
Hi, friends,
I'm a newbie to OpenBIOS, and I want to make OpenBIOS on cross-ppc architecture. But I got below error messages:
Building OpenBIOS on x86 for ppc
Cleaning up... ok
Initializing build tree...ok.
Creating target Makefile...runtime error: file config/xml/dictionary.xsl line 13 element param
Unexpected XSLT element 'param'.
runtime error: file config/xml/dictionary.xsl line 22 element if
Variable 'conditions' has not been declared.
make: *** [xml] Error 10
How to fix it?
Thanks!
Best Regards,
Zhang Wei
1
0
Hi Friends,
I like to know whether openbios supports CPC700 (IBM) based mspruce board.
I browsed openbios directory and found no reference to CPC700.
Can you provide some pointer for any monitor that supports CPC700?
Thanking you,
Regards,
Suresh
1
0
Author: stepan
Date: 2006-10-31 00:06:43 +0100 (Tue, 31 Oct 2006)
New Revision: 113
Modified:
fcode-utils/Makefile
Log:
fix test log path
Modified: fcode-utils/Makefile
===================================================================
--- fcode-utils/Makefile 2006-10-30 22:09:59 UTC (rev 112)
+++ fcode-utils/Makefile 2006-10-30 23:06:43 UTC (rev 113)
@@ -51,7 +51,8 @@
cp toke/toke testsuite
cp detok/detok testsuite
cp romheaders/romheaders testsuite
- make -C testsuite all CygTestLogs=`pwd`/testlogs
+ make -C testsuite all CygTestLogs=`pwd`/testlogs/testlogs-ppc-linux
+ #make -C testsuite all CygTestLogs=`pwd`/testlogs/testlogs-x86-cygwin
# lcov required for html reports
coverage:
1
0
Author: stepan
Date: 2006-10-30 23:09:59 +0100 (Mon, 30 Oct 2006)
New Revision: 112
Added:
fcode-utils/testsuite/GenCoverage
Modified:
fcode-utils/Makefile
Log:
fix automated coverage
Modified: fcode-utils/Makefile
===================================================================
--- fcode-utils/Makefile 2006-10-30 17:55:20 UTC (rev 111)
+++ fcode-utils/Makefile 2006-10-30 22:09:59 UTC (rev 112)
@@ -21,6 +21,8 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
#
+VERSION:=$(shell grep ^\#.*TOKE_VERSION < toke/toke.c |cut -f2 -d\" )
+
all:
make -C toke
make -C detok
@@ -51,6 +53,10 @@
cp romheaders/romheaders testsuite
make -C testsuite all CygTestLogs=`pwd`/testlogs
+# lcov required for html reports
+coverage:
+ @testsuite/GenCoverage . fcode-suite-$(VERSION) "FCode suite $(VERSION)"
+ @testsuite/GenCoverage toke toke-$(VERSION) "Toke $(VERSION)"
.PHONY: all clean distclean toke detok romheaders tests
Added: fcode-utils/testsuite/GenCoverage
===================================================================
--- fcode-utils/testsuite/GenCoverage (rev 0)
+++ fcode-utils/testsuite/GenCoverage 2006-10-30 22:09:59 UTC (rev 112)
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+SRCDIR=$1
+DSTDIR=$2
+BASENAME=$DSTDIR
+TITLE="$3"
+
+printf "Generating info file..."
+geninfo -t $BASENAME -o $BASENAME.info $SRCDIR 2>/dev/null
+printf "ok\n"
+
+printf "Filtering info file..."
+sed -i "/stat\.h/ {
+N
+N
+N
+N
+d
+}" $BASENAME.info
+printf "ok\n"
+
+genhtml --output-directory $DSTDIR --show-details --highlight --legend --frames --title "$TITLE" $BASENAME.info
+
+
Property changes on: fcode-utils/testsuite/GenCoverage
___________________________________________________________________
Name: svn:executable
+ *
1
0
Author: stepan
Date: 2006-10-30 17:58:53 +0100 (Mon, 30 Oct 2006)
New Revision: 109
Added:
fcode-utils/documentation/
fcode-utils/documentation/detok.html
fcode-utils/documentation/localvalues.html
fcode-utils/documentation/toke.html
fcode-utils/documentation/workbook.css
Modified:
fcode-utils/README
Log:
add documentation
Modified: fcode-utils/README
===================================================================
--- fcode-utils/README 2006-10-30 16:29:59 UTC (rev 108)
+++ fcode-utils/README 2006-10-30 16:58:53 UTC (rev 109)
@@ -8,8 +8,9 @@
- localvalues
NOTE: all parts of the OpenBIOS FCODE suite are GPL v2, except the localvalues
-implementation which is released under the Common Public License (CPL) version
-1.0 (see: http://www.opensource.org/licenses/cpl1.0.php)
+implementation and parts of the documentation which are released under the
+Common Public License (CPL) version 1.0
+(see: http://www.opensource.org/licenses/cpl1.0.php)
For information please contact info(a)coresystems.de
Added: fcode-utils/documentation/detok.html
===================================================================
--- fcode-utils/documentation/detok.html (rev 0)
+++ fcode-utils/documentation/detok.html 2006-10-30 16:58:53 UTC (rev 109)
@@ -0,0 +1,343 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<!-- ESWDESDOCFILE %Z%%M% %I% %W% %G% %U% -->
+ <title>ESW PART-FW: OpenBIOS DeTokenizer detok (A User's Guide)</title>
+ <link rel="stylesheet" type="text/css"
+ href="workbook.css">
+</head>
+<body>
+<h1 style="text-align: center;" class="title"><a class="mozTocH1"
+ name="mozTocId94624"></a>OpenBIOS DeTokenizer detok</h1>
+<h1 style="text-align: center;"><a class="mozTocH1"
+ name="mozTocId186871"></a>(A
+User's Guide)</h1>
+<div class="document-control">
+<ul>
+ <li>Updated Wed, 18 Oct 2006 at 12:37 PDT by David L. Paktor</li>
+</ul>
+</div>
+<p class="copyright">Copyright © 2005 International Business
+Machines<sup>®</sup>,
+All Rights Reserved.<br>
+Licensed under the <a
+ href="http://www.opensource.org/licenses/cpl1.0.php">Common Public
+License (CPL) version 1.0</a><br>
+</p>
+<!-- =========================================================================== --><!-- =========================================================================== -->
+<h1><a class="mozTocH2" name="mozTocId48196"></a>Table of Contents</h1>
+<ol id="mozToc">
+<!--mozToc h1 1 h2 2 h3 3 h4 4 h5 5 h6 6--> <li><a
+ href="#mozTocId734288">Overview</a></li>
+ <li><a href="#mozTocId101390">Output Formats</a>
+ <ol>
+ <li><a href="#mozTocId555273">Sample source file:</a></li>
+ <li><a href="#mozTocId805568">DeTokenizer output with no
+options selected:</a></li>
+ <li><a href="#mozTocId621166">DeTokenizer output with the
+"verbose" option selected:</a></li>
+ <li><a href="#mozTocId409633">DeTokenizer output with the
+"offsets" option selected:</a></li>
+ <li><a href="#mozTocId460016">DeTokenizer output with both
+the "verbose" and "offsets" options selected:</a></li>
+ </ol>
+ </li>
+ <li><a href="#mozTocId930428">Command-Line Format</a>
+ <ol>
+ <li><a href="#mozTocId582301">Command-Line Options</a>
+ <ol>
+ <li><a href="#mozTocId403694">Switches</a></li>
+ <li><a href="#mozTocId532000">The "Additional FCodes"
+file</a></li>
+ <ol>
+ <li><a href="#mozTocId814200">Special Functions<br>
+ </a></li>
+ </ol>
+ </ol>
+ </li>
+ </ol>
+ </li>
+ <li><a href="#mozTocId657867">End Of Document</a></li>
+</ol>
+<h2><a class="mozTocH2" name="mozTocId734288"></a>Overview</h2>
+The DeTokenizer is an adjunct tool to the Tokenizer, and performs the
+reverse function, in a fashion. That is, it converts binary FCode
+into a form that can be read for purposes of verification. This
+implementation is not, however, a complete DeTokenizer in the sense of
+one whose output can be turned back through the Tokenizer to generate
+the same binary. Such programs might exist, but this is not one
+of them.<br>
+<h2><a class="mozTocH2" name="mozTocId101390"></a>Output Formats</h2>
+The output of this DeTokenizer basically consists of one token
+(sometimes two) per line, with optional additional information,
+depending on which Command-Line Options have been specified.<br>
+<br>
+<h3 style="margin-left: 40px;"><a class="mozTocH3" name="mozTocId555273"></a>Sample
+source file:<br>
+</h3>
+<div style="margin-left: 40px;">The easiest way to describe the
+different optional output formats would
+be by creating an example of a source file that has been Tokenized and
+displaying the output of the DeTokenizer, applied to its resultant
+FCode binary, with the various options.<br>
+<br>
+Our example source file looks like this:<br>
+<br>
+</div>
+<pre style="font-family: courier new; margin-left: 40px;">\ Demo program for DeTokenizer output format display.<br><br><span
+ style="font-weight: bold;">tokenizer[</span> <br> <span
+ style="font-weight: bold;">h#</span> 17d5 \ Vendor ID: 0x17d5<br> <span
+ style="font-weight: bold;">h#</span> 5417 \ Device ID: 0x5417<br> <span
+ style="font-weight: bold;">h#</span> 020000 \ Class Code: 0x020000 (Ethernet)<br> <span
+ style="font-weight: bold;">h#</span> f2ed \ Rev-Level<br> <span
+ style="font-weight: bold;">]tokenizer</span><br> <span
+ style="font-weight: bold;">SET-REV-LEVEL</span><br> <span
+ style="font-weight: bold;">pci-header</span><br><br><span
+ style="font-weight: bold;">fcode-version2</span><br><br><span
+ style="font-weight: bold;">headers</span><br><span
+ style="font-weight: bold;">hex</span><br><br><span
+ style="font-weight: bold;">:</span> hello/goodbye ( hello? -- )<br> <span
+ style="font-weight: bold;">if</span><br> <span
+ style="font-weight: bold;">."</span> Hello, you big beautiful world!"<br> <span
+ style="font-weight: bold;">else</span><br> <span
+ style="font-weight: bold;">."</span> Goodbye, cruel world. Gggga-a-a-ackkkkk!"<br> <span
+ style="font-weight: bold;">then</span><br><span
+ style="font-weight: bold;">;</span><br><br><span
+ style="font-weight: bold;">:</span> I-say-hello <span
+ style="font-weight: bold;">true</span> hello/goodbye <span
+ style="font-weight: bold;">;</span><br><span style="font-weight: bold;">:</span> You-say-goodbye <span
+ style="font-weight: bold;">false</span> hello/goodbye <span
+ style="font-weight: bold;">;</span><br><br><br><span
+ style="font-weight: bold;">fcode-end</span></pre>
+<h3 style="margin-left: 40px;"><a class="mozTocH3" name="mozTocId805568">
+</a>DeTokenizer output with no options selected:</h3>
+<div style="margin-left: 40px;"><br>
+With no options selected, the DeTokenizer output looks like this:<br>
+<br>
+</div>
+<pre
+ style="font-family: courier new; margin-left: 40px; color: rgb(204, 0, 0);">\ PCI Header identified<br>\ Offset to Data Structure = 0x001c (28)<br>\ PCI Data Structure identified<br>\ Data Structure Length = 0x0018 (24)<br>\ Vendor ID: 0x17d5<br>\ Device ID: 0x5417<br>\ Class Code: 0x020000 (Ethernet controller)<br>\ Image Revision: 0xf2ed<br>\ Code Type: 0x01 (Open Firmware)<br>\ Image Length: 0x0001 blocks (512 bytes)<br>\ Last PCI Image.<br>start1 ( 16-bit offsets)<br> format: 0x08<br> checksum: 0x33d5 (Ok)<br> len: 0x009e ( 158 bytes)<br>named-token hello/goodbye 0x800<br>b(:) <br> b?branch 0x0028 ( =dec 40)<br> b(") ( len=0x1f [31 bytes] )<br> " Hello, you big beautiful world!"<br> type <br> bbranch 0x0030 ( =dec 48)<br> b(>resolve) <br> b(") ( len=0x29 [41 bytes] )<br> " Goodbye, cruel world. Gggga-a-a-ackkkkk!"<br> type <br> b(>resolve) <br>b(;) <br>named-token I-say-hello 0x801<br>b(:) <br> -1 <br> hello/goodbye <br>b(;) <br>named-token You-say-goodbye 0x802<br>b(:) <br> 0 <br> hello/goodbye <br>b(;) <br>end0 <br>\ Detokenization finished normally after 158 bytes.<br>\ PCI Image padded with 302 bytes of zero</pre>
+<h3 style="margin-left: 40px;"><a class="mozTocH3" name="mozTocId621166"></a><a
+ name="with_verbose"></a>DeTokenizer output
+with the "verbose" option selected:</h3>
+<div style="margin-left: 40px;">The "verbose" option adds a display of
+the hex value of each token
+processed, (as well as a signature block), thus:<br>
+<br>
+</div>
+<pre
+ style="font-family: courier new; margin-left: 40px; color: rgb(204, 0, 0);">\ Welcome to the OpenBIOS detokenizer v0.6.1<br>\ detok Copyright(c) 2001-2005 by Stefan Reinauer.<br>\ Written by Stefan Reinauer, <stepan(a)openbios.org><br>\ This program is free software; you may redistribute it under the terms of<br>\ the GNU General Public License. This program has absolutely no warranty.<br>\ <br>\ (C) Copyright 2005 IBM Corporation. All Rights Reserved.<br>\ PCI Header identified<br>\ Offset to Data Structure = 0x001c (28)<br>\ PCI Data Structure identified<br>\ Data Structure Length = 0x0018 (24)<br>\ Vendor ID: 0x17d5<br>\ Device ID: 0x5417<br>\ Class Code: 0x020000 (Ethernet controller)<br>\ Image Revision: 0xf2ed<br>\ Code Type: 0x01 (Open Firmware)<br>\ Image Length: 0x0001 blocks (512 bytes)<br>\ Last PCI Image.<br>start1 ( 0x0f1 ) ( 16-bit offsets)<br> format: 0x08<br> checksum: 0x33d5 (Ok)<br> len: 0x009e ( 158 bytes)<br>named-token ( 0x0b6 ) hello/goodbye 0x800<br>b(:) ( 0x0b7 ) <br> b?branch ( 0x014 ) 0x0028 ( =dec 40)<br> b(") ( 0x012 ) ( len=0x1f [31 bytes] )<br> " Hello, you big beautiful world!"<br> type ( 0x090 ) <br> bbranch ( 0x013 ) 0x0030 ( =dec 48)<br> b(>resolve) ( 0x0b2 ) <br> b(") ( 0x012 ) ( len=0x29 [41 bytes] )<br> " Goodbye, cruel world. Gggga-a-a-ackkkkk!"<br> type ( 0x090 ) <br> b(>resolve) ( 0x0b2 ) <br>b(;) ( 0x0c2 ) <br>named-token ( 0x0b6 ) I-say-hello 0x801<br>b(:) ( 0x0b7 ) <br> -1 ( 0x0a4 ) <br> hello/goodbye ( 0x800 ) <br>b(;) ( 0x0c2 ) <br>named-token ( 0x0b6 ) You-say-goodbye 0x802<br>b(:) ( 0x0b7 ) <br> 0 ( 0x0a5 ) <br> hello/goodbye ( 0x800 ) <br>b(;) ( 0x0c2 ) <br>end0 ( 0x000 ) <br>\ Detokenization finished normally after 158 bytes.<br>\ PCI Image padded with 302 bytes of zero</pre>
+<h3 style="margin-left: 40px;"><a class="mozTocH3" name="mozTocId409633"></a><a
+ name="with_offsets"></a>DeTokenizer output
+with the "offsets" option selected:</h3>
+<div style="margin-left: 40px;">The "offsets" option shows the position
+of the tokens relative to the
+start of the first FCode block after a PCI header (if one is present)
+and the destination-offset of each
+branch. If more than one FCode header follows a single PCI header, the
+offset-counter will continue; if a new PCI header is encountered, the
+offset-counter will be reset and will begin counting again from zero
+after the end of the latest PCI header.
+<p>Without the "verbose" option, i.e., with just the
+"offsets" option by itself, the DeTokenizer output looks like this:</p>
+</div>
+<pre
+ style="font-family: courier new; margin-left: 40px; color: rgb(204, 0, 0);">\ PCI Header identified<br>\ Offset to Data Structure = 0x001c (28)<br>\ PCI Data Structure identified<br>\ Data Structure Length = 0x0018 (24)<br>\ Vendor ID: 0x17d5<br>\ Device ID: 0x5417<br>\ Class Code: 0x020000 (Ethernet controller)<br>\ Image Revision: 0xf2ed<br>\ Code Type: 0x01 (Open Firmware)<br>\ Image Length: 0x0001 blocks (512 bytes)<br>\ Last PCI Image.<br> 0: start1 ( 16-bit offsets)<br> 1: format: 0x08<br> 2: checksum: 0x33d5 (Ok)<br> 4: len: 0x009e ( 158 bytes)<br> 8: named-token hello/goodbye 0x800<br> 25: b(:) <br> 26: b?branch 0x0028 ( =dec 40 dest = 67 )<br> 29: b(") ( len=0x1f [31 bytes] )<br> " Hello, you big beautiful world!"<br> 62: type <br> 63: bbranch 0x0030 ( =dec 48 dest = 112 )<br> 66: b(>resolve) <br> 67: b(") ( len=0x29 [41 bytes] )<br> " Goodbye, cruel world. Gggga-a-a-ackkkkk!"<br> 110: type <br> 111: b(>resolve) <br> 112: b(;) <br> 113: named-token I-say-hello 0x801<br> 128: b(:) <br> 129: -1 <br> 130: hello/goodbye <br> 132: b(;) <br> 133: named-token You-say-goodbye 0x802<br> 152: b(:) <br> 153: 0 <br> 154: hello/goodbye <br> 156: b(;) <br> 157: end0 <br>\ Detokenization finished normally after 158 bytes.<br>\ PCI Image padded with 302 bytes of zero</pre>
+<h3 style="margin-left: 40px;"><a class="mozTocH3" name="mozTocId460016"></a><a
+ name="with_verbose_and_offsets"></a>DeTokenizer output
+with both the "verbose" and "offsets" options selected:</h3>
+<div style="margin-left: 40px;">Combining the "verbose" and "offsets"
+options results in something that
+looks like this:<br>
+<br>
+</div>
+<pre
+ style="font-family: courier new; margin-left: 40px; color: rgb(204, 0, 0);">\ Welcome to the OpenBIOS detokenizer v0.6.1<br>\ detok Copyright(c) 2001-2005 by Stefan Reinauer.<br>\ Written by Stefan Reinauer, <stepan(a)openbios.org><br>\ This program is free software; you may redistribute it under the terms of<br>\ the GNU General Public License. This program has absolutely no warranty.<br>\ <br>\ (C) Copyright 2005 IBM Corporation. All Rights Reserved.<br>\ PCI Header identified<br>\ Offset to Data Structure = 0x001c (28)<br>\ PCI Data Structure identified<br>\ Data Structure Length = 0x0018 (24)<br>\ Vendor ID: 0x17d5<br>\ Device ID: 0x5417<br>\ Class Code: 0x020000 (Ethernet controller)<br>\ Image Revision: 0xf2ed<br>\ Code Type: 0x01 (Open Firmware)<br>\ Image Length: 0x0001 blocks (512 bytes)<br>\ Last PCI Image.<br> 0: start1 ( 0x0f1 ) ( 16-bit offsets)<br> 1: format: 0x08<br> 2: checksum: 0x33d5 (Ok)<br> 4: len: 0x009e ( 158 bytes)<br> 8: named-token ( 0x0b6 ) hello/goodbye 0x800<br> 25: b(:) ( 0x0b7 ) <br> 26: b?branch ( 0x014 ) 0x0028 ( =dec 40 dest = 67 )<br> 29: b(") ( 0x012 ) ( len=0x1f [31 bytes] )<br> " Hello, you big beautiful world!"<br> 62: type ( 0x090 ) <br> 63: bbranch ( 0x013 ) 0x0030 ( =dec 48 dest = 112 )<br> 66: b(>resolve) ( 0x0b2 ) <br> 67: b(") ( 0x012 ) ( len=0x29 [41 bytes] )<br> " Goodbye, cruel world. Gggga-a-a-ackkkkk!"<br> 110: type ( 0x090 ) <br> 111: b(>resolve) ( 0x0b2 ) <br> 112: b(;) ( 0x0c2 ) <br> 113: named-token ( 0x0b6 ) I-say-hello 0x801<br> 128: b(:) ( 0x0b7 ) <br> 129: -1 ( 0x0a4 ) <br> 130: hello/goodbye ( 0x800 ) <br> 132: b(;) ( 0x0c2 ) <br> 133: named-token ( 0x0b6 ) You-say-goodbye 0x802<br> 152: b(:) ( 0x0b7 ) <br> 153: 0 ( 0x0a5 ) <br> 154: hello/goodbye ( 0x800 ) <br> 156: b(;) ( 0x0c2 ) <br> 157: end0 ( 0x000 ) <br>\ Detokenization finished normally after 158 bytes.<br>\ PCI Image padded with 302 bytes of zero</pre>
+<div style="margin-left: 80px;">There's another option called "line
+numbers" but it only numbers the
+lines of output. It's easy enough to describe, and so needs no
+illustration.<br>
+</div>
+<br>
+<!-- =========================================================================== -->
+<!-- =========================================================================== -->
+<h2><a class="mozTocH2" name="mozTocId930428"></a>Command-Line Format</h2>
+<div style="margin-left: 40px;">The command-line format is simply:<br>
+<br>
+</div>
+<div
+ style="font-family: courier new,courier,monospace; margin-left: 80px;">detok
+[options] fc-file [fc-file ...]<br>
+</div>
+<br>
+<div style="margin-left: 40px;">The output of this DeTokenizer is
+directed to STDOUT, so there is no
+"Output file" option per se. Simply redirect the output to the
+file in which you wish to keep the results, using the standard Shell
+conventions.<br>
+</div>
+<h3 style="margin-left: 40px;"><a class="mozTocH3" name="mozTocId582301"></a>Command-Line
+Options</h3>
+<div style="margin-left: 40px;">Command-Line option Switches are
+case-sensitive;
+only one option has an applicable argument, and that one is a file
+name. Its case sensitivity is, of course, dependent on the Host
+Operating System.<br>
+</div>
+<h4 style="margin-left: 40px;"><a class="mozTocH4" name="mozTocId403694"></a>Switches</h4>
+<ul style="margin-left: 40px;">
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-h</span>
+or <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-?</span></li>
+</ul>
+<div style="margin-left: 80px;">Print a brief help message and then
+exit.
+</div>
+<ul style="margin-left: 40px;">
+ <li><span
+ style="font-weight: bold; font-family: courier new,courier,monospace;">-v</span></li>
+</ul>
+<div style="margin-left: 80px;">Verbose -- display
+<a href="#with_verbose">additional information</a>: the hex value
+of each token processed, as
+well as a signature block.<br>
+</div>
+<ul
+ style="font-weight: bold; font-family: courier new; margin-left: 40px;">
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-o</span></li>
+</ul>
+<div style="margin-left: 80px;">Offsets -- display the
+<a href="#with_offsets">positions of the tokens</a> relative to the
+start of the first FCode block after a PCI header (if one is present),
+and
+the destination-offset of each branch.<br>
+<p>Note that the <a href="#with_verbose_and_offsets">combination</a>
+of
+the Verbose and Offsets options yields the maximum amount of useful
+information. </p>
+</div>
+<ul style="margin-left: 40px;">
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-n</span></li>
+</ul>
+<div style="margin-left: 80px;">Line Numbers -- display the
+sequential number of each line of output.<br>
+<p>Note that the <span
+ style="font-family: courier new; font-weight: bold;">-n</span> and <span
+ style="font-family: courier new; font-weight: bold;">-o</span> options
+are mutually exclusive; if both are specified, <span
+ style="font-family: courier new; font-weight: bold;">-o</span> will be
+favoured.</p>
+</div>
+<ul style="margin-left: 40px;">
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-a</span></li>
+</ul>
+<div style="margin-left: 80px;">Process All input. Do not stop
+when <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">end0</span>
+has been encountered. This option is usually not needed, but may
+be useful in cases where a file has been corrupted or when
+something very strange has been Tokenized...<br>
+</div>
+<ul style="margin-left: 40px;">
+ <li><span style="font-family: courier new; font-weight: bold;">-f
+<FCode-List-File></span></li>
+</ul>
+<div style="margin-left: 80px;">Pre-load Additional FCodes before
+processing. These might be, for instance, a set of
+vendor-specific FCodes that were generated for a specific vendor's
+products by a Tokenizer customized for that specific vendor. A
+detailed discussion of <a href="#Additional_FCodes_file">the
+"Additional FCodes" file</a> will be presented in a separate dedicated
+section. </div>
+<!-- =========================================================================== --><!-- =========================================================================== -->
+<h4 style="margin-left: 40px;"><a class="mozTocH4" name="mozTocId532000"></a><a
+ name="Additional_FCodes_file"></a>The
+"Additional FCodes" file</h4>
+<div style="margin-left: 80px;">Some vendors' FCode drivers contain
+non-standard FCode tokens. In order to accommodate those
+situations, provision is made to specify the names of the FCodes in
+question. The <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-f</span>
+command-line option permits the user to specify an "Additional FCodes
+List" file, which will be read before detokenization begins and which
+will contain the list of "Additional FCodes" to be recognized.<br>
+<p>The format of the file is as follows:<br>
+</p>
+<ol>
+ <li>One entry, consisting of an FCode and its name, on a line.
+The FCode Number is given first, in the form of a hex number, preceded
+by an optional <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">0x</span>
+or <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">0X</span>
+(Thus: <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">0x602</span>
+or <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">0X602</span>
+or simply <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">602</span>
+are all equivalent.) At least one blank space separates the FCode
+Number from the Name, which must be on the same line. Any number
+of blanks are permitted, and any text that follows the Name is
+permitted and will be ignored.</li>
+ <li>Blank lines are permitted and will be ignored.</li>
+ <li>Comment lines are permitted and will be ignored.
+A comment-line starts with either a pound-sign ( <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">#</span>
+) or a backslash ( <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">\</span>
+).</li>
+ <li>FCode Numbers are limited to the range <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">0x10..0x7ff</span>
+Numbers smaller than <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">0x10</span>
+are the leading-byte of a two-byte FCode, and numbers from <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">0x800</span>
+and up are assigned by the tokenizer. Lines with numbers outside
+the permitted range will be ignored, and a message will be printed.</li>
+ <li>FCode numbers that are already assigned will not be permitted to
+be overwritten. Lines with numbers that are already assigned
+will be ignored, and a message will be printed. </li>
+</ol>
+<p>If the file cannot be read, that will be regarded as an immediate
+failure and cause the program to exit. <br>
+</p>
+<h5><big><a name="mozTocId814200"></a><a name="Special_Functions"></a>Special
+Functions</big></h5>
+In addition to non-standard FCode tokens with simple behavior, some
+vendors' FCode drivers also contain non-standard FCode tokens with
+complex behavior. An example that was recently encountered is "<span
+ style="font-weight: bold;">double(lit)</span>" which precedes a
+double-length (i.e., 64-bit) literal. This DeTokenizer is
+structured to allow the creation of a list of pre-defined Special
+Function names, each of which has a special behavior associated with
+it. When one of those names occurs in the "Additional FCodes
+List" file, it will be recognized; the FCode Number given with it is
+assigned to it. When that FCode number is encountered, the
+assigned special behavior will be exercised.<br>
+<p>Adding to the list of Special Function names, and associating a
+new behavior with the added function, requires modifying the
+DeTokenizer code, but the infrastructure that is already in place
+should make this a manageable task for even a modestly skilled
+programmer.<br>
+</p>
+<p>At the present writing, only one such Special Function name is
+supported, and that one is, of course, <span
+ style="font-weight: bold;">double(lit)</span></p>
+<p>Its associated special behavior is to collect the next eight bytes
+from the FCode input stream and display them as a double-length literal.<br>
+</p>
+<p>If you modify the DeTokenizer to recognize additional Special
+Function names, please update this document to list them and describe
+their special behaviors. Thank you. </p>
+<br>
+</div>
+<!-- ...................................................................................... --><!-- =========================================================================== -->
+<h2><a class="mozTocH2" name="mozTocId657867"></a>End Of Document</h2>
+<!-- =========================================================================== -->
+</body>
+</html>
Added: fcode-utils/documentation/localvalues.html
===================================================================
--- fcode-utils/documentation/localvalues.html (rev 0)
+++ fcode-utils/documentation/localvalues.html 2006-10-30 16:58:53 UTC (rev 109)
@@ -0,0 +1,859 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<!-- ESWDESDOCFILE %Z%%M% %I% %W% %G% %U% -->
+ <title>ESW PART-FW: Support for "Local Values" in the OpenBIOS
+Tokenizer</title>
+ <link rel="stylesheet" type="text/css"
+ href="workbook.css">
+</head>
+<body>
+<h1 class="title"><a class="mozTocH1" name="mozTocId810036"></a>Support
+for "Local Values" in the OpenBIOS Tokenizer</h1>
+<div class="document-control">
+<ul>
+ <li>Updated Wed, 26 Jul 2006 at 10:04 PDT by David L. Paktor<br>
+ </li>
+</ul>
+</div>
+<p class="copyright"> Copyright © 2005 International Business
+Machines<sup>®</sup>, All Rights Reserved.<br>
+Licensed under the <a
+ href="http://www.opensource.org/licenses/cpl1.0.php">Common Public
+License (CPL) version 1.0</a><br>
+</p>
+<!-- =========================================================================== --><!-- =========================================================================== -->
+<h2><a class="mozTocH2" name="mozTocId207724"></a>Table Of Contents</h2>
+<ol id="mozToc">
+<!--mozToc h1 1 h2 2 h3 3 h4 4 h5 5 h6 6--><li><a href="#mozTocId810036">Support
+for "Local Values" in the OpenBIOS Tokenizer</a>
+ <ol>
+ <li><a href="#mozTocId944022">Overview</a></li>
+ <li><a href="#mozTocId303607">Scope of this Document</a></li>
+ <li><a href="#mozTocId272611">Design Objectives</a></li>
+ <li><a href="#mozTocId383861">Functional
+Requirements</a></li>
+ <li><a href="#mozTocId969736">Interface
+Specification</a>
+ <ol>
+ <li><a href="#mozTocId699042">Syntax:</a>
+ <ol>
+ <li><a href="#mozTocId94063">Declaration:
+(Curly-braces: { and
+ } )</a></li>
+ <li><a href="#mozTocId444210">Separation
+Character between Initialized and
+Uninitialized Local Values</a></li>
+ <li><a href="#mozTocId715222">Value Extraction:
+Invocation</a></li>
+ <li><a href="#mozTocId677769">Value Assignment: The
+ ->
+Operator.</a></li>
+ <li><a href="#mozTocId189696">Scope of Local Values:</a></li>
+ </ol>
+ </li>
+ <li><a href="#mozTocId107943">Semantics:</a>
+ <ol>
+ <li><a href="#mozTocId459457">Order of
+Initialization:</a></li>
+ <li><a href="#mozTocId908599">Note two significant
+departures from the "Local Variables"
+discussed in the ANSI FORTH Standard document: </a></li>
+ <li><a href="#mozTocId213536">Value Extraction</a></li>
+ <li><a href="#mozTocId563286">Value Assignment</a></li>
+ </ol>
+ </li>
+ </ol>
+ </li>
+ <li><a href="#mozTocId505598">Implementation</a>
+ <ol>
+ <li><a href="#mozTocId134995">Compilation -- the
+Parser:</a>
+ <ol>
+ <li><a href="#mozTocId467215">Run-Time Support
+Function names:</a>
+ <ol>
+ <li><a href="#mozTocId497158">Example:</a></li>
+ </ol>
+ </li>
+ </ol>
+ </li>
+ <li><a href="#mozTocId361894">Run-Time Support --
+the Local Values Support "Library":</a>
+ <ol>
+ <li><a href="#mozTocId191315">Operational Run-Time
+Support
+Functions:</a></li>
+ <li><a href="#mozTocId750894">Important note regarding
+floading of the Local Values Support Functions file</a></li>
+ <li><a href="#mozTocId684194">Adjusting the size of
+Local Values Storage:</a></li>
+ <li><a href="#mozTocId208497">Additional Support
+Function(s):</a>
+ <ol>
+ <li><a href="#mozTocId781114">CATCH / THROW</a></li>
+ </ol>
+ </li>
+ </ol>
+ </li>
+ </ol>
+ </li>
+ </ol>
+ </li>
+</ol>
+<h2><a class="mozTocH2" name="mozTocId944022"></a>Overview</h2>
+<!-- =========================================================================== -->
+The goal of this project is to implement support for "Local Values"
+in the OpenBIOS Tokenizer.
+<p>"Local Values" are an IBM-specific extension of FORTH syntax,
+currently used both by the FCode Tokenizer and Platform Firmware.
+They might be considered a variant that meets the spirit, if not the
+letter, of the suggestions for a "Locals word set" discussed
+-- but not specified -- in the ANSI FORTH Standard, Section 13 and
+Appendix A.13</p>
+<p>
+(Please note that the ANSI document does not really specify this
+feature,
+because the Committee could not reach an agreement. Appendix A.13
+records the somewhat lively discussions that accompanied this topic.)</p>
+<p>We will refer to this feature with the nomenclature "<span
+ style="font-weight: bold;">Local Values</span>" in preference to
+"Local
+Variables" or "Locals" in order to (a) more accurately
+characterize the behavior of these objects, and (b) further emphasize
+the differences between the IBM-specific extension and those discussed
+in the ANSI document.
+</p>
+<h2><a class="mozTocH2" name="mozTocId303607"></a>Scope of this Document</h2>
+<!-- ...................................................................................... -->
+The sections labeled <a style="font-weight: bold;" href="#Syntax">Syntax</a>
+and <a style="font-weight: bold;" href="#Semantics">Semantics</a>
+describe the user's view of this feature.<br>
+<p>The section
+labeled <a style="font-weight: bold;" href="#Implementation">Implementation</a>
+is a description of the
+underlying parsing and support mechanisms that meet the <a
+ style="font-weight: bold;" href="#Design_Objectives">Design Objectives</a>.
+</p>
+<!-- ...................................................................................... --><!-- =========================================================================== -->
+<h2><a class="mozTocH2" name="mozTocId272611"></a><a
+ name="Design_Objectives"></a>Design Objectives</h2>
+<!-- =========================================================================== -->The
+"Local Values" extension is intended to relieve programmers maintaining
+FCode device drivers from the complexity involved in keeping track of
+the
+positions of the various items on the stack. The programmer can,
+instead,
+refer to these items by symbolic names, in a manner similar to "<big><b>C</b></big>"
+syntax.
+<!-- =========================================================================== -->
+<h2><a class="mozTocH2" name="mozTocId383861"></a>Functional
+Requirements</h2>
+<!-- =========================================================================== -->
+Tokenizing source-code that makes use of the "Local Values" syntax
+shall still result in Industry Standard FCode that can be interpreted
+by the
+FCode interpreter of any Open Firmware-compliant Host Platform, without
+imposing any IBM-specific requirements.<br>
+<p>Also, the implementation shall support a means whereby to remain
+compatible with IBM's existing code-base.</p>
+<!-- =========================================================================== -->
+<h2><a class="mozTocH2" name="mozTocId969736"></a>Interface
+Specification</h2>
+<!-- =========================================================================== -->
+<h3><a class="mozTocH3" name="mozTocId699042"></a><a name="Syntax"></a>Syntax:</h3>
+<h4><a class="mozTocH4" name="mozTocId94063"></a>Declaration:
+(Curly-braces: <b><big>{</big></b> and
+ <big><b>}</b></big> )</h4>
+<p>
+Local Values may only be declared in connection with a colon-definition
+(A "word" in FORTH parlance.) </p>
+<p> Declaration of Local Values is triggered by an open-curly-brace
+(i.e.,: <b>{</b> ) , and ends with a close-curly-brace (
+ <b>}</b>
+).</p>
+<p>A further distinction is made between Initialized Local Values and
+Uninitialized Local Values: Initialized Local Values are declared
+first, and
+are separated by a <a href="#Separation_Character_between_Initialized">special
+character</a> from Uninitialized Local Values.<br>
+</p>
+<p>Declaration of Local Values may only occur once within the body of
+the colon-definition.<br>
+</p>
+<p>Declaration of Local Values after code has been compiled into the
+body of the word is not recommended, but is permitted. A Local
+Values
+Declaration that occurs inside a Flow-Control Structure will be
+reported as an <a href="TokenizerNewFeatures.htm#An_ERROR">Error</a>.<br>
+</p>
+<p>A Local Values Declaration may include comments and may continue
+across
+multiple lines. See the <a href="#mozTocId497158">example</a> in
+the <a href="#Implementation">Implementation</a> section.</p>
+<h4><a class="mozTocH4" name="mozTocId444210"></a><a
+ name="Separation_Character_between_Initialized"></a>Separation
+Character between Initialized and
+Uninitialized Local Values</h4>
+<p>Two symbols are accepted as the separator between
+Initialized and Uninitialized Local Values, the <b>Semicolon</b>
+( <span style="font-family: courier new,courier,monospace;"
+ font-weight="" bold="">;</span> ) and the <span
+ style="font-weight: bold;">Vertical-Bar</span> ( <span
+ style="font-weight: bold;">|</span> ).
+</p>
+<p>Since, in FORTH, Semicolon is heavily fraught with a very important
+meaning,
+it is preferable to use a different symbol -- one that isn't used
+for anything else -- as the separator between Initialized and
+Uninitialized Local Values. Better still would be a symbol that's given
+at least passing mention in the discussion about the (failed) attempt
+to establish an ANSI standard for Locals (see the ANSI Forth Spec.,
+section 13.6.2.1795).</p>
+<p>
+The <span style="font-weight: bold;">Vertical-Bar</span>
+symbol
+( <span style="font-weight: bold;">|</span> )
+fills that bill nicely.</p>
+<p><a name="Legacy_Separator"></a>Local Values Declarations
+will accept Semicolon as an alternative ("Legacy") separator between
+Initialized
+and Uninitialized Local Values, and issue a Warning message to the
+effect
+that the
+use of Semicolons in that context is deprecated in favor of the
+Vertical-Bar.</p>
+<p>The User may suppress this
+message by means of a <a
+ href="TokenizerNewFeatures.htm#Command-Line_options_">Command-line
+switch</a>, known as the
+<a href="TokenizerNewFeatures.htm#Special_Feature_Flags">Special-Feature
+Flag</a> named <a href="TokenizerNewFeatures.htm#SF_Flag_LV_Leg_Mssg"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">NoLV-Legacy-Message</span></a>
+, which is described in the <a href="TokenizerNewFeatures.htm">Tokenizer
+User's Guide</a>.</p>
+<p><a name="Disallow_Legacy"></a>Conversely, the User who wishes to
+disallow the use of Semicolon as
+an alternative separator may do so by means of the
+Special-Feature Flag named <a
+ href="TokenizerNewFeatures.htm#SF_Flag_LV_Leg_Sep"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">NoLV-Legacy-Separator</span></a>
+. When the Legacy Local Values
+Separator is thus disallowed, occurrences will be treated as an
+Error.</p>
+<h4><a class="mozTocH4" name="mozTocId715222"></a>Value Extraction:
+Invocation</h4>
+A name declared as a Local Value may be invoked within the body of a
+word in connection with which it was declared, simply by name, in a
+manner similar to a name defined by the Standard FORTH defining-word, <i><b>VALUE</b></i>
+, to mean that its associated value is to be extracted and placed onto
+the Stack.
+<h4><a class="mozTocH4" name="mozTocId677769"></a>Value Assignment: The
+ <b><big>-></big></b>
+Operator.</h4>
+The symbol <b>-></b> (dash angle-bracket, pronounced
+"dash-arrow"), may precede the name of a Local Value, and it may not
+precede anything else.
+<p>No comments are permitted between the <b>-></b>
+and the Local-Value name to which it applies.</p>
+<p>The <b>-></b> and
+the Local-Value name to which it applies must be on the same line. </p>
+<p>The <b>-></b> operator relates to the Local-Value
+name to which it is applied in a manner similar to the way the <i><b>TO</b></i>
+operator relates, when it is applied, to a name defined by <i><b>VALUE</b></i>
+; it causes the numeric value on
+top of the Parameter Stack to be popped and stored into -- associated
+with -- the named Local Value.</p>
+<h4><a class="mozTocH4" name="mozTocId189696"></a>Scope of Local Values:</h4>
+Upon completion of the definition of the word in connection with which
+a set of Local Values was declared, i.e., at the semicolon, the names
+of the Local Values cease to be recognized. If the same names are
+declared in connection with a subsequent definition, they are only
+applicable to that subsequent definition, as if they were newly
+created. No warning is issued, nor do rules concerning "overloading"
+apply.<!-- ...................................................................................... -->
+<h3><a class="mozTocH3" name="mozTocId107943"></a><a name="Semantics"></a>Semantics:</h3>
+<h4><a class="mozTocH4" name="mozTocId459457"></a>Order of
+Initialization:</h4>
+Uninitialized Local Values do not have a value until one is assigned
+within the definition, by the use of the <b>-></b>
+("dash-arrow") operator.
+<p>Initialized Local Values are initialized from the stack at the start
+of execution of the defined word, in the same order as the convention
+for a stack-diagram, i.e., the first-named Local Value is
+initialized from the stack-item whose depth corresponds to the total
+number of initialized Local Values, the last-named Local Value is
+initialized from the top-of-stack item, and so on in between. </p>
+<p>
+The following will serve to illustrate:
+</p>
+<code><font color="#000000">
+<p>: <word-name> ( P_x ... P_y P_0 P_1 ... P_n-2 P_n-1 --
+??? )<br>
+
+
+ { IL_0 IL_1
+... IL_n-2 IL_n-1 | UL_0 UL_1 } </p>
+<p> \
+ At the start of the word,
+IL_0 through IL_n-1 are initialized<br>
+ \
+with P_0 thorough P_n-1, respectively, and the stack contains<br>
+
+
+
+
+
+ ( P_x ... P_y )
+</p>
+</font></code>
+<h4><a class="mozTocH4" name="mozTocId908599"></a>Note two significant
+departures from the "Locals"
+discussed in the ANSI FORTH Standard document:
+</h4>
+<p>(1) The ANSI FORTH Committee discussions make no provision for
+Uninitialized Locals, <br>
+</p>
+<p>and
+</p>
+<p> (2) The order of initialization is reversed. In the ANSI document,
+Locals are initialized
+in the order they are declared, so that the first-declared will take
+the topmost value on the stack, and the last-declared will take the
+deepest value.
+</p>
+<p> The general consensus within IBM is that this scheme is confusing
+at best, and does not serve the intent of the <a
+ href="#Design_Objectives">Design Objectives</a>.
+</p>
+<h4><a class="mozTocH4" name="mozTocId213536"></a>Value Extraction</h4>
+When the name of a Local Value is invoked, its associated value is
+extracted
+and pushed onto the Parameter Stack.
+<h4><a class="mozTocH4" name="mozTocId563286"></a>Value Assignment</h4>
+If the <b>-></b> ("dash-arrow") symbol precedes the
+name of a Local Value, then the numeric value on
+top of the Parameter Stack is popped and stored into -- associated with
+-- the named Local-Value.<br>
+<p>Following the -> ("dash-arrow") symbol
+with anything other than the name of a Local Value is an Error.</p>
+<!-- =========================================================================== -->
+<h2><a class="mozTocH2" name="mozTocId505598"></a><a
+ name="Implementation"></a>Implementation</h2>
+<!-- =========================================================================== -->
+<!-- ...................................................................................... -->
+<h3><a class="mozTocH3" name="mozTocId134995"></a>Compilation -- the
+Parser:</h3>
+<!-- ...................................................................................... -->
+A separate area (a "vocabulary", in Forth parlance) must be reserved
+where temporary compile-time
+definitions of the new Local Value names can be created, and whence the
+new Local Value names can be removed after the definition of the word
+in connection with which they were declared is completed. Variables
+must also be set aside to keep count of the Initialized and
+Uninitialized Local Value names declared inside the curly-braces.
+<p> Each new Local Value name has an integer assigned to it. The Parser
+assigns successive integers, starting with 0, to the Local Value names,
+in the order that they are declared, and enters the name of each new
+Local Value, together with its assigned integer, into the separate
+reserved temporary area.
+</p>
+<p> After all the Local Value names have been declared, i.e., after the
+close-curly-brace has been read, the Parser compiles-in the number of
+Initialized Local Values, followed by the number of Uninitialized Local
+Values, where they will act as arguments to the <a href="#push-locals">appropriate
+function</a>,
+which the Parser compiles-in immediately after. The function will be
+the special one that allocates space for, and initializes, the Local
+Values at the time they are about to be used.
+</p>
+<p> While the definition under construction is being compiled, the area
+where the temporary compile-time definitions of the new Local Value
+names have been created must be available to the scanning process, so
+that the new names will be recognized when invoked. Also, it should be
+scanned first, ahead of any other word-lists, so that the Local Value
+names will supercede any similarly-named words, in case of a
+naming-overlap.
+</p>
+<p> When a Local Value's name is invoked, the Parser compiles-in its
+assigned integer as an argument to the <a href="#_local">appropriate
+function</a>, which is
+compiled-in immediately after. The function will be a common one that
+will push onto the stack the address at which the numbered Local Value
+can be accessed. The Parser will then compile-in either the "fetch"
+function ( <b>@</b> ) or the "store" function ( <b>!</b>
+ ), depending on whether the Local Value name was invoked by
+itself or in conjunction with the <b>-></b> operator.
+This way the User/Programmer's view of Local Values' <i><b>VALUE</b></i>-style
+behavior is preserved. </p>
+<p>The FORTH functions <b>exit</b> and <b>;</b> (semicolon) have to
+be overloaded. (Section 13.3.3 of the ANSI document also mentions
+ <b>;CODE</b> and <b>DOES></b> but
+these are not recognized by the Tokenizer, so we will not discuss them
+here.) The overloaded definitions must take special action at
+compile-time
+(note that <b>;</b> -- semicolon -- does that normally,
+anyway, but <b>exit</b> does not) to: compile-in the total number of
+Local Values as an argument to the <a href="#pop-locals">appropriate
+function</a>, which is
+compiled-in immediately afterwards, before completing their normal
+behavior. The function in this case will be the special one that
+releases the space that had been allocated for the Local Values, and
+restores the state of Local Values storage to the way the calling
+routine left it. Semicolon must also clear the area where the temporary
+compile-time definitions of the new local-names were created,
+rendering them inaccessible. </p>
+<h4><a class="mozTocH4" name="mozTocId467215"></a>Run-Time Support
+Function names:</h4>
+The names of the three functions that the Parser compiles-in must be
+well-known and documented, so that they can be implemented and exported
+correctly in the
+Run-Time Support "Library" file.
+<p>The three functions' names are: </p>
+<p> <b>{push-locals} ( #ilocals
+#ulocals -- )</b></p>
+<p> <b>{pop-locals}
+( total#locals
+-- ) </b></p>
+<p> <b>_{local}
+( local-var# --
+addr )<br>
+</b></p>
+<h4><a class="mozTocH4" name="mozTocId497158"></a>Example:</h4>
+The following is an example of a word definition that declares and
+makes
+use of Local Values; it also shows inclusion of comments and
+continuation
+of the Declaration
+across multiple lines:<br>
+<br>
+<tt>
+
+<font color="#663333" face="Courier New, Courier, monospace"></font></tt>
+<table style="text-align: left; width: 821px; height: 356px;" border="0" cellpadding="0" cellspacing="0">
+
+
+ <tbody>
+
+
+ <tr>
+
+
+ <td style="text-align: left; vertical-align: top; width: 33%; white-space: nowrap;"><font style="font-family: monospace;" color="#663333" size="-1"><span style="color: rgb(102, 0, 204);">:</span></font><font style="font-family: monospace;" color="#663333" size="-1">
+ <span style="color: rgb(0, 102, 0);">faber</span> <span style="color: rgb(136, 136, 136);">( m4 m3 n2 n1 n0 -- m4 m3 )<br>
+
+
+ <span style="color: rgb(204, 51, 204);"> {</span><br>
+
+
+ </span></font><font style="font-family: monospace;" color="#663333" size="-1"><span style="color: rgb(204, 51, 204);"></span></font><font style="font-family: monospace;" color="#663333" size="-1"> <span style="color: rgb(119, 119, 119);">\ These are initialized values:</span><br>
+
+
+ <span style="color: rgb(51, 102, 255);">_otter</span><br>
+
+
+ </font><font style="font-family: monospace;" color="#663333" size="-1"> <span style="color: rgb(51, 102, 255);">_weasel</span><br>
+
+
+ </font><font style="font-family: monospace;" color="#663333" size="-1"> <span style="color: rgb(51, 102, 255);">_skunk</span><br>
+
+
+ <br>
+
+
+ <span style="color: rgb(204, 51, 204);">|</span><br>
+
+
+ <br>
+
+
+ <span style="color: rgb(119, 119, 119);">\ </span></font><font style="font-family: monospace;" color="#663333" size="-1"><span style="color: rgb(119, 119, 119);">These are uninitialized:</span><br>
+
+
+ </font><font style="font-family: monospace;" size="-1"><span style="color: rgb(51, 153, 153);">_muskrat</span><br>
+
+
+ </font><font style="font-family: monospace;" color="#663333" size="-1"> </font><font style="font-family: monospace;" color="#663333" size="-1"><span style="color: rgb(51, 153, 153);">_mole</span><br>
+
+
+ <span style="color: rgb(204, 51, 204);"> }</span></font><font style="font-family: monospace;" color="#663333" size="-1"><br>
+
+
+ <span style="color: rgb(0, 0, 0);"> </span></font><font style="font-family: monospace;" size="-1"><span style="color: rgb(0, 0, 0);">_skunk 40 * -> _muskrat<br>
+
+
+ _muskrat alloc-mem -> _mole<br>
+
+
+ base @<br>
+
+
+ hex _weasel (.)
+_mole place<br>
+
+
+ decimal _otter (.) _mole $cat<br>
+
+
+ base !<br>
+
+
+ _mole count type<br>
+
+
+ </span></font><font style="font-family: monospace;" color="#663333" size="-1"><span style="color: rgb(0, 0, 0);">_mole _muskrat free-mem</span><br>
+
+
+ </font><font style="font-family: monospace;" color="#663333" size="-1"><span style="color: rgb(102, 0, 204);">;</span></font><tt><font color="#663333" face="Courier New, Courier, monospace"></font></tt></td>
+
+
+ <td style="text-align: left; vertical-align: top; white-space: nowrap; background-color: rgb(255, 255, 255);"><font style="font-family: monospace;" size="-1"><span style="color: rgb(119, 119, 119);">\ Does nothing useful. Just an example.<br>
+
+
+\ BEGIN the declaration of Local Values.<br>
+
+
+ <br>
+
+
+\ _otter is initialized with
+the value of n2<br>
+
+
+\ _weasel is initialized with
+the value of n1<br>
+
+
+\ _skunk is
+initialized
+with the value of n0<br>
+
+
+\ and will be used to
+determine an amount of memory
+to allocate.<br>
+
+
+\ Vertical bar ends the group of Initialized Local Values.<br>
+
+
+\ NOTE: m4 and m3 stay on the stack.<br>
+
+
+ <br>
+
+
+\ _muskrat will take the
+final size of the allocation.</span><br style="color: rgb(119, 119, 119);">
+
+
+ </font><font style="color: rgb(119, 119, 119); font-family: monospace;" color="#663333" size="-1">\ _mole will hold the address of the allocated memory<br>
+
+
+\ END the declaration of Local Values.</font><font style="font-family: monospace;" color="#663333"><br>
+
+
+ </font><tt><font color="#663333" face="Courier New, Courier, monospace"></font></tt></td>
+
+
+ </tr>
+
+
+
+
+ </tbody>
+</table>
+
+<!-- <font color="#663333" face="Courier New, Courier, monospace">:
+faber ( m4 m3 n2 n1 n0 -- m4 m3 )
+\ Does nothing useful. Just an example.<br>
+ {
+_otter \
+_otter
+is initialized with
+the value of n2<br>
+
+ _weasel
+ \ _weasel is initialized with
+the value of n1<br>
+ _skunk
+ \ _skunk is
+initialized
+with the value of n0<br>
+
+ \
+
+
+ and will be used to
+determine<br>
+
+ \
+
+
+ an amount of memory
+to allocate<br>
+
+
+ ( Vertical
+Bar ends the group of Initialized
+Local Values )
+ | ( m3 and m4 stay on the
+stack )<br>
+
+\ These are uninitialized:<br>
+
+
+_muskrat \ _muskrat will take the
+final size of the allocation<br>
+
+_mole
+\ _mole will hold the address of the allocated memory<br>
+
+ }<br>
+ _skunk 40 * -> _muskrat<br>
+ _muskrat alloc-mem -> _mole<br>
+
+base @<br>
+ hex _weasel (.)
+_mole place<br>
+ decimal _otter (.) _mole $cat<br>
+ base !<br>
+ _mole count type<br>
+ _mole _muskrat free-mem<br>
+; </font>
+-->
+</tt>
+<p> The compilation of <font color="#663333"
+ face="Courier New, Courier, monospace">
+<b>faber</b></font>
+starts with <b>3 2
+{push-locals}</b> . The first invocation of <font
+ color="#663333" face="Courier New, Courier, monospace"><b>_skunk</b></font>
+(by itself) compiles as <b>2 _{local} @</b> and the
+sequence <b>
+<font color="#663333" face="Courier New, Courier, monospace">->
+_muskrat</font></b>
+ compiles as <b>3 _{local) !</b> <br>
+Finally, <font color="#663333"
+ face="Courier New, Courier, monospace"><b>faber</b></font>
+ends with <b>5 {pop-locals}</b> before the <b>unnest</b>
+. After
+that, the local-names are no longer accessible. </p>
+<h3><a class="mozTocH3" name="mozTocId361894"></a>Run-Time Support --
+the Local Values Support "Library":</h3>
+<!-- ...................................................................................... -->
+An FCode program that makes use of the Local Values extension will
+need to incorporate an implementation of the three compiled-in
+functions named above, together with a collection of functions that
+support them. These support functions must be defined in a way such
+that they can be tokenized into Industry Standard FCode, conformant to
+the Open Firmware specification, without imposing any non-Standard
+requirements on the FCode interpreter of the Host Platform.
+<p>The obvious way to deliver this package of support functions would
+be to incorporate, into
+the FCode source being Tokenized, a Prologue or "Library" file that
+contains the definitions of the three above-named compiled-in
+functions, along with all their required support.<br>
+</p>
+<p>A file defining the Local Values Support Functions has been written
+and
+will be delivered as part of the implementation of this
+Project. The user/programmer will be responsible for <span
+ style="font-family: courier new;">fload</span>ing
+it into the FCode source program to be Tokenized.<br>
+</p>
+<p>The user/programmer has the option of specifying the
+placement of the Local Values Support Functions file within the body of
+the
+FCode source program, and even of making alterations to it, if needed.<br>
+</p>
+<p><b><a name="Error_handling"></a>Error handling:</b>
+If the Local Values Support Functions file is not <span
+ style="font-family: courier new;">fload</span>ed, then the
+Parser, when it completes the processing of a Local Values declaration,
+i.e, when it encounters the close-curly-brace, or, similarly, when it
+encounters an invocation of a Local Value's name, will proceed as
+normal to compile-in the call to the appropriate function. That
+function's name will not be recognized, and the Tokenizer will exhibit
+the normal error-behavior for an invocation of an unrecognized name.<br>
+</p>
+<h4><a class="mozTocH4" name="mozTocId191315"></a>Operational Run-Time
+Support
+Functions:</h4>
+To make Local Values operate, we will, of course, need to reserve an
+area of Backing Storage. The size of that area will be <a
+ href="#Adjusting_size_of_L_V_Storage">adjustable by
+the programmer</a>, and we have chosen a suitable default.<br>
+<p>We define a
+ <b>locals-base</b> pointer that will point to the base
+-- within the reserved Local Values Storage Area -- of the set of Local
+Values currently in use; it will be initialized to point just past the
+end of the locals-storage area.
+</p>
+<p><a name="_local"></a> The address to which the <i><n></i>
+ <b>_{local}</b>
+ routine will point is calculated as the given number of cells
+above the <b>locals-base</b> pointer. </p>
+<p><a name="push-locals"></a> The <i>( #I-Ls #U-Ls -- )</i>
+<b>{push-locals}</b>
+ routine works in two stages: for the Unitialized Local Values,
+it
+simply decrements the <b>locals-base</b> pointer by the
+number of cells given in the top argument. The Initialized Local Values
+are
+then handled one at a time: the <b>locals-base</b>
+pointer is decremented by a single cell, and the data-item on top of
+the parameter stack is popped and stored into the cell at which the
+ <b>locals-base</b> pointer now points. The result is
+that the topmost stack-item is placed in the last-declared Initialized
+Local, and so on down the line until the lowest stack-item is placed in
+the first-declared Initialized Local Value. Neat, sweet, and petite. </p>
+<p><a name="pop-locals"></a> The <i>( #-Ls -- )</i> <b>{pop-locals}</b>
+
+routine simply increments the <b>locals-base</b>
+pointer by the given number of cells, which is the total number of
+Local Values used by the function in which it
+occurs. </p>
+<p> Because functions that use Local Values can call each other, (i.e.,
+the use of Local Values can be nested), the depth of the nesting might
+be
+unpredictable. Therefore, the <b>{push-locals}</b>
+routine must perform error-checking: Before decrementing the <b>locals-base</b>
+pointer, it must test whether doing so would put the pointer
+below the start of the area reserved for Local Values Storage. Such an
+error is inevitably fatal, and can only be handled by an <b>ABORT</b>
+ occurring in conjunction with a warning message advising the
+programmer to increase the size of the Local Values Storage (and, by
+implication, re-Tokenize).
+</p>
+<p> It will be the developer's responsibility to catch all such errors
+during early testing. To prevent generating hidden errors of this sort,
+the programmer is advised to use Local Values judiciously, and
+particularly to avoid using them in functions that may be called
+re-entrantly or recursively to an uncontrolled depth. Fortunately, such
+routines are rare and easily identified.
+</p>
+<p>Additional help can be provided in the form of a second <span
+ style="font-family: courier new;">fload</span>able
+Local Values Support Function source file -- to be used during
+development only -- that would overload the
+ <b>{push-locals}</b>
+and
+ <b>{pop-locals}</b> routines with the additional action
+of keeping track of -- and, of course, displaying at will
+--
+the maximum depth used in the course of a test run. Such overloading of
+functions is very simple and straightforward in FORTH.<br>
+</p>
+<h4><a class="mozTocH4" name="mozTocId750894"></a><a
+ name="Instance_Data_in_L_V_Support"></a>Important note
+regarding <span style="font-family: courier new,courier,monospace;">fload</span>ing
+of the Local Values Support Functions file</h4>
+In order to simplify management of the allocation and de-allocation of
+the area of Backing Storage, and to assure independence among instances
+of a device-package, both the reserved Local Values Storage Area and
+the <b>locals-base</b> pointer are created as part
+of the device-node's <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span>
+data.<br>
+<br>
+The <a href="TokenizerNewFeatures.htm#INSTANCE_at_run_time">consequence</a>
+of this is that, in device-drivers that are configured
+with <a href="TokenizerNewFeatures.htm#Multiple_device_nodes">multiple
+device-nodes</a>, the Local Values Support Functions file
+must be re-<span style="font-family: courier new;">fload</span>ed for
+each device-node that uses Local Values. That is to say, every
+invocation of the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">new-device</span>
+command creates a new device node; if that new device-node will be
+making use of Local Values, then the Local Values Support
+Functions file must be <span style="font-family: courier new;">fload</span>ed
+again.<br>
+<p>The Tokenizer is sophisticated enough to keep a <a
+ href="TokenizerNewFeatures.htm#device-node_vocabularies">separate
+vocabulary
+for each device-node</a>, and will flag an <a href="#Error_handling">Error</a>
+if Local Values are used in a device-node for which the Local Values
+Support Functions file has not been <span
+ style="font-family: courier new;">fload</span>ed. </p>
+<p>However, should the user so choose, a <a
+ href="TokenizerNewFeatures.htm#Example_4">means</a> is available
+whereby a single <span style="font-family: courier new;">fload</span>ing
+of the Local Values
+Support Functions can become <a
+ href="TokenizerNewFeatures.htm#Global_Definitions">accessible to all
+Device Nodes</a> in a driver, trading off economy of System-memory
+for convenience of programming. </p>
+<h4><a class="mozTocH4" name="mozTocId684194"></a><a
+ name="Adjusting_size_of_L_V_Storage"></a>Adjusting the size of
+Local Values Storage:</h4>
+The user is responsible for declaring the maximum depth of the run-time
+Local Values stack, in storage units (Cells).<br>
+<br>
+This may be accomplished either by:<br>
+<ul>
+ <li>defining a constant named <b>_local-storage-size_</b>
+before <span style="font-family: courier new;">fload</span>ing the
+Local Values Support Functions file</li>
+ <li>defining <b>_local-storage-size_</b> as a
+Command-Line User-Symbol when the Tokenizer is run.</li>
+</ul>
+<div style="margin-left: 40px;">The form of the Command-Line
+User-Symbol definition resembles:<br>
+<div style="text-align: center;"> <span
+ style="font-family: courier new,courier,monospace;">-d
+'_local-storage-size_=d# <span style="font-style: italic;">42</span>'</span><br>
+<span style="font-family: courier new,courier,monospace;"></span></div>
+ (Be sure to enclose it within quotes
+so that the Shell treats it as a single string, and, of course, replace
+the <span
+ style="font-family: courier new,courier,monospace; font-style: italic;">42</span>
+with the actual number you need...)<br>
+</div>
+<br>
+If <b>_local-storage-size_</b> is defined
+both ways, the Command-Line User-Symbol will prevail.<br>
+<br>
+If the <b>_local-storage-size_</b> definition
+is omitted, the Local Values Support Functions file will supply a
+default.<br>
+<h4><a class="mozTocH4" name="mozTocId208497"></a>Additional Support
+Function(s):</h4>
+<h5><a class="mozTocH5" name="mozTocId781114"></a>CATCH / THROW</h5>
+Another way that a function might exit prematurely is via a call to <b><i>throw</i></b>
+ .
+<p>An FCode program that utilizes Local Values, that calls <b><i>throw</i></b>
+,
+and that has a corresponding <b><i>catch</i></b> to guard it, will
+need to
+keep its Local Values properly synchronized.
+</p>
+<p>A <b><i>throw</i></b> done by an FCode program that does not have a
+corresponding <b><i>catch</i></b> to guard it will be caught outside
+the scope of that FCode program, and the question of synchronizing
+Local Values will be rendered irrelevant.
+</p>
+<p>An <a href="TokenizerNewFeatures.htm#The_OVERLOAD_Directive">overloaded</a>
+<b><i>catch</i></b> in the Local Values Support
+Functions file does the job.<br>
+</p>
+<p>Constructing it was quite simple: It needs to (a) save
+the <b>locals-base</b> pointer onto the return stack,
+(b) do a system (generic) CATCH, and (c) restore the <b>locals-base</b>
+ pointer. Counterintuitive though this might be, it does not even
+need to examine the result of the system (generic) CATCH ; it can
+restore the <b>locals-base</b> pointer in either case.
+If the result was zero (i.e., no <b><i>throw</i></b> occurred), the
+Local Values Pointer will be the same as it was when saved and
+restoring it
+will be harmless...
+</p>
+<!-- ...................................................................................... -->
+<!-- =========================================================================== -->
+<h2><a class="mozTocH2" name="mozTocId951082"></a>End Of Document</h2>
+<!-- =========================================================================== -->
+<br>
+<br>
+<br>
+</body>
+</html>
Added: fcode-utils/documentation/toke.html
===================================================================
--- fcode-utils/documentation/toke.html (rev 0)
+++ fcode-utils/documentation/toke.html 2006-10-30 16:58:53 UTC (rev 109)
@@ -0,0 +1,3968 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<!-- ESWDESDOCFILE %Z%%M% %I% %W% %G% %U% -->
+ <title>ESW PART-FW: New Features in the OpenBIOS Tokenizer toke (A
+User's Guide)</title>
+ <link rel="stylesheet" type="text/css"
+ href="workbook.css">
+</head>
+<body>
+<h1 style="text-align: center;" class="title"><a class="mozTocH1"
+ name="mozTocId449746"></a>New Features in OpenBIOS Tokenizer toke
+</h1>
+<h1 style="text-align: center;"><a class="mozTocH1"
+ name="mozTocId459488"></a>(A
+User's Guide)
+</h1>
+<div class="document-control">
+<ul>
+ <li>Updated Wed, 18 Oct 2006 at 12:39 PDT by David L. Paktor </li>
+</ul>
+</div>
+<p class="copyright">Copyright © 2005 International Business
+Machines<sup>®</sup>,
+All Rights Reserved.<br>
+Licensed under the <a
+ href="http://www.opensource.org/licenses/cpl1.0.php">Common Public
+License (CPL) version 1.0</a><br>
+</p>
+<!-- =========================================================================== --><!-- =========================================================================== -->
+<h2><a class="mozTocH2" name="mozTocId700910"></a><a name="TOC"></a>Table
+Of Contents</h2>
+<ol id="mozToc">
+<!--mozToc h1 1 h2 2 h3 3 h4 4 h5 5 h6 6--><a href="#mozTocId459488">New
+Features in OpenBIOS Tokenizer toke (A User's Guide)</a><br>
+ <li><a href="#mozTocId601312">Overview</a></li>
+ <li><a href="#mozTocId119716">Scope of this Document</a>
+ <ol>
+ <li><a href="#mozTocId206214">What this document
+does not cover: </a></li>
+ </ol>
+ </li>
+ <li><a href="#mozTocId343012">Error Detection
+and other messages:</a></li>
+ <li><a href="#mozTocId271949">Case Sensitivity</a><br>
+ </li>
+ <li><a href="#mozTocId280593">Categories of Features</a>
+ <ol>
+ <li><a href="#mozTocId460640">Directives</a></li>
+ <li><a href="#mozTocId930032">Command-Line options</a></li>
+ <li><a href="#mozTocId379181">Non-standard input,
+syntaxes and behavior</a></li>
+ <li><a href="#mozTocId303703">“Tokenizer-Escape” Mode</a></li>
+ </ol>
+ </li>
+ <li><a href="#mozTocId959733">Features, by Category:</a>
+ <ol>
+ <li><a href="#mozTocId499618">Command-Line options</a>
+ <ol>
+ <li><a href="#mozTocId510152">Switches</a></li>
+ <li><a href="#mozTocId514350">Include-List Directories</a></li>
+ <li><a href="#mozTocId515750">Trace the Creation and
+Invocation of FCode or
+"Tokenizer Escape"-mode Definitions</a><br>
+ </li>
+ <li><a href="#mozTocId580387">Command-Line Symbol Definitions</a></li>
+ <li><a href="#mozTocId632060">Special-Feature Flags</a></li>
+ </ol>
+ </li>
+ <li><a href="#mozTocId445349">“Tokenizer-Escape” Mode</a></li>
+ <ol>
+ <li><a href="#mozTocId445715">The <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">emit-byte</span>
+command</a></li>
+ <li><a href="#mozTocId446081">Other commands</a></li>
+ <ol>
+ <li><a href="#mozTocId446447">Standard Commands</a></li>
+ <ol>
+ <li><a href="#mozTocId446813">The <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">next-fcode</span>
+command</a></li>
+ </ol>
+ <li><a href="#mozTocId447179">Non-Standard operations</a></li>
+ <ol>
+ <li><a href="#mozTocId447545">constant</a></li>
+ <li><a href="#mozTocId447911">emit-fcode</a></li>
+ </ol>
+ <li><a href="#mozTocId448277">Additional FORTH-compatible
+operations</a><br>
+ </li>
+ </ol>
+ </ol>
+ <li><a href="#mozTocId649525">Directives</a>
+ <ol>
+ <li><a href="#mozTocId557512">Conditional Tokenization</a>
+ <ol>
+ <li><a href="#mozTocId686605">The Conditional-block
+Terminator</a></li>
+ <li><a href="#mozTocId763728">The
+"False" segment-switcher</a></li>
+ <li><a href="#mozTocId375310">Condition-Testers</a></li>
+ <ol>
+ <li><a href="#mozTocId104560">True/False flag
+on the top of the stack</a></li>
+ <li><a href="#mozTocId956359">Existence or
+non-existence of an
+FCode or "Tokenizer Escape"-mode definition</a></li>
+ <li><a href="#mozTocId880808">Definition or
+non-definition of a
+Command-Line Symbol</a></li>
+ </ol>
+ <li><a href="#mozTocId891224">Tracing the state of
+Conditional Tokenization</a><br>
+ </li>
+ </ol>
+ </li>
+ <li><a href="#mozTocId202222">Suspending the Duplicate-Name
+Test
+for one Definition ("Overloading")</a></li>
+ <li><a href="#mozTocId202620">Suspending the Multi-Line
+Warning for one occasion</a><br>
+ </li>
+ <li><a href="#mozTocId203416">Controlling the Scope of
+Definitions</a><br>
+ </li>
+ <li><a href="#mozTocId314185">Evaluating
+Command-line Symbols </a></li>
+ <li><a href="#mozTocId655967">Outputting
+Arbitrary Byte-Sequences to
+the FCode Binary</a></li>
+ <li><a href="#mozTocId114013">Encoding
+blocks of binary data taken from a file</a></li>
+ <li><a href="#mozTocId69109">Generating Special Text-Strings
+and Literals</a><br>
+ </li>
+ <ol>
+ <li><a href="#mozTocId70133">Current date or time</a></li>
+ <li><a href="#mozTocId71157">Name of the function
+currently being defined</a></li>
+ <li><a href="#mozTocId72181">Input-File Name and Line Number</a></li>
+ </ol>
+ <li><a href="#mozTocId844437">Pre-pending
+PCI Headers to FCode
+images </a></li>
+ <li><a href="#mozTocId931658">Modifying the PCI
+Header</a>
+ <ol>
+ <li><a href="#mozTocId504353">"Revision
+Level of the Vendor's ROM"</a></li>
+ <ol>
+ <li><a href="#mozTocId503878">Byte-Order</a></li>
+ </ol>
+ <li><a href="#mozTocId53081">"Last
+Image Indicator" bit</a></li>
+ </ol>
+ </li>
+ <li><a href="#mozTocId410469">Changing the name of the
+Binary Output File</a></li>
+ <li><a href="#mozTocId982642">Issuing messages at
+Tokenization
+time.</a></li>
+ <li><a href="#mozTocId550942">Changing Special-Feature
+Flags
+from Source</a>
+ <ol>
+ <li><a href="#mozTocId551846">Displaying
+Special-Feature Flags from Source</a></li>
+ </ol>
+ </li>
+ <li><a href="#mozTocId573280">Manipulating the
+FCode-Token-Number Assignment Counter</a></li>
+ <ol>
+ <li><a href="#mozTocId566072">Saving
+and Restoring</a></li>
+ <li><a href="#mozTocId568474">Resetting</a><br>
+ </li>
+ </ol>
+ <li><a href="#mozTocId575686">Resetting
+Symbols Defined in Either Mode</a></li>
+ </ol>
+ </li>
+ <li><a href="#mozTocId957252">Non-standard input,
+syntaxes, and behavior </a>
+ <ol>
+ <li><a href="#mozTocId850914">Ambiguous
+Conditions</a>
+ <ol>
+ <li><a href="#mozTocId162252">Tokens
+expected on the same
+line</a></li>
+ <li><a href="#mozTocId246601">The <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">h#</span>
+ <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">d#</span> and
+ <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">o#</span>
+directives </a></li>
+ <li><a href="#mozTocId978546">The
+commands <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">leave</span>
+ <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">?leave</span>
+or <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">unloop</span>
+outside of a loop-control framework</a></li>
+ <li><a href="#mozTocId73206">The
+commands <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[']</span>
+or <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">'</span>
+followed by a name that is not a valid target</a></li>
+ <li><a href="#mozTocId74410">The Forth word <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">to</span>
+followed by a name that is not a valid target </a><br>
+ </li>
+ <li><a href="#mozTocId75614">The word <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span><br>
+ </a></li>
+ <ol>
+ <li><a href="#mozTocId76818">Followed by an
+inapplicable defining-word</a></li>
+ <li><a href="#mozTocId78022">Left unresolved</a></li>
+ <li><a href="#mozTocId79226">Not Allowed in...</a></li>
+ </ol>
+ <li><a href="#mozTocId884280">The command <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">fload</span>
+inside a colon-definition<br>
+ </a></li>
+ </ol>
+ </li>
+ <li><a href="#mozTocId901662">Non-Standard
+Synonyms for Standard
+Functions</a></li>
+ <li><a href="#mozTocId732819">Non-Standard
+Functions or behaviors</a>
+ <ol>
+ <li><a href="#mozTocId522750">Alias</a></li>
+ <li><a href="#mozTocId824541">String-Escape
+characters and other
+String-Gathering Features </a></li>
+ <ol>
+ <li><a href="#mozTocId945290">Quoted
+String-Escape Characters</a></li>
+ <li><a href="#mozTocId758170">Embedded New-Lines</a></li>
+ <li><a href="#mozTocId42456">Hex-Sequence
+Processing </a></li>
+ <li><a href="#mozTocId150131">C-Style
+String-Escape Characters</a></li>
+ </ol>
+ <li><a href="#mozTocId40998">The ABORT"
+(Abort-Quote) command</a></li>
+ <li><a href="#mozTocId526780">Conveniently
+Convert Short
+Character-Sequence to Number</a></li>
+ <ol>
+ <li><a href="#mozTocId53626">Left-Justified</a><br>
+ </li>
+ </ol>
+ <li><a href="#mozTocId54171">F[']
+("Eff-Bracket-Tick-Bracket")</a></li>
+ <ol>
+ <li><a href="#mozTocId54716">F['] in "Normal
+Tokenization" Mode</a></li>
+ <li><a href="#mozTocId55261">F['] in "Tokenizer-Escape"
+Mode</a><br>
+ </li>
+ </ol>
+ <li><a href="#mozTocId887752">Shell-Environment Variables
+in File-Names</a><br>
+ </li>
+ </ol>
+ </li>
+ <li><a href="#mozTocId505746">Featured
+behaviors, supported by this
+Tokenizer, that are not mentioned in the Standard</a>
+ <ol>
+ <li><a href="#mozTocId530910">User-Defined Macros</a><br>
+ </li>
+ <li><a href="#mozTocId539069">Multiple
+device-nodes</a></li>
+ <ol>
+ <li><a href="#mozTocId540605">Global Definitions</a><br>
+ </li>
+ </ol>
+ <li><a href="#mozTocId354426">Multiple
+FCode-block Images</a></li>
+ <li><a href="#mozTocId232809">Multiple
+PCI-Image</a></li>
+ </ol>
+ </li>
+ </ol>
+ </li>
+ </ol>
+ </li>
+ <li><a href="#mozTocId194505">Examples:</a>
+ <ol>
+ <li><a href="#mozTocId544211">Example #1:</a></li>
+ <li><a href="#mozTocId80432">Example #2: </a></li>
+ <li><a href="#mozTocId455242">Example #3:</a></li>
+ <li><a href="#mozTocId861304">Example #4:</a></li>
+ <li><a href="#mozTocId866180">Example #5:</a><br>
+ </li>
+ </ol>
+ </li>
+</ol>
+<h2><a class="mozTocH2" name="mozTocId601312"></a>Overview</h2>
+<!-- ...................................................................................... -->
+<p>The goal of this project is to produce an FCode Tokenizer that can
+both
+be used in-house and be presented to third-party vendors, VARs and the
+like, as a professional-quality tool for their use, without adversely
+affecting IBM's
+Intellectual-Property rights.</p>
+<p>We are using, as a starting basis, the Open-Source tokenizer
+that is available from the <a href="http://openbios.org/">OpenBIOS
+project</a> . </p>
+<p>We expect to be able to deliver this tool to our vendors by
+returning our modifications to the OpenBIOS project, from whence it can
+be obtained openly by anyone. </p>
+<h2><a class="mozTocH2" name="mozTocId119716"></a>Scope of this Document</h2>
+<!-- ...................................................................................... -->
+In order to achieve the first part of the goal -- making it suitable
+for in-house use -- a number of features were added that are not
+covered in the IEEE-1275 Standard for Boot Firmware (also referred to
+herein simply as "the Standard").
+<p>This document describes those <a href="#Categories_of_Features">features</a>
+and how they are used.
+</p>
+<p>There will be a brief overview of <a
+ href="#Error_Detection_and_other_messages:">Error Detection</a> and
+other
+messages.</p>
+<p>There will be some <a href="#Examples:">examples</a> at the end.<br>
+</p>
+<h3><a class="mozTocH3" name="mozTocId206214"></a>What this document
+does not cover:<br>
+</h3>
+<ul>
+ <li>Standard behavior, particularly conversion between ANSI /
+IEEE-1275 Standard Forth and IEEE-1275 Standard FCode, and standard
+Tokenizer Macros. These are
+expected and will be regarded as "presumed" by this document.</li>
+ <li>Changes to older versions of the OpenBIOS Tokenizer.</li>
+ <li>A complete list of Tokenization Source Errors detected and
+reported.</li>
+ <li>A complete list of conditions that generate WARNING or ADVISORY
+messages.</li>
+ <li>A complete list of FATAL conditions.<br>
+ </li>
+ <li>Support for <a href="TokenizerLocalValues.htm">IBM-Style Local
+Values</a>. That is the subject of a
+separate writeup.</li>
+</ul>
+<!-- =========================================================================== -->
+<!-- =========================================================================== -->
+<h2><a class="mozTocH2" name="mozTocId343012"></a><a
+ name="Error_Detection_and_other_messages:"></a>Error Detection
+and other messages:</h2>
+The Tokenizer is capable of producing the following kinds of messages:<br>
+<ul>
+ <li>FATAL</li>
+ <li>ERROR</li>
+ <li>WARNING</li>
+ <li>ADVISORY</li>
+ <li>MESSAGE generated by the User.</li>
+ <li>TRACE-NOTE<br>
+ </li>
+</ul>
+<p>A <span style="font-style: italic; font-weight: bold;">FATAL</span>
+condition is sufficient cause to immediately stop activity. It is
+usually (but not always) a symptom of a system failure, rather than a
+result of User
+input.</p>
+<p><a name="An_ERROR"></a>An <span
+ style="font-style: italic; font-weight: bold;">ERROR</span>
+occurs as a result of User input. It is a condition sufficient to
+make the run a failure, but not to stop activity. Unless the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold; font-style: italic;">-i</span>
+<a href="#Ignore_Errors_option">("Ignore Errors")</a> <a
+ href="#Command-Line_options_">Command-Line
+option</a> has been specified, the production of a Binary
+Output file
+will be suppressed and theTokenizer will exit with a non-zero status,
+if an Error Message has been issued. <br>
+</p>
+<p><a name="A_WARNING"></a>A <span
+ style="font-weight: bold; font-style: italic;">WARNING</span>
+is issued for a condition that, while not necessarily an error, might
+be something to avoid. E.g., a deprecated feature, or a
+feature that might be incompatible with other Standard tokenizers.</p>
+<p><a name="Advisories"></a>An <span
+ style="font-weight: bold; font-style: italic;">ADVISORY</span>
+message is issued for a condition that is a response to User input, and
+where processing continues unchanged, but it is nonetheless (in
+this author's opinion) worthwhile to give the User a "heads-up" to make
+sure that what you got is what you wanted. <span
+ style="font-weight: bold; font-style: italic;">ADVISORY</span>
+messages are only displayed when the <a
+ style="font-style: italic; font-weight: bold;" href="#verbose_option">verbose</a>
+<a href="#Command-Line_options_">Command-Line option</a> is selected. </p>
+<p>
+A User-generated <span style="font-weight: bold; font-style: italic;">MESSAGE</span>
+-- unsurprisingly -- is a message generated by the User via any of the
+<a href="#User_Messages">directives</a> supported for that purpose.<br>
+</p>
+<p><a name="Trace_Notes"></a>A <span
+ style="font-weight: bold; font-style: italic;">TRACE-NOTE</span> is
+issued if the <a href="#Trace_Symbols">Trace-Symbols</a>
+feature is activated, whenever a symbol on the Trace-List is either
+created or invoked.<br>
+</p>
+<p><a name="Message_Format"></a>Each message of the above types is
+accompanied by the name of the
+source file and the line number in which the condition that triggered
+it was detected, as well as the current position to which data is being
+generated into the Binary Output. If a PCI Header is in effect,
+the position relative to the end of that PCI Header will also be shown;
+this is to maintain consistency with the <a
+ href="DeTokenizer.htm#with_offsets">"offsets</a>" displayed be the <a
+ href="DeTokenizer.htm">DeTokenizer</a><br>
+</p>
+<p><a name="Errors_Ignored"></a>
+The Tokenizer typically runs through to completion of the source file,
+displaying an ERROR message for each error it encounters (I.e., it does
+not "bail" after the first error). If the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold; font-style: italic;">-i</span>
+<a href="#Ignore_Errors_option">("Ignore
+Errors")</a> <a href="#Command-Line_options_">Command-Line
+option</a> has been specified, the Tokenizer will attempt to
+produce binary output for each error, as far as is feasible, and will
+produce
+a Binary Output file. While this practice is not recommended, the
+author acknowledges that it
+might be useful in some limited circumstances.</p>
+At the end of its run, the Tokenizer will print a tally of the number
+of each type of message that was generated.<br>
+<h2><a name="mozTocId271949"></a><a name="Case_Sensitivity"></a>Case
+Sensitivity</h2>
+Although Command-Line option
+<a href="#Command_Line_Switches">switches</a>
+are case-sensitive, this Tokenizer is insensitive to the distinctions
+between upper- or
+lower- -case characters in all other matters: in Command-Line <a
+ href="#Symbol_Definitions">symbol-definitions</a> and <a
+ href="#Special_Feature_Flags">Special-Feature Flag</a> settings and in
+the Input Source.<br>
+<p>Character-case is preserved in string sequences and in the
+assignment
+of names of headered definitions, but is ignored for purposes of
+name-matching. Case sensitivity of filenames, of course, is
+dependent on the Host Operating System.<br>
+</p>
+<p>This Tokenizer supports a pair of Special-Feature Flags that will
+enable the User to <a href="#Token_Name_Cases">over-ride the
+preservation of character-case</a> in the
+assignment
+of names of headered definitions. </p>
+<h2><a class="mozTocH2" name="mozTocId280593"></a><a
+ name="Categories_of_Features"></a>Categories of <a
+ href="#Features_by_Category">Features</a></h2>
+<!-- ...................................................................................... -->
+The features described in this document fall into four categories:<br>
+<ol>
+ <li><a href="#Directives">Directives</a></li>
+ <li><a href="#Command-Line_options">Command-Line options</a></li>
+ <li><a href="#Non-standard_input_syntaxes">Non-standard</a>
+input, syntaxes, and behavior</li>
+ <li>Options available within “<a href="#Tokenizer-Escape_Mode">tokenizer-escape</a>”
+mode (I.e., within
+the scope of a <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">tokenizer[
+... ]tokenizer</span> block).</li>
+</ol>
+<h3><a class="mozTocH3" name="mozTocId460640"></a><a name="Directives"></a>Directives</h3>
+<a href="#Directives_">Directives</a> are commands that occur within
+the body of the Tokenization
+Source File, but are not part of the FCode program itself. They
+are recognized by the Tokenizer and cause it to perform special actions
+that might serve such diverse functions as:<br>
+<ul>
+ <li>Printing a message to the Standard Output during the Tokenization
+process</li>
+ <li>Controlling whether selected passages of the Source are
+processed or ignored (also called Conditional Compilation or
+Conditional Tokenization)</li>
+ <li>Outputting arbitrary sequences of bytes to the FCode binary file</li>
+</ul>
+<h3><a class="mozTocH3" name="mozTocId930032"></a><a
+ name="Command-Line_options"></a>Command-Line options</h3>
+<a href="#Command-Line_options_">Command-Line options</a> are, as the
+name suggests, switches that can be
+set on the command-line when the Tokenizer is invoked. They
+affect behaviors such as:<br>
+<ul>
+ <li>The verbosity of output during the Tokenization
+process</li>
+ <li>Definition of symbols that feed into some of the Conditional
+Tokenization Directives<br>
+ </li>
+ <li>Allowing output to be produced even when errors have been
+detected.</li>
+ <li>Selectively
+enabling variants of Non-standard input, syntaxes, and behavior<br>
+ </li>
+</ul>
+<h3><a class="mozTocH3" name="mozTocId379181"></a><a
+ name="Non-standard_input_syntaxes"></a><a
+ href="#Non-standard_input_syntaxes_">Non-standard input</a>,
+syntaxes and behavior</h3>
+Certain sequences of source code that are not covered by the IEEE-1275
+Standard are, nonetheless, recognized by this Tokenizer and cause it to
+produce valid FCode. Examples of these include:<br>
+<ul>
+ <li>"C"-style escape characters in strings</li>
+ <li>Sun-style versus Apple-style implementation of the command <span
+ style="font-weight: bold; font-family: courier new,courier,monospace;">ABORT"</span>
+ <br>
+ </li>
+ <li>IBM-style Local-Values</li>
+</ul>
+In order to
+accommodate the conflicting goals of standard-compliance and
+convenience, non-Standard variants will be selectively enabled by
+a set of Command-Line options known as "<a href="#Special_Feature_Flags">Special-Feature
+Flags</a>"
+<h3><a class="mozTocH3" name="mozTocId303703"></a><a
+ name="Tokenizer-Escape_Mode"></a>“Tokenizer-Escape” Mode</h3>
+Section C.3.1 of
+the IEEE-1275 Standard describes “<a href="#Tokenizer-Escape_Mode_">tokenizer-escape</a>”
+mode and its basic
+command, <a href="#emit_byte"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">emit-byte</span></a>
+The OpenBIOS Tokenizer toke, while it does not have a full FORTH
+capability, does support a few additional Forth-style commands that can
+be used to:<br>
+<ul>
+ <li>Define and retrieve named constants</li>
+ <li>Create aliases</li>
+ <li>Set the value of the next FCode-token<br>
+ </li>
+</ul>
+<!-- =========================================================================== -->
+<!-- =========================================================================== -->
+<h2><a class="mozTocH2" name="mozTocId959733"></a><a
+ name="Features_by_Category"></a>Features, by Category:</h2>
+The following sections will supply a complete list of the new features,
+organized by category.<br>
+<!-- ...................................................................................... -->
+<h3><a class="mozTocH3" name="mozTocId499618"></a><a
+ name="Command-Line_options_"></a>Command-Line options:</h3>
+Command-Line option Switches are <a href="#Case_Sensitivity">case-sensitive</a>;
+their arguments, where applicable, are not.<br>
+<br>
+<h4><a class="mozTocH4" name="mozTocId510152"></a><a
+ name="Command_Line_Switches"></a>Switches</h4>
+<ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-h</span>
+or <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-?</span></li>
+</ul>
+<div style="margin-left: 40px;">Print a brief help message and then
+exit.
+</div>
+<ul>
+ <li><a name="verbose_option"></a><span
+ style="font-weight: bold; font-family: courier new,courier,monospace;">-v</span></li>
+</ul>
+<p style="margin-left: 40px;">Verbose -- print additional
+messages (including <a href="#Advisories">Advisories</a>) during
+tokenization.<br>
+</p>
+<ul>
+ <li
+ style="font-weight: bold; font-family: courier new,courier,monospace;"><a
+ name="Ignore_Errors_option"></a>-i</li>
+</ul>
+<p style="margin-left: 40px;">Ignore Errors. Generate a Binary
+Output <a href="#Errors_Ignored">even if
+errors were reported</a>.
+</p>
+<ul>
+ <li><a name="Binary_Output_Name_option"></a><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-o
+<OutputFileName></span></li>
+</ul>
+<p style="margin-left: 40px;">Direct the Binary Output (FCode result of
+Tokenization) to the named
+file instead of to the <a href="#Binary_Output_File_Name_Default">default-named
+file</a>. This option is not valid when multiple input files are
+named.
+</p>
+<ul>
+ <li><a name="FLoad_List_option"></a><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-l</span></li>
+</ul>
+<p style="margin-left: 40px;">FLoad List -- Collect the names of <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">fload</span>ed
+files into an
+FLoad-List File. The names collected are in the same form as they
+were presented in the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">fload</span>
+statements.
+</p>
+<p style="margin-left: 40px;">The name of the FLoad-List File is
+derived
+from
+the name of
+the Binary Output File, by replacing its extension with <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">.fl</span>
+, or, if the Binary Output File name had no extension, merely appending
+the
+extension <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">.fl<br>
+</span></p>
+<p style="margin-left: 40px;">The Binary Output File name used for this
+purpose is either the one specified <a
+ href="#Binary_Output_Name_option">on the Command
+Line</a>, or the one created by <a
+ href="#Binary_Output_File_Name_Default">default</a>. <br>
+</p>
+<ul>
+ <li><a name="Depncy_List_option"></a><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-P</span>
+(Note: Switch is upper-case)<br>
+ </li>
+</ul>
+<p style="margin-left: 40px;">Dependency List -- Collect the
+fully-resolved pathnames
+of <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">fload</span>ed
+and <a href="#ENCODE_FILE">ENCODE</a>d files into a Dependency-List
+File. The names collected are in the form that is presented to
+the Host Operating System: <a
+ href="#Shell_Env_Vbles_in_File_Names">Shell Environment Variables</a>
+and
+related expressions will be fully expanded, and the directory within
+the <a href="#Include_List">Include-List</a> in which the file was
+found will
+be attached.<br>
+</p>
+<p style="margin-left: 40px;">The name of the Dependency-List File will
+be the same as that of the FLoad-List File, except that its extension
+will be <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">.P</span>
+instead of <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">.fl</span>
+</p>
+<ul>
+ <li>If an FLoad List or a Dependency List is being collected,
+the
+names of any files that cannot be read, for any reason, will be
+collected into
+a Missing-Files-List file.</li>
+</ul>
+<p style="margin-left: 40px;">The name of the Missing-Files-List file
+will be the same as that of the FLoad-List File except that its
+extension will be <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">.fl.missing</span>
+instead of <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">.fl</span></p>
+<p style="margin-left: 40px;">The Missing-Files-List file will not be
+created if all of the files are read successfully.<br>
+</p>
+<p style="margin-left: 40px;">If the name
+of the Binary Output File is <a
+ href="#Binary_Output_File_Name_Directive">changed
+by a directive</a>
+embedded within the Tokenization Source File, that will not alter the
+names of the FLoad-List, Dependency List or Missing-Files-List files.</p>
+<h4><a class="mozTocH4" name="mozTocId514350"></a><a name="Include_List"></a>Include-List
+Directories</h4>
+<ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-I
+directory</span> (Note: Switch is
+upper-case)</li>
+</ul>
+<p style="margin-left: 40px;">This Tokenizer supports the notion of an
+Include-List. The User creates the Include-List by specifying a
+number of <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-I
+directory</span> pairs on the Command-Line. All file-reads,
+whether for an <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">fload</span>
+command or an <a href="#ENCODE_FILE"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">encode-file</span></a>
+directive, will involve a search for the named file through the
+directories of the Include-List, in the order they were supplied on the
+Command-Line.
+</p>
+<p style="margin-left: 40px;">If no Include-List is created, file-reads
+are relative to the Current Working
+Directory. If an Include-List <span style="font-style: italic;">is</span>
+created, file-reads are
+restricted to the directories within it. For the Current Working
+Directory to be included in the file-search, it must be specified
+explicitly. <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-I<big>.</big></span>
+will accomplish that quite
+effectively.<br>
+</p>
+<h4><a name="mozTocId515750"></a><a name="Trace_Symbols"></a>Trace the
+Creation and Invocation of FCode or
+"Tokenizer Escape"-mode Definitions</h4>
+<ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-T
+<</span><span style="font-family: courier new,courier,monospace;">symbol</span><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">></span>
+ (Note: Switch is upper-case)</li>
+</ul>
+<p style="margin-left: 40px;">This Tokenizer supports the notion of a
+"Trace-List". The User creates the Trace-List by specifying a
+number of <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-T
+<symbol></span> pairs on the Command-Line.<br>
+</p>
+<p style="margin-left: 40px;">When a name is defined, whether as an
+FCode, an alias, a Macro or anything else, either in normal
+tokenization mode or "Tokenizer Escape"-mode, if it matches a symbol
+that has been added to the Trace List, a <a href="#Trace_Notes">Trace
+Note</a> Message will be issued indicating that a definition of that
+name has been created. Subsequent <a href="#Trace_Notes">Trace
+Note</a> Messages
+will be issued when the definition of that name is invoked.</p>
+<p style="margin-left: 40px;">This "<span
+ style="font-weight: bold; color: rgb(0, 80, 178);">Trace-Symbols</span>"
+feature can be helpful during maintenance of Legacy
+code, for instance, when multiple symbols carry the same name.<br>
+</p>
+<h4><a class="mozTocH4" name="mozTocId580387"></a><a
+ name="Symbol_Definitions"></a>Command-Line Symbol
+Definitions</h4>
+<ul>
+ <li style="font-family: courier new,courier,monospace;"><a
+ name="Define_Command-Line_symbol"></a><span style="font-weight: bold;">-d
+Symbol</span>[<span style="font-weight: bold;">=Value</span>]</li>
+</ul>
+<p style="margin-left: 40px;">Define a Command-Line Symbol.
+Optionally, assign a value to it. If you wish the "value" to
+contain spaces or quotes, you can accomplish that using the shell
+escape conventions. This sequence may be repeated. Once a
+Symbol is defined on the command-line, it stays in effect for the
+duration of the entire batch of tokenizations (i.e., if there are
+multiple input files named on the command line). Command-Line
+Symbols can be <a href="#Definition_or_non-definition_of_a">tested</a>
+for purposes of Conditional Tokenization, or their assigned values can
+be
+<a href="#Evaluating_Command-line_Symbols">Evaluated</a>.<br>
+</p>
+<h4><a class="mozTocH4" name="mozTocId632060"></a><a
+ name="Special_Feature_Flags"></a>Special-Feature Flags<br>
+</h4>
+<ul>
+ <li style="font-family: courier new,courier,monospace;"><span
+ style="font-weight: bold;">-f</span> [<span style="font-weight: bold;">no</span>]<<span
+ style="font-weight: bold;">FlagName</span>> </li>
+</ul>
+<p style="margin-left: 40px;">The Tokenizer
+recognizes a specific set of Special-Feature Flag-names; each is
+associated with a
+specific non-Standard variant
+behavior. Pass the Flag-name as an argument to the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-f</span>
+switch to enable the behavior; to disable it, precede the Flag-name
+with the
+optional string <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">No</span>
+<br>
+</p>
+<p style="margin-left: 40px;">The settings of the Special-Feature Flags
+can also be <a href="#Changing_C-L_Flags_from_Source">changed</a> or <a
+ href="#Displaying_C-L_Flags_from_Source">displayed</a> from
+within the Source Input File<br>
+</p>
+<p style="margin-left: 40px;">The Special-Feature Flags are all
+initially set to be enabled, except where noted.<br>
+</p>
+<p style="margin-left: 40px;">The Flag-names and their associated
+Special-Features are as follows:</p>
+<ul>
+ <ul>
+ <li><a name="SF_Flag_Loc_Val"></a><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">Local-Values</span></li>
+ </ul>
+</ul>
+<p style="margin-left: 120px;">Support IBM-style <a
+ href="TokenizerLocalValues.htm">Local Values</a> ("LV"s).
+Initially disabled.
+</p>
+<ul>
+ <ul>
+ <li><a name="SF_Flag_LV_Leg_Sep"></a><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">LV-Legacy-Separator</span></li>
+ </ul>
+</ul>
+<p style="margin-left: 120px;">Allow Semicolon for Local Values
+<a
+ href="TokenizerLocalValues.htm#Separation_Character_between_Initialized">Separator</a>
+("<a href="TokenizerLocalValues.htm#Disallow_Legacy">Legacy</a>").
+</p>
+<ul>
+ <ul>
+ <li><a name="SF_Flag_LV_Leg_Mssg"></a><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">LV-Legacy-Message</span></li>
+ </ul>
+</ul>
+<p style="margin-left: 120px;">Display a <a
+ href="TokenizerLocalValues.htm#Legacy_Separator">Warning
+Message</a> when
+Semicolon
+is used as the Local Values Separator.
+</p>
+<ul>
+ <ul>
+ <li><a name="SF_Flag_AB_Q"></a><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">ABORT-Quote</span></li>
+ </ul>
+</ul>
+<p style="margin-left: 120px;">Allow <a href="#SFeat_AB_Q">ABORT"</a>
+macro.
+</p>
+<ul>
+ <ul>
+ <li><a name="SF_Flag_Sun_AB_Q"></a><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">Sun-ABORT-Quote</span></li>
+ </ul>
+</ul>
+<p style="margin-left: 120px;">ABORT" with <a href="#SFeat_Sun_AB_Q">implicit
+IF ... THEN</a>
+</p>
+<ul style="font-family: courier new,courier,monospace;">
+ <ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;"><a
+ name="SF_Flag_AB_Q_Throw"></a>Abort-Quote-Throw</span></li>
+ </ul>
+</ul>
+<p style="margin-left: 120px;">Use <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-2
+THROW</span> , rather than <a href="#Abort_Quote_Abort"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">ABORT</span></a>,
+in an <a href="#SFeat_AB_Q">Abort"</a> phrase</p>
+<ul style="font-family: courier new,courier,monospace;">
+ <ul>
+ <li><a name="SF_Flag_Str_Rem_Esc"></a><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">String-remark-escape</span></li>
+ </ul>
+</ul>
+<p style="margin-left: 120px;">Allow <a href="#SFeat_Str_Rem_Esc">"\
+(Quote-Backslash)</a> to interrupt
+string parsing.
+</p>
+<ul>
+ <ul>
+ <li><a name="SF_Flag_Hex_Rem_Esc"></a><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">Hex-remark-escape</span></li>
+ </ul>
+</ul>
+<p style="margin-left: 120px;">Allow <a href="#SFeat_Hex_Rem_Esc">\
+(Backslash)</a> to interrupt
+<a href="#Hex_Seq_Procg">hex-sequence parsing</a> within a string.
+</p>
+<ul>
+ <ul>
+ <li><a name="SF_Flag_C_Str_Esc"></a><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">C-Style-string-escape</span></li>
+ </ul>
+</ul>
+<p style="margin-left: 120px;">Allow the <a
+ href="#C-Style_String-Escape_Characters"><big><b>C</b></big>-style
+String-Escape</a>
+pairs <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">\n</span>
+<span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">\t</span>
+and <a href="#SFeat_BS_xx"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">\xx\</span></a>
+to be treated as special characters
+in string parsing.
+</p>
+<ul>
+ <ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">Always-Headers</span></li>
+ </ul>
+</ul>
+<p style="margin-left: 120px;">Over-ride occurrences of the
+Standard directive <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">headerless</span>
+in the Source with -- effectively -- <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">headers</span>
+to make all definitions have a header. Occurrences of the
+directive <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">external</span>
+will continue to behave in the Standard manner. Initially
+disabled.
+</p>
+<ul>
+ <ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">Always-External</span></li>
+ </ul>
+</ul>
+<p style="margin-left: 120px;">All definitions will be made as
+though under the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">external</span>
+directive; occurrences of either Standard directive <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">headerless</span>
+or <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">headers</span>
+in the Source will be over-ridden. This Special-Feature Flag will
+also over-ride the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">Always-Headers</span>
+Special-Feature Flag in the event that both have been specified.
+Initially disabled.
+</p>
+<ul>
+ <ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;"><a
+ name="Warn_if_Duplicate_Flag"></a>Warn-if-Duplicate</span></li>
+ </ul>
+</ul>
+<div style="margin-left: 120px;">Display a <a href="#A_WARNING">WARNING</a>
+message whenever
+a
+definition is made
+whose name duplicates that of an existing definition. Disabling
+this flag will suspend the duplicate-names test globally, until it
+is re-enabled. A Directive is supported that will <a
+ href="#The_OVERLOAD_Directive">suspend the
+test for the duration of only a single definition</a>, without
+affecting global behavior.
+</div>
+<ul>
+ <ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;"><a
+ name="Obso_FCode_Warning"></a>Obsolete-FCode-Warning</span></li>
+ </ul>
+</ul>
+<div style="margin-left: 120px;">Display a <a href="#A_WARNING">WARNING</a>
+message whenever an FCode function is invoked that the Standard
+identifies as "obsolete".
+</div>
+<ul>
+ <ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;"><a
+ name="Trace_Condls"></a>Trace-Conditionals</span></li>
+ </ul>
+</ul>
+<div style="margin-left: 120px;">Issue <a href="#Advisories">Advisory
+Messages</a> about the <a href="#Tracing_Conditional_State">state of</a>
+<a href="#Conditional_Tokenization">Conditional Tokenization</a>.
+(Remember that <a href="#Advisories">Advisory
+Messages</a> are displayed only if the "verbose" option <a
+ href="#verbose_option"><span
+ style="font-weight: bold; font-family: courier new,courier,monospace;">-v</span></a>
+is set.)
+Initially disabled.
+</div>
+<ul>
+ <ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;"><a
+ name="Token_Name_Case_Upper"></a><a name="Token_Name_Cases"></a>Upper-Case-Token-Names
+ </span> </li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;"><a
+ name="Token_Name_Case_Lower"></a>Lower-Case-Token-Names </span> </li>
+ </ul>
+</ul>
+<div style="margin-left: 120px;">When outputting the names of headered
+functions ("Token-Names") to the Binary Output File, over-ride the
+character-case in which the names appeared in the Source, and convert
+them to Upper- or Lower- -Case, respectively. (These flags do not
+affect text string sequences, whose character-case is always
+preserved.)
+Initially disabled.<br>
+</div>
+<ul>
+ <ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;"><a
+ name="Big_End_PCI_Rev_Level"></a>Big-End-PCI-Rev-Level</span></li>
+ </ul>
+</ul>
+<div style="margin-left: 120px;">Save the "<a href="#PCI_Rev_Level">Revision
+Level of the
+Vendor's ROM</a>" field of the PCI Header in <a
+ href="#PCI_Rev_Level_Byte_Order">Big-Endian byte-order</a>, rather
+than "Little-Endian" as per the general PCI Standard
+convention. (This flag does not affect any other field of the PCI
+Header).
+Initially disabled.<br>
+</div>
+<ul>
+ <ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;"><a
+ name="Ret_Stk_Interp"></a>Ret-Stk-Interp<br>
+ </span></li>
+ </ul>
+</ul>
+<div style="margin-left: 120px;">Allow Return-Stack Operations during
+Interpretation. While the Standard specifies that usage of the
+operators <span
+ style="font-weight: bold; font-family: courier new,courier,monospace;">>r</span>
+<span
+ style="font-weight: bold; font-family: courier new,courier,monospace;">r@</span>
+and <span
+ style="font-weight: bold; font-family: courier new,courier,monospace;">r></span>
+while interpreting is allowed, actual practice in the industry is
+inconsistent. Developers who wish to take a more cautious
+approach to this question can disable this flag so that any attempt to
+use the operators <span
+ style="font-weight: bold; font-family: courier new,courier,monospace;">>r</span>
+<span
+ style="font-weight: bold; font-family: courier new,courier,monospace;">r@</span>
+and <span
+ style="font-weight: bold; font-family: courier new,courier,monospace;">r></span>
+in the "interpreting" state will generate an <a href="#An_ERROR">ERROR</a>
+Message.<br>
+</div>
+<p style="margin-left: 40px;">
+Also, the pseudo-Flag-name <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">help</span>
+will cause a list of the Flag-names and their associated
+Special-Features to be printed.</p>
+<p style="margin-left: 40px;">
+The use of some of these flags is illustrated in <a href="#Example_2">Example
+#2</a>
+</p>
+<h3><a class="mozTocH3" name="mozTocId445349"></a><a
+ name="Tokenizer-Escape_Mode_"></a>“Tokenizer-Escape” Mode</h3>
+<p>The directive <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">tokenizer[</span>
+behaves as specified in Section C.3.1 of the IEEE-1275 Standard: it
+saves the current tokenizer numeric conversion radix, sets the radix to
+sixteen (hexadecimal) and enters “tokenizer-escape” mode.
+Likewise, the directive <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">]tokenizer</span>
+restores the radix and resumes the Tokenizer’s normal behavior.</p>
+<p>
+For convenience and compatibility with IBM's source-base, the
+directives <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">f[ </span>
+and <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">f]</span>
+are synonyms for <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">tokenizer[</span>
+and <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">]tokenizer</span>
+respectively. In addition, the variant <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">]f</span>
+is a synonym for <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">f]</span>
+.
+</p>
+<p>The numeric conversion radix can be changed during
+“Tokenizer-Escape” mode by the use of the standard directives <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">hex
+decimal </span> and <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">
+octal</span> . These will always change the numeric
+conversion radix in “tokenizer-escape” mode; even if
+“tokenizer-escape” mode was entered in the middle of a
+colon-definition, they will not issue an FCode sequence. And, as
+per the Standard, the numeric conversion radix will be restored when
+the Tokenizer returns to "Normal" mode.<br>
+</p>
+<a name="Tkz_Esc_Scope"></a>Function-names that were defined during
+normal tokenization mode will
+not be recognized in “Tokenizer-escape” mode and vice-versa. The
+one exception is that <a href="#F_B-T-B_TkzEsc"><span
+ style="font-family: courier new; font-weight: bold;">F[']</span></a> ,
+even when invoked in “Tokenizer-escape” mode, will apply to
+function-names that were defined during normal tokenization mode.<br>
+<h4 style="margin-left: 40px;"><a name="mozTocId445715"></a>The <span
+ style="font-family: courier new,courier,monospace;"><a name="emit_byte"></a>emit-byte</span>
+command
+</h4>
+<p style="margin-left: 40px;"><a name="Run-time_data_stack"></a>This
+Tokenizer supports the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">emit-byte</span>
+command as specified in the Section cited above. In order to be
+able to do that, the “tokenizer-escape” mode needs to be able to
+support a tokenization-time data stack, and, indeed, it does.<br>
+</p>
+<h4 style="margin-left: 40px;"><a name="mozTocId446081"></a>Other
+commands</h4>
+<p style="margin-left: 40px;">In
+“tokenizer-escape” mode, a string representing a number (optionally
+preceded by one of the directives <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">h#
+d#</span> or <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">
+o#</span> ) causes that number to be pushed to the stack, where
+it is available for use by any of several other commands as follows:<br>
+</p>
+<h5 style="font-weight: bold; margin-left: 80px;"><big><a
+ name="mozTocId446447"></a>Standard Commands</big></h5>
+<ul style="margin-left: 120px;">
+ <li><a name="mozTocId446813"></a>The <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;"><a
+ name="next_fcode"></a>next-fcode</span> command </li>
+</ul>
+<div style="margin-left: 160px;">Set the value of the
+FCode-token-number
+assignment counter to the
+number
+that was on the stack. Subsequent fcode-functions defined in the
+source will be assigned FCode token numbers starting with this
+number.
+If the number supplied on the stack is outside the legal range
+specified by the IEEE-1275 Standard, the attempt will be disallowed and
+reported as an <a href="#An_ERROR">Error</a>.<br>
+<p>Note that this Tokenizer supports additional directives for <a
+ href="#Manipulate_FCode_Number">manipulating the FCode-token-number
+assignment counter</a>.<br>
+</p>
+</div>
+<h5 style="margin-left: 80px;"><big><a name="mozTocId447179"></a>Non-Standard
+operations
+</big></h5>
+<ul style="margin-left: 120px;">
+ <li><span style="font-family: courier new,courier,monospace;"><span
+ style="font-weight: bold;"><a name="Tkz_Esc_Const"></a><a
+ name="mozTocId447545"></a>constant</span>
+<Name></span><br>
+ </li>
+</ul>
+<p style="margin-left: 160px;">Define <span
+ style="font-family: courier new,courier,monospace;"><Name></span>
+as a named constant with the value that was on the stack. <span
+ style="font-family: courier new,courier,monospace;"><Name></span>
+will be known within “tokenizer-escape” mode but will not be recognized
+during normal tokenization. When <span
+ style="font-family: courier new,courier,monospace;"><Name></span>
+is invoked, its value will be pushed onto the stack. Two named
+constants are pre-defined: <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">true</span>
+and <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">
+false</span><br>
+</p>
+<ul
+ style="font-family: courier new,courier,monospace; margin-left: 120px;">
+ <li><a name="emit_fcode"></a><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;"><a
+ name="mozTocId447911"></a>emit-fcode</span></li>
+</ul>
+<p style="margin-left: 160px;">Emit the value that was on the stack as
+an FCode token, either one or two bytes long, depending on the
+value. Report an <a href="#An_ERROR">Error</a> if the number
+supplied on the stack is
+outside the legal range
+specified by the IEEE-1275 Standard. Since this is sort of a
+"cheat", issue an <a href="#Advisories">Advisory</a> if the
+operation is successful.<br>
+</p>
+<h4 style="margin-left: 40px;"><a name="mozTocId448277"></a>Additional
+FORTH-compatible operations</h4>
+<p style="margin-left: 40px;">
+In addition to the above, “Tokenizer-escape” mode recognizes a limited
+number of FORTH-compatible named constants and operations, as follows:<br>
+</p>
+<ul style="margin-left: 40px;">
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">TRUE</span>
+Push -1 onto the stack </li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">FALSE</span>
+Push 0 onto the stack</li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">0=</span>
+Invert the Boolean-flag on top of the stack: replace 0 with <span
+ style="font-family: courier new,courier,monospace;">TRUE</span>
+or
+any non-zero number with <span
+ style="font-family: courier new,courier,monospace;">FALSE</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">SWAP</span>
+Exchange top two stack items</li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">2SWAP</span>
+Exchange top two pairs of stack items</li>
+ <li><span
+ style="font-weight: bold; font-family: courier new,courier,monospace;">noop</span>
+Take no action. </li>
+</ul>
+<p style="margin-left: 40px;">These are different from the
+corresponding words in "Normal" mode,
+which would
+compile an FCode token. In “Tokenizer-escape” mode, they initiate an
+immediate
+action within the Tokenization process.
+</p>
+<h3><a class="mozTocH3" name="mozTocId649525"></a><a name="Directives_"></a>Directives</h3>
+<p>This Tokenizer supports a number of directives that are not
+specified
+by the Standard, but which serve functions as follows:<br>
+</p>
+<ul>
+ <li><a href="#Conditional_Tokenization">Conditional Tokenization</a></li>
+ <li><a href="#The_OVERLOAD_Directive">Suspending</a> the
+Duplicate-Name
+Test for one Definition ("Overloading")</li>
+ <li>Suspending the <a href="#Allow_Multi_Line">Multi-Line Warning</a>
+for one occasion<br>
+ </li>
+ <li><a href="#mozTocId203416">Controlling the
+Scope of
+Definitions</a></li>
+ <li><a href="#Evaluating_Command-line_Symbols">Evaluation</a> of
+symbols defined on the command-line</li>
+ <li>Outputting <a href="#FLITERAL">arbitrary sequences</a> of bytes
+to the FCode binary file</li>
+ <li><a href="#ENCODE_FILE">Encoding</a> blocks of binary data taken
+from a file</li>
+ <li>Generating <a href="#Gen_Specl_Txt_Strs">Special Text-Strings</a>
+and Literals: <br>
+ </li>
+ <ul>
+ <li>The <a href="#fcode_date">current
+date or time</a>.</li>
+ <li>The <a href="#function_name">name
+of the function</a> currently
+being defined</li>
+ <li>The <a href="#Inp_Fil_Nm_Strg">Input-File Name</a> and Line
+Number <br>
+ </li>
+ </ul>
+ <li>Pre-pending <a href="#Pre_pending_PCI_Headers_to_FCode_images_">PCI
+headers</a> to FCode
+images</li>
+ <li><a href="#Modifying_PCI_Header">Modifying</a> the PCI Header<br>
+ </li>
+ <li>Changing the name of the <a href="#Binary_Output_File_Name">Binary
+Output File</a></li>
+ <li>Issuing a <a href="#User_Messages">message</a> at tokenization
+time</li>
+ <li><a href="#Changing_C-L_Flags_from_Source">Over-riding</a> the
+setting of a <a href="#Special_Feature_Flags">Special-Feature Flag</a></li>
+ <li><a href="#Displaying_C-L_Flags_from_Source">Displaying</a> the
+settings of all the <a href="#Special_Feature_Flags">Special-Feature
+Flags</a> </li>
+ <li><a href="#Manipulate_FCode_Number">Saving, Restoring and
+Resetting the
+FCode-Token-Number Assignment Counter</a> </li>
+ <li><a href="#Resetting_Symbols_Defined_in_Either_Mode">Resetting the
+symbols</a> defined either in Normal Tokenization Mode or in "Tokenizer
+Escape" mode.<br>
+ </li>
+</ul>
+<h4><a class="mozTocH4" name="mozTocId557512"></a><a
+ name="Conditional_Tokenization"></a>Conditional Tokenization</h4>
+The
+OpenBIOS Tokenizer toke supports a fully-nestable Conditional
+Tokenization capability comparable to the one in the "<big><b>C</b></big>"
+pre-processor. A
+Conditional Tokenization block consists of either one or two segments
+-- a "True" segment and an optional "False" segment -- delimited by <a
+ name="Conditional_Operators"></a>Conditional Operators of three types:<br>
+<ul>
+ <li>the <a href="#Condition_Testers">Condition-Tester</a></li>
+ <li>the optional <a href="#The_False_segment-switcher">"False"
+segment switcher</a></li>
+ <li>the <a href="#The_Conditional-block_Terminator">Conditional-block
+terminator</a></li>
+</ul>
+<p>The "True" segment immediately follows the Condition-Tester,
+and
+is ended either by the "False" segment switcher or by the
+Conditional-block terminator. If the "False" segment
+switcher is present, it introduces the "False" segment, which
+is ended by the
+Conditional-block terminator. The three delimiters (in reverse
+order) are:
+</p>
+<h5 style="margin-left: 40px;"><a class="mozTocH5" name="mozTocId686605"></a><a
+ name="The_Conditional-block_Terminator"></a><big>The Conditional-block
+Terminator</big></h5>
+<div style="margin-left: 40px;">Exit the current level of Conditional
+Tokenization.
+<p>If the
+Conditional-block in question was nested within another
+one, resume conditional processing at the
+level of the enclosing segment. When the outermost
+Conditional-block is exited, resume normal processing.<br>
+</p>
+<p>While it is a requirement that the
+Conditional-block terminator be contained within the same Input File as
+the Condition-Tester and its optional "False" segment switcher, the
+body of a Conditional Segment may contain separate <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">fload</span>
+directives, which will be processed or ignored in accordance with the
+prevailing Condition. An <a href="#Example_4_Condl_FLoad">illustration</a>
+can be seen in <a href="#Example_4">Example #4</a>. </p>
+There are several synonyms for the Conditional-block terminator:<br>
+</div>
+<ul style="margin-left: 40px;">
+ <big> </big><li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[then]</span></li>
+ <big> </big><li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">#then</span></li>
+ <big> </big><li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[#then]</span></li>
+ <big> </big><li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[endif]</span></li>
+ <big> </big><li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">#endif</span></li>
+ <big> </big><li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[#endif]</span></li>
+</ul>
+<h5 style="margin-left: 40px;"><a class="mozTocH5" name="mozTocId763728"></a><a
+ name="The_False_segment-switcher"></a><big>The
+"False" segment-switcher</big></h5>
+<p style="margin-left: 40px;">Reverses the sense of the condition and
+introduces the "False"
+segment.</p>
+<p style="margin-left: 40px;">If the Condition-Test resulted in "TRUE",
+then the first segment -- the
+"True" segment -- was processed and the "False" segment will be
+ignored. Conversely, if the Condition-Test resulted in "FALSE",
+then the first segment -- the "True" segment -- was ignored and the
+"False" segment will be processed.</p>
+<p style="margin-left: 40px;">There are three synonyms for this
+function:<br>
+</p>
+<ul style="margin-left: 40px;">
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[else]</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">#else</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[#else]</span></li>
+</ul>
+<h5 style="margin-left: 40px;"><a class="mozTocH5" name="mozTocId375310"></a><a
+ name="Condition_Testers"></a><big>Condition-Testers</big></h5>
+<div style="margin-left: 40px;">Tokenization can be controlled
+according to the following conditions:
+</div>
+<ul style="margin-left: 40px;">
+ <li>A <a href="#TrueFalse_flag_on_the_top_of_the_stack">True/False
+flag</a> on the top of the stack</li>
+ <li><a href="#Existence_or_non-existence_of_an_FCode">Existence</a>
+or non-existence of an FCode or "Tokenizer Escape"-mode
+definition</li>
+ <li><a href="#Definition_or_non-definition_of_a">Definition</a> or
+non-definition of a Command-Line symbol.</li>
+</ul>
+<h5 style="margin-left: 80px;"><a class="mozTocH5" name="mozTocId104560"></a><a
+ name="TrueFalse_flag_on_the_top_of_the_stack"></a><big>True/False flag
+on the top of the
+stack</big></h5>
+<div style="margin-left: 80px;">
+<p>A number that was placed on the stack
+in “Tokenizer-Escape” mode will be consumed and tested. If the
+number was
+non-zero, the Condition-Test will result in "TRUE", and the first
+segment -- the "True" segment -- will be processed and the "False"
+segment, if present, will be ignored. Conversely, if the number
+was zero, the Condition-Test will result in "FALSE", and the first
+segment -- the "True" segment -- will be ignored and the "False"
+segment, if present, will be processed.</p>
+<p>There is only one word for this
+function:<br>
+</p>
+<ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[if]</span></li>
+</ul>
+The <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[if]</span>
+Operator can be invoked from either "Tokenizer Escape" mode or normal
+tokenization mode, but the number to be tested must have been put on
+top of the Stack during "Tokenizer Escape" mode.
+</div>
+<h5 style="margin-left: 80px;"><a class="mozTocH5" name="mozTocId956359"></a><a
+ name="Existence_or_non-existence_of_an_FCode"></a><big>Existence or
+non-existence of an
+FCode or "Tokenizer Escape"-mode definition</big></h5>
+<p style="margin-left: 80px;">A name-string must follow the directive
+<a href="#Expected_on_same_line">on the same line</a>. A
+search for that name is conducted through the word-list of the mode --
+i.e.,
+"Tokenizer Escape" mode versus "Normal" mode -- and the <a
+ href="#Scope_Directives">Scope</a> -- i.e., "<a
+ href="#Global_Definitions">Global</a>" versus "<a
+ href="#device-node_vocabularies">Current Device-Node</a>" -- in which
+the
+Tokenizer is currently operating.</p>
+<p style="margin-left: 80px;">If the directive is for the existence of
+the definition, and the name
+is found, or if the directive is for the non-existence of the
+definition, and the name is not found, the Condition-Test will result
+in "TRUE". Otherwise, the Condition-Test results in "FALSE".</p>
+<div style="margin-left: 80px;">The synonyms for the test for <span
+ style="font-style: italic; font-weight: bold;">existence</span> of a
+definition are:<br>
+</div>
+<ul style="margin-left: 80px;">
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[ifexist]</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">#ifexist</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[#ifexist]</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[ifexists]</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">#ifexists</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[#ifexists]</span></li>
+</ul>
+<p style="margin-left: 120px;">(Note the variants with
+and without a final '<span style="font-weight: bold;">s</span>')<br>
+</p>
+<div style="margin-left: 80px;">The synonyms for the test for <span
+ style="font-weight: bold; font-style: italic;">non-existence</span> of
+a definition are:<br>
+</div>
+<ul style="margin-left: 80px;">
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[ifnexist]</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">#ifnexist</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[#ifnexist]</span></li>
+</ul>
+<div style="margin-left: 120px;">(Note that variants with a final '<span
+ style="font-weight: bold;">s</span>'
+didn't make sense here.)<br>
+</div>
+<h5 style="margin-left: 80px;"><a class="mozTocH5" name="mozTocId880808"></a><a
+ name="Definition_or_non-definition_of_a"></a><big>Definition or
+non-definition of a
+Command-Line Symbol</big></h5>
+<div style="margin-left: 80px;">As noted <a
+ href="#Define_Command-Line_symbol">above</a>, the Tokenizer
+recognizes the syntax<br>
+</div>
+<div style="margin-left: 120px;"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-d
+Symbol</span>[<span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">=Value</span>]
+<br>
+</div>
+<div style="margin-left: 80px;">as the means by which to define a
+Command-Line Symbol and optionally assign a value to it.<br>
+</div>
+<div style="margin-left: 80px;">
+<p>A pair of Condition-Tester directives
+are supported that will test, respectively, for definition or
+non-definition of a named Symbol. Their operation is similar to
+that of the Tests for existence of non-existence of a Definition, in
+that a name-string must follow the directive
+<a href="#Expected_on_same_line">on the same line</a>, but they are
+different in the matter of where the
+search for the name string is conducted: these directives search
+the list of Command-Line Symbols. The relation between the type
+of directive and the result of the search is also similar to that of
+the Tests for existence of non-existence of a Definition.</p>
+</div>
+<div style="margin-left: 80px;">The synonyms for the test for <span
+ style="font-weight: bold; font-style: italic;">definition</span> of a
+Command-Line Symbol are:<br>
+<ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[ifdef]</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">#ifdef</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[#ifdef]</span></li>
+</ul>
+</div>
+<div style="margin-left: 80px;">The synonyms for the test
+for <span style="font-weight: bold; font-style: italic;">non-definition</span>
+of a Command-Line Symbol are:<br>
+<ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[ifndef]</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">#ifndef</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[#ifndef]</span><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;"></span>
+ </li>
+</ul>
+</div>
+<div style="margin-left: 80px;">The test is simply to verify the
+existence of a Symbol; it is not sensitive to
+whether or not the optional value was assigned. <br>
+</div>
+<h5 style="margin-left: 40px;"><a name="mozTocId891224"></a><a
+ name="Tracing_Conditional_State"></a><big>Tracing the state of
+Conditional
+Tokenization</big></h5>
+<div style="margin-left: 40px;">The nesting and un-nesting of
+<a href="#Conditional_Tokenization">Conditional Tokenization</a> can
+become complicated; an <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">fload</span>ed
+file may contain a segment-switcher or Conditional-block terminator
+that interacts with the prevailing Condition-Tester that originated in
+another Source file, which might lead to unexpected results. To
+help trace the status of Conditional Tokenization, the User can invoke
+the <a href="#Trace_Condls"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">Trace-Conditionals</span></a>
+Special-Feature Flag together with the"verbose" option ( <a
+ href="#verbose_option"><span
+ style="font-weight: bold; font-family: courier new,courier,monospace;">-v</span></a>
+). This will cause an <a href="#Advisories">Advisory
+Message</a> to be displayed whenever a <a href="#Conditional_Operators">Conditional
+Operator</a> is
+encountered, even if it is in a segment that is already being ignored.
+The message will indicate the location of the associated <a
+ href="#Condition_Testers">Condition-Tester</a> (or the state of the
+condition, if the Conditional Operator <span
+ style="font-style: italic;">is</span> a Condition-Tester) and whether
+the segment is being Processed or being Ignored. </div>
+<br>
+<h4><a class="mozTocH4" name="mozTocId202222"></a><a
+ name="The_OVERLOAD_Directive"></a><big>Suspending
+the Duplicate-Name Test for one Definition ("Overloading")</big></h4>
+<p>When a definition is created whose name duplicates that of an
+existing definition, default behavior is to issue a <a
+ href="#A_WARNING">WARNING</a>
+notification.
+</p>
+<p>Intentionally creating such a
+duplicately-named definition is called "overloading" the name.
+This may be required, for instance, to supplant future invocations of
+the named function with a version that incorporates the earlier
+instance of the function of
+the same name and supplies additional behavior.
+</p>
+<p>When this is intentional, no warning should be issued. This
+Tokenizer
+supports a directive called <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">overload</span>
+which the User may invoke to bypass the duplicate-name test for the
+duration of only one definition that follows
+it (as contrasted with <a href="#Warn_if_Duplicate_Flag">suspending
+the test globally</a>). An illustration of its use may be seen in
+<a href="#Example_4">Example 4</a>.<br>
+</p>
+<h4><a class="mozTocH4" name="mozTocId202620"></a><a
+ name="Allow_Multi_Line"></a><big>Suspending the Multi-Line Warning
+for one occasion</big></h4>
+<p>The Standard allows Comments and Strings that extend across multiple
+lines, terminated by their specific delimiter. In addition, this
+Tokenizer allows User-generated Messages and Local-Values Declarations
+that, likewise, extend across multiple lines. Because of the
+potential for a cascade of errors that can be caused by a missing
+delimiter, this Tokenizer issues a <a href="#A_WARNING">WARNING</a>
+notification whenever such an entity is encountered. <a
+ href="#Example_5_func_nam">Example #5</a> shows an occasion where this
+might be helpful.<br>
+</p>
+<p>When this is intentional, no warning should be issued. This
+Tokenizer
+supports a directive called <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">multi-line</span>
+which the User may invoke to suppress the notification for the next
+multi-line item that follows
+it. </p>
+<h4><a class="mozTocH4" name="mozTocId203416"></a><a
+ name="Scope_Directives"></a><big>Controlling
+the Scope of Definitions</big></h4>
+<p>The User may wish to create a collection of utility functions
+that will be available to all the device-nodes in a <a
+ href="#Multiple_device_nodes">multiple-node
+driver</a>. Directly accessing such functions across device-nodes
+can
+be risky if any component uses <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span>
+data. However, if the use of <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span>
+data is precluded, such access can be performed safely.</p>
+<p>This Tokenizer
+supports a pair of directives for setting the Scope of
+Definitions. The one called <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">global-definitions</span>
+will cause all subsequent definitions -- Aliases and Macros as well as
+FCode -- to be entered into the same vocabulary -- referred to as the
+"core" -- from which all the Standard functions are drawn. The
+other, called <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">device-definitions</span>
+, will cause the Scope of Definitions to revert to the <a
+ href="#current_device-node"><span
+ style="font-family: courier new,courier,monospace; font-style: italic;">current
+device-node</span></a>. The use of these directives is
+illustrated in
+<a href="#Example_4">Example #4</a>.<br>
+</p>
+<p>While Global Scope is in effect, the use of the word <a
+ href="#Instance_Not_Allowed"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span></a>
+will not be allowed, nor will definitions made in any device-node be
+recognized. Conversely, an attempt to enter Global Scope while <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span>
+is in effect will be reported as an <a href="#An_ERROR">Error</a>
+condition.</p>
+<h4><a class="mozTocH4" name="mozTocId314185"></a><a
+ name="Evaluating_Command-line_Symbols"></a><big>Evaluating
+Command-line Symbols</big></h4>
+A Directive is supported that can be used to extract the <a
+ href="#Define_Command-Line_symbol">optional
+value</a> that was assigned to a Command-Line Symbol.
+<p>The Symbol name must appear <a href="#Expected_on_same_line">on the
+same line</a> as the directive.</p>
+<p>If the Symbol name is not found or no value has been assigned to it,
+a <a href="#A_WARNING">WARNING</a> will
+be issued.</p>
+Otherwise, the associated value will be interpreted as though it were
+source-code.
+<p>The synonyms for the directive to evaluate a Command-Line Symbol's
+assigned value are:<br>
+</p>
+<ul>
+ <li><span
+ style="font-weight: bold; font-family: courier new,courier,monospace;">[defined]</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">#defined</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[#defined]</span></li>
+</ul>
+<h4><a class="mozTocH4" name="mozTocId655967"></a><big><a
+ name="FLITERAL"></a>Outputting
+Arbitrary Byte-Sequences to
+the FCode Binary</big></h4>
+In addition to the Standard <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">emit-byte</span>
+command, this Tokenizer supports a directive called <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">FLITERAL</span>
+, which will emit the number popped from the top of the Data Stack as a
+literal to the FCode Binary, as though the number were invoked during
+normal operation.
+<p>The <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">FLITERAL</span>
+directive can be invoked from either "Tokenizer Escape" mode or normal
+tokenization mode, but the number to be emitted must have been put on
+top of the Stack during "Tokenizer Escape" mode.</p>
+<h4><a class="mozTocH4" name="mozTocId114013"></a><big><a
+ name="ENCODE_FILE"></a>Encoding blocks of binary data taken from a
+file
+</big></h4>
+The directive <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">ENCODE-FILE</span>
+takes a file-name as an argument <a href="#Expected_on_same_line">on
+the same line</a>. It translates
+the contents of the file into a series of strings interspersed
+with <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">encode-bytes</span>
+and <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">encode+</span>
+commands, resulting in a block of byte-encoded binary data.<br>
+<h4><a name="mozTocId69109"></a><big><a name="Gen_Specl_Txt_Strs"></a>Generating
+Special Text-Strings and Literals</big></h4>
+This Tokenizer supports a set of directives that will present a string
+or a literal
+for processing as though it were part of the Tokenization Source
+File. Except as otherwise noted, these directives may be invoked
+in either "Normal" or
+"Tokenizer-Escape" mode: in "Normal" mode, the string produced
+will be
+compiled-in as an in-line text
+string; in "Tokenizer-Escape" mode, it will be displayed as a
+User-generated <a href="#User_Messages"><span
+ style="font-weight: bold; font-style: italic;">MESSAGE</span></a>.<br>
+<br>
+<h5 style="margin-left: 40px;"><a class="mozTocH4" name="mozTocId70133"></a><big><a
+ name="fcode_date"></a>Current date or time</big></h5>
+<div style="margin-left: 40px;">The <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[fcode-date]</span>
+directive produces a string that consists of the current date,
+formatted as <span
+ style="font-family: courier new,courier,monospace;">mm/dd/ccyy</span>
+.
+</div>
+<p style="margin-left: 40px;">The <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[fcode-time]</span>
+directive produces a string that consists of the current time,
+formatted as <span
+ style="font-family: courier new,courier,monospace;">hh:mm:ss ZZZ</span>
+(where <span style="font-family: courier new,courier,monospace;">ZZZ</span>
+represents the local Time-Zone).<br>
+</p>
+<p style="margin-left: 40px;">An <a href="#timestamp_prop">illustration</a>
+is included in <a href="#Example_4">Example 4</a>.<br>
+</p>
+<h5 style="margin-left: 40px;"><a class="mozTocH4" name="mozTocId71157"></a><big><a
+ name="function_name"></a>Name of the Function currently
+being defined</big></h5>
+<div style="margin-left: 40px;">
+<p>The <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[function-name]</span>
+directive, when invoked in "Normal" mode, produces an in-line string
+that consists of the name of the function (colon-definition) most
+recently -- or currently
+being --
+defined. It will persist until a new colon-definition is
+started.
+This can be useful for embedding interpetation-time or run-time
+debugging-statements into or after
+functions' definitions. In "Tokenizer-Escape" mode, it will
+display the
+function name in more detail as a
+User-generated <a href="#User_Messages"><span
+ style="font-weight: bold; font-style: italic;">MESSAGE</span></a>.
+<a href="#Example_5">Example 5</a> illustrates its
+use in "Normal" mode, and has a small <a href="#Example_5_func_nam">illustration</a>
+of its use in "Tokenizer-Escape" mode.
+</p>
+</div>
+<h5 style="margin-left: 40px;"><a name="mozTocId72181"></a><big><a
+ name="Inp_Fil_Nm_Strg"></a>Input-File Name and Line Number</big></h5>
+<div style="margin-left: 40px;">The <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[input-file-name]</span>directive
+produces an in-line string that
+consists of the name of the current Input File.<br>
+<p>The <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[line-number]</span>directive
+produces an in-line numeric literal giving the Line-Number within the
+current Input File.<br>
+</p>
+<p>These directives
+can only be invoked in "Normal" mode; they are not supported -- or
+needed -- in
+"Tokenizer-Escape" mode, because any User-generated <a
+ href="#User_Messages"><span
+ style="font-weight: bold; font-style: italic;">MESSAGE</span></a> will
+print that information. An <a href="#Example_5_func_nam">illustration</a>
+is included in <a href="#Example_5">Example 5</a>.<br>
+</p>
+</div>
+<h4><a class="mozTocH4" name="mozTocId844437"></a><big><a
+ name="Pre_pending_PCI_Headers_to_FCode_images_"></a>Pre-pending
+PCI Headers to FCode
+images</big>
+</h4>
+The directive <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">pci-header</span>
+, which can be invoked from either "Tokenizer Escape" mode or normal
+tokenization mode, will cause a PCI Header to be generated to the
+Binary Output file, in front of the FCode Binary image. It takes
+three parameters from the Data Stack: Vendor ID as the third item
+on the Stack, Device ID as the second, and Class Code as the top item
+on the Data Stack. These must be put on the Stack during
+"Tokenizer Escape" mode.
+<p>An attempt to issue the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">pci-header</span>
+directive after FCode output has begun will be reported as an <a
+ href="#An_ERROR">Error</a> condition.</p>
+<p>
+The PCI Header cannot be completed until after the FCode Binary image
+has been completely tokenized. The directive to complete the PCI
+Header should be issued at the end of the process. Synonyms for
+this directive are:
+</p>
+<ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">pci-header-end</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">pci-end</span></li>
+</ul>
+<h4 style="font-weight: bold;"><a class="mozTocH4" name="mozTocId931658"></a><a
+ name="Modifying_PCI_Header"></a><big>Modifying the PCI
+Header</big></h4>
+Directives are supported that will alter specific fields of the PCI
+Header. They can be issued at any time before the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">pci-end</span>
+directive to specify the contents of certain fields of the PCI Data
+Structure as follows:<br>
+<ul>
+ <li>"Revision Level of the Vendor's ROM" (2 bytes at
+offset 0x12)</li>
+ <li>"Last Image Indicator" bit (High-order bit of 1 byte at offset
+0x15)</li>
+</ul>
+The syntax for these functions is:<br>
+<h5 style="margin-left: 40px;"><a class="mozTocH5" name="mozTocId504353"></a><big><a
+ name="PCI_Rev_Level"></a>"Revision
+Level of the Vendor's ROM"</big></h5>
+<div style="margin-left: 40px;">To set the "Revision Level of the
+Vendor's ROM" field of the PCI Header to the number popped from the top
+of the Data Stack, use any of these synonyms:<br>
+<ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">set-rev-level</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">pci-revision</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">pci-code-revision</span></li>
+</ul>
+These directives can be invoked from either "Tokenizer Escape" mode or
+normal tokenization mode, but the number to be used must have been put
+on top of the Stack during "Tokenizer Escape" mode.
+<p>The default setting for this field is 1.<br>
+</p>
+<h6 style="font-weight: bold; margin-left: 40px;"><a
+ name="mozTocId503878"></a><big><a name="PCI_Rev_Level_Byte_Order"></a>Byte-Order</big></h6>
+<p style="margin-left: 40px;">Ordinarily, the "Revision Level of the
+Vendor's ROM" field of the PCI Header follows the general PCI Standard
+convention of "Little-Endian" byte-order. However, some
+organizations' legacy code saves this field in Big-Endian order.
+To
+accommodate the need for compatibility, this
+Tokenizer supports a <a href="#Special_Feature_Flags">Special-Feature
+Flag</a> called <a href="#Big_End_PCI_Rev_Level"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">Big-End-PCI-Rev-Level</span></a>.
+Its default is <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">no</span>,
+i.e., to follow the PCI Standard. </p>
+<br>
+</div>
+<h5 style="margin-left: 40px;"><a class="mozTocH5" name="mozTocId53081"></a><big><a
+ name="Last_Image_Indicator_bit"></a>"Last
+Image Indicator" bit</big></h5>
+<div style="margin-left: 40px;">The "Last Image Indicator" bit can be
+specified in either of three ways:<br>
+<ul>
+ <li>Force it to be set to TRUE. Synonyms for this are:</li>
+ <ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">last-image</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">last-img</span></li>
+ </ul>
+</ul>
+<ul>
+ <li>Force it to be reset to FALSE. Synonyms for this are:</li>
+ <ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">not-last-image</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">not-last-img</span></li>
+ </ul>
+</ul>
+<ul>
+ <li>Set or reset it according to the number popped from the top
+of the Data Stack. Synonyms for this are:</li>
+ <ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">set-last-image</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">set-last-img</span></li>
+ </ul>
+</ul>
+</div>
+<div style="margin-left: 80px;">If the number was zero, the "Last Image
+Indicator" bit will be reset to FALSE; if it was non-zero, the bit will
+be set to TRUE.</div>
+<p style="margin-left: 80px;">These directives can be invoked from
+either "Tokenizer Escape"
+mode or
+normal tokenization mode, but the number to be examined must have been
+put
+on top of the Stack during "Tokenizer Escape" mode.
+</p>
+<p style="margin-left: 40px;">The default setting for this field is
+TRUE.</p>
+<h4><a class="mozTocH4" name="mozTocId410469"></a><big><a
+ name="Binary_Output_File_Name"></a>Changing the name of the
+Binary Output File</big></h4>
+<p><a name="Binary_Output_File_Name_Default"></a>By default, the name
+of the Binary Output File is derived from the
+name
+of the Source Input File, by replacing its extension with <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">.fc</span>
+, or, if the Input File name had no extension, merely appending
+the
+extension <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">.fc</span></p>
+<p>
+The name of the Binary Output File may be specified on the Command
+Line, as noted <a href="#Binary_Output_Name_option">above</a>.</p>
+<p><a name="Binary_Output_File_Name_Directive"></a>
+The name of the Binary Output File may also be specified by a directive
+embedded within the Tokenization Source File. Synonyms for the
+directive are <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">save-image</span>
+and <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">save-img</span>
+; the name follows after the directive <a href="#Expected_on_same_line">on
+the same line</a>.<br>
+</p>
+<p>The directive can be invoked from either "Tokenizer Escape" mode or
+normal tokenization mode. It does not cause an imediate action (i.e.,
+saving the Binary Image), but merely alters the name of the file to
+which the image will be saved when tokenization is completed.<br>
+</p>
+<p>Note that this directive does not change the name of the <a
+ href="#FLoad_List_option">FLoad-List File</a>, if one has been
+specified.
+</p>
+<h4><a class="mozTocH4" name="mozTocId982642"></a><big><a
+ name="User_Messages"></a>Issuing messages at Tokenization
+time.</big></h4>
+Directives are supported that will gather text and output it as a
+User-generated <span style="font-weight: bold; font-style: italic;">MESSAGE</span>
+during
+Tokenization.
+<p>These directives can be invoked from either "Tokenizer
+Escape" mode or normal tokenization mode:</p>
+<ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">#MESSAGE"</span>
+will parse text in <a href="#String_Gathering_Features">string-collection
+mode</a>, i.e., with
+sensitivity to the special escaped-characters, until a concluding
+Quote-followed-by-whitespace,</li>
+</ul>
+<div style="margin-left: 40px;">and the synonyms:
+</div>
+<ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[MESSAGE]</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">#MESSAGE</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[#MESSAGE]</span></li>
+</ul>
+<div style="margin-left: 40px;">will gather the text remaining on the
+line.
+</div>
+<p>In addition, the commands <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">."</span>
+(Dot-Quote) and <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">.(</span>
+(Dot-Paren), which have Standard meanings in normal tokenization
+mode, will, when invoked in
+"Tokenizer Escape" mode,
+collect text in their Standard manner and output it as a User-generated
+<span style="font-weight: bold; font-style: italic;">MESSAGE</span>:</p>
+<ul>
+ <li>Dot-Quote will parse text in <a href="#String_Gathering_Features">string-collection
+mode</a>,</li>
+ <li>Dot-Paren will collect text until a
+balancing Close-Paren -- <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">)</span>
+-- character.</li>
+</ul>
+<p>Also, as noted earlier, the <a href="#fcode_date"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[fcode-date]</span></a>
+and <a href="#fcode_date"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[fcode-time]</span></a>
+directives, when invoked in
+"Tokenizer Escape" mode, will display the current date and time,
+respectively, as a User-generated
+<span style="font-weight: bold; font-style: italic;">MESSAGE</span>: </p>
+<h4><a class="mozTocH4" name="mozTocId550942"></a><big><a
+ name="Changing_C-L_Flags_from_Source"></a>Changing Special-Feature
+Flags
+from Source</big></h4>
+A directive is supported that can be used from within the Tokenization
+Source File to over-ride the setting of any one of the <a
+ href="#Special_Feature_Flags">Special-Feature
+Flags</a> that might have been made from the Command Line. The
+name of the Flag -- with, of course, an optional leading <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">No</span>
+-- must follow after the directive <a href="#Expected_on_same_line">on
+the same line</a>. It can be
+invoked from either "Tokenizer Escape" mode or normal tokenization
+mode. Its synonyms are:
+<ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[FLAG]</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">#FLAG</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[#FLAG]</span></li>
+</ul>
+<p>The User is hereby admonished to exercise caution when using this
+directive. Not all combinations are meaningful, and automated
+error-checking is not feasible. An <a href="#Advisories">Advisory
+Message</a> will
+be issued to remind the User of the change.<br>
+</p>
+<h5 style="margin-left: 40px;"><a class="mozTocH5" name="mozTocId551846"></a><big><a
+ name="Displaying_C-L_Flags_from_Source"></a>Displaying
+Special-Feature Flags from Source</big></h5>
+<div style="margin-left: 40px;">A directive is supported that can be
+used from within the Tokenization
+Source File to display a <a href="#User_Messages"><span
+ style="font-weight: bold; font-style: italic;">MESSAGE</span></a> with
+a list of the settings of all of the Special-Feature Flags. Its
+synonyms are:
+</div>
+<div style="margin-left: 40px;">
+<ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[FLAGS]</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">#FLAGS</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[#FLAGS]</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">SHOW-FLAGS</span></li>
+</ul>
+</div>
+<h4><a class="mozTocH4" name="mozTocId573280"></a><big><a
+ name="Manipulate_FCode_Number"></a>Manipulating the
+FCode-Token-Number Assignment Counter</big></h4>
+In addition to the Standard <a href="#next_fcode"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">next-fcode</span></a>
+command, this Tokenizer supports additional directives that can be used
+to
+alter the normal sequence of FCode-token-number assignment.<br>
+<p>In order to protect against unintended collisions in FCode-token
+numbers, which can cause severe
+errors at run-time, this Tokenizer will report an <a href="#An_ERROR">Error</a>
+the first time
+an FCode-number assignment overlaps FCodes that were assigned in a
+different range.<br>
+</p>
+<p>Because the programmer may choose to "recycle" FCode-token-numbers
+intentionally, a directive is supported that clears the records of
+FCode-number assignments and resets the FCode-token-number assignment
+counter to its inital value. </p>
+<h5 style="margin-left: 40px;"><big><a name="mozTocId566072"></a>Saving
+and Restoring</big></h5>
+<div style="margin-left: 40px;">
+The directive <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">FCode-Push</span>
+can be used to save the value of the FCode-token-number assignment
+counter on the <a href="#Run-time_data_stack">tokenization-time
+data
+stack</a> . Later, the saved value can be restored by invoking
+the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">FCode-Pop</span>
+directive. Note that <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">FCode-Pop</span>
+is functionally equivalent to <a href="#next_fcode"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">next-fcode</span></a>
+except that <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">FCode-Push</span>
+ and <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">FCode-Pop</span>
+can be invoked from either "Tokenizer Escape" mode or "Normal" mode.</div>
+<h5 style="margin-left: 40px;"><big><a name="mozTocId568474"></a>Resetting</big></h5>
+<div style="margin-left: 40px;">
+The directive <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">FCode-Reset</span>
+will re-initalize the value of the FCode-token-number assignment
+counter and clear the records of previous FCode-number
+assignments. Note that it is not equivalent to:<br>
+<p style="margin-left: 40px;"><span
+ style="font-weight: bold; font-family: courier new,courier,monospace;">F[</span>
+ <span
+ style="font-weight: bold; font-family: courier new,courier,monospace;">h#
+800 next-fcode</span>
+ <span
+ style="font-weight: bold; font-family: courier new,courier,monospace;">F]</span></p>
+which merely re-initalizes the value of the FCode-token-number
+assignment counter, but does not prevent the first assignment of this
+FCode-number from being regarded as overlapping an earlier
+assignment and therefore being reported as an <a href="#An_ERROR">Error</a>.<br>
+<p>The FCode-token-number assignment
+counter and the records of previous FCode-number assignments will also
+be automatically re-initalized when a <a href="#Multiple_PCI_Image">new
+PCI-Image</a> block is started.<br>
+</p>
+</div>
+<h4><a class="mozTocH4" name="mozTocId575686"></a><big>Resetting
+Symbols Defined in Either Mode</big></h4>
+Symbol names defined in "Normal" mode persist until a <a
+ href="#Multiple_device_nodes">device-node is finished</a>, or until
+the end of an FCode-block or of a PCI Image.<br>
+<p>Symbol names defined in "Tokenizer Escape" mode persist throughout
+the entire run of the Tokenizer. </p>
+The directive <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">Reset-Symbols</span>
+enables the User to delete symbol-definitions at any other time, should
+that be required. <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">Reset-Symbols</span>
+is sensitive to the the mode in which the Tokenizer is operating:
+invoked during "Tokenizer Escape" mode, it will cause only the
+definitions made under "Tokenizer Escape" mode to be deleted; during
+"Normal" mode, only those made under "Normal" mode. <a
+ href="#Example_1">Example
+#1</a> contains an invocation in "Tokenizer Escape" mode.<br>
+<br>
+<h3><a class="mozTocH3" name="mozTocId957252"></a><a
+ name="Non-standard_input_syntaxes_"></a>Non-standard input,
+syntaxes, and behavior<br>
+</h3>
+<p>In this section, we will discuss:<br>
+</p>
+<ul>
+ <li>This Tokenizer's handling of conditions the Standard calls
+"ambiguous"</li>
+ <li>Non-Standard synonyms for Standard functions</li>
+ <li>Non-Standard functions or behaviors that are supported by this
+Tokenizer.</li>
+ <li>Featured behaviors, supported by this Tokenizer, that are not
+mentioned in the Standard. </li>
+</ul>
+<h4 style="margin-left: 40px;"><a class="mozTocH4" name="mozTocId850914"></a>Ambiguous
+Conditions</h4>
+<div style="margin-left: 80px;">The Standard only identifies a few
+questionable combinations as "ambiguous conditions" or "behavior ...
+unspecified" and leaves their
+handling open to interpretation of the implementor. Here's how
+this Tokenizer handles them:<br>
+</div>
+<div style="margin-left: 40px;">
+<h5 style="margin-left: 40px;"><a class="mozTocH5" name="mozTocId162252"></a><big><a
+ name="Expected_on_same_line"></a>Tokens
+expected on the same
+line</big></h5>
+<p style="margin-left: 40px;">Certain commands and directives expect a
+token to appear on the same line, and will report an <a
+ href="#An_ERROR">Error</a> condition if no
+token appears on the same line:</p>
+<ul>
+ <ul>
+ <li>The <a href="#The_h_d_and_o_directives_"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">h#</span>
+ <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">d#</span>
+and <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">o#</span></a>
+directives, and the <a href="#Char_Seq_To_Num">a#</a> and <a
+ href="#Char_to_Num_Left_Justified">al#</a>
+directives.<br>
+ </li>
+ <li>The <a
+ href="#Existence_or_non-existence_of_an_FCode"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[ifexist]</span>
+ <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[ifnexist]</span></a>
+ <a href="#Definition_or_non-definition_of_a"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[ifdef]</span>
+ <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[ifndef]</span></a>
+and <a href="#Evaluating_Command-line_Symbols"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[defined]</span></a>
+directives and all their synonyms</li>
+ <li>The commands <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[']</span>
+and <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">'</span>
+ <br>
+ </li>
+ <li>The <a href="#F_Eff-Bracket-Tick-Bracket"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">F[']</span></a>
+directive</li>
+ <li>The <a href="#Alias"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">ALIAS</span></a>
+directive (expects two tokens on the same line)</li>
+ <li>The <a href="#Macros"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[macro]</span></a>
+directive (expects at least two tokens on the same line) </li>
+ <li>The directives <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">control
+ascii </span><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">char</span><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">
+ </span>and<span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">
+[char]</span></li>
+ <li>The <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">FLOAD</span>
+command</li>
+ <li>The <a href="#Binary_Output_File_Name"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">SAVE-IMAGE</span></a>
+directive</li>
+ <li>The <a href="#Changing_C-L_Flags_from_Source"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[FLAG]</span></a>
+directive and its synonyms <br>
+ </li>
+ <li>The <a href="#ENCODE_FILE"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">ENCODE-FILE</span></a>
+directive </li>
+ </ul>
+</ul>
+</div>
+<h5 style="margin-left: 40px;"><a class="mozTocH5" name="mozTocId246601"></a><a
+ name="The_h_d_and_o_directives_"></a><big>The
+<span style="font-family: courier new,courier,monospace;">h#</span>
+<span style="font-family: courier new,courier,monospace;">d#</span> and
+<span style="font-family: courier new,courier,monospace;">o#</span>
+directives</big></h5>
+<div style="margin-left: 40px;">The directives <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">h#
+d# </span>and <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">o#</span>
+convert the token immediately following to a
+number, in hex, decimal or
+octal, respectively.
+<p>If the token is present, but cannot be converted to a number using
+the
+appropriate radix, i.e., if the conversion fails, the
+Tokenizer will issue a <a href="#A_WARNING">WARNING</a>,
+ignore the directive and attempt to
+process the token
+as ordinary input. If the name is not
+known, the "ordinary processing" will catch the error.</p>
+</div>
+<h5 style="margin-left: 40px;"><a class="mozTocH5" name="mozTocId978546"></a><big>The
+commands <span
+ style="font-family: courier new,courier,monospace;">leave</span>
+<span style="font-family: courier new,courier,monospace;">?leave</span>
+or <span style="font-family: courier new,courier,monospace;">unloop</span>
+outside of a loop-control framework</big></h5>
+<div style="margin-left: 40px;">The Standard only speaks briefly about
+the execution consequences of this condition, and says nothing about
+whether a Tokenizer should permit such a sequence. This Tokenizer will
+report it as an <a href="#An_ERROR">Error</a>
+condition.
+</div>
+<h5 style="margin-left: 40px;"><a class="mozTocH5" name="mozTocId73206"></a><big>The
+commands <span
+ style="font-family: courier new,courier,monospace;">[']</span>
+or <span style="font-family: courier new,courier,monospace;">'</span>
+followed by a name that is not a valid target</big></h5>
+<div style="margin-left: 40px;">Valid targets for the commands <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[']</span>
+and <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">'</span>
+are function-names that were defined during normal tokenization
+mode.
+This Tokenizer reports an <a href="#An_ERROR">Error</a>
+if the name following the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[']</span>
+or <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">'</span>
+is not a valid target (e.g., is the name of a macro). It will
+then
+attempt to
+process the name in the ordinary manner.</div>
+<h5 style="margin-left: 40px;"><big><a class="mozTocH5"
+ name="mozTocId74410"></a>The Forth word <span
+ style="font-family: courier new,courier,monospace;">to</span>
+followed by a name that is not a valid target</big></h5>
+<div style="margin-left: 40px;">The Standard specifies the Forth word <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">to</span>
+as the means for setting the value of a word defined with either the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">value</span>
+or <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">defer</span>
+defining-words, but says nothing about how a Tokenizer should respond
+to attempts to apply it to other targets. This
+Tokenizer reports an <a href="#An_ERROR">Error</a>
+if the name following the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">to</span>
+is not a valid target (e.g., is the name of a macro or a
+colon-definition).
+<p>An exception is made for a word defined as a <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">variable</span>
+: Although such words are not a valid target for <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">to</span>,
+many platforms' firmware will execute the sequence correctly; this
+Tokenizer will issue a <a href="A_WARNING">WARNING</a>.</p>
+</div>
+<h5 style="margin-left: 40px;"><big><a class="mozTocH5"
+ name="mozTocId75614"></a><a name="Instance"></a>The
+word <span style="font-family: courier new,courier,monospace;">instance</span></big>
+</h5>
+<h6 style="font-weight: bold; margin-left: 80px;"><big><a
+ name="mozTocId76818"></a>Followed by an inapplicable
+defining-word</big></h6>
+<div style="margin-left: 80px;">The Standard implies (but does not
+state) that,
+once <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span>
+has been executed, it remains in effect until an applicable
+defining-word ( <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">value</span>
+, <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">variable</span>
+, <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">defer</span>
+or <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">buffer:</span>
+)
+is encountered. For example, in the sequence:
+<p style="font-family: courier new,courier,monospace;"><span
+ style="font-weight: bold;">instance</span> <span
+ style="font-weight: bold;">:</span> <span>nonsense</span> <span
+ style="font-weight: bold;">dup</span> <span style="font-weight: bold;">swap</span>
+<span style="font-weight: bold;">drop</span> <span
+ style="font-weight: bold;">;</span><br>
+<span style="font-weight: bold;">variable</span> boombah</p>
+<p>the colon-definition of <span
+ style="font-family: courier new,courier,monospace;">nonsense</span> is
+unaffected by the occurrence of <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span>
+, which will, instead, be applied to the defining-word <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">variable</span>
+(which defines <span
+ style="font-family: courier new,courier,monospace;">boombah</span> )
+on a later line.
+</p>
+<p>Since <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span>
+would typically be followed immediately by the defining-word
+to which it is intended to apply, a sequence like the above can
+reasonably be presumed to be a likely error. This Tokenizer will
+issue
+a <a href="A_WARNING">WARNING</a> when an
+inapplicable
+defining-word is encountered while <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span>
+is in effect, and another WARNING when the dangling <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span>
+is finally applied to a valid definer.
+</p>
+</div>
+<h6 style="margin-left: 80px;"><big><a name="mozTocId78022"></a>Left
+unresolved</big></h6>
+<div style="margin-left: 80px;">Multiple occurrences of <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span>
+are not cumulative; if a second <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span>
+is encountered before the first is applied, only one occurrence of an
+applicable defining-word will be modified. This Tokenizer will
+issue a <a href="#A_WARNING">WARNING</a> when
+a second occurrence of <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span>
+is encountered before the first has been applied. </div>
+<div style="margin-left: 80px;">
+<p>The Standard says nothing about what
+should occur
+if <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span>
+has not been applied by the time a device-node is "<span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">finish</span>"ed
+or a new device-node
+is started. In most Platforms' implementations of the FCode
+Interpreter, the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span>
+state will remain in effect. This Tokenizer will issue a WARNING
+the first time a device-node
+is changed while an <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span>
+remains unresolved.<br>
+</p>
+</div>
+<h6 style="margin-left: 80px;"><a name="mozTocId79226"></a><big><a
+ name="Instance_Not_Allowed"></a>Not
+Allowed in...</big></h6>
+<div style="margin-left: 80px;">
+Although the Standard says nothing about the subject, an inclusion
+of <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span>
+inside
+a Colon-definition would serve no purpose and is <a
+ href="#INSTANCE_at_run_time">potentially harmful</a>; <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span>
+should not be allowed in a Colon-definition. This Tokenizer will
+detect an attempt to compile <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span>
+into
+a Colon-definition and report it as an <a href="#An_ERROR">Error</a>
+condition.
+<p>Also, <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span>
+can not be allowed when <a href="#Global_Definitions">Global Scope</a>
+is in effect, as <a href="#INSTANCE_at_run_time">explained elsewhere</a>.<br>
+</p>
+</div>
+<h5 style="margin-left: 40px;"><a class="mozTocH5" name="mozTocId884280"></a><big>The
+command <span style="font-family: courier new,courier,monospace;">fload</span>
+inside a colon-definition</big></h5>
+<div style="margin-left: 40px;">If the command <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">fload</span>
+is encountered while a colon-definition
+is in progress, this Tokenizer will process it immediately, and read
+the contents of
+the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">fload</span>ed
+file as a continuation of Source input. </div>
+<h4 style="margin-left: 40px;"><a class="mozTocH4" name="mozTocId901662"></a>Non-Standard
+Synonyms for Standard
+Functions</h4>
+<div style="margin-left: 40px;">This Tokenizer accepts the following
+non-Standard words as synonyms for the Standard words, as listed:<br>
+<ul>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">ENDIF</span>
+as a synonym for <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">THEN</span></li>
+ <li><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">NAME</span>
+as a synonym for <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">DEVICE-NAME</span></li>
+</ul>
+</div>
+<h4 style="margin-left: 40px;"><a class="mozTocH4" name="mozTocId732819"></a>Non-Standard
+Functions or behaviors</h4>
+<div style="margin-left: 40px;">This section will discuss features
+supported by this Tokenizer that extend capabilities regarded by the
+Standard as unsupportable, or that are left only vaguely specified as
+"implementation-dependent".
+It will also present a few minor items that are introduced as
+conveniences for the User.<br>
+</div>
+<h5 style="margin-left: 80px;"><a class="mozTocH5" name="mozTocId522750"></a><a
+ name="Alias"></a><big>Alias</big></h5>
+<p style="margin-left: 80px;">In normal tokenization mode the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">alias</span>
+directive behaves as specified in the Standard, i.e., it creates a new
+command with the exact behavior of an existing command. Any occurrence
+of the new command will cause the assigned FCode of the old command to
+be generated, with all the implications that follow from that.</p>
+<p style="margin-left: 80px;">The Standard, further, states that:
+"In FCode source, <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">alias</span>
+cannot be called from within a colon definition." However, this
+Tokenizer can handle that, and issues a <a href="#A_WARNING">WARNING</a>
+message when it
+does so.</p>
+<p style="margin-left: 80px;">The Standard does not specify the
+behavior of <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">alias</span>
+in "Tokenizer Escape" mode. This
+Tokenizer will allow <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">alias</span>
+commands issued in "Tokenizer Escape" mode to take effect in that mode,
+and, furthermore, aliases to words that are recognized in either mode
+may be created in either mode and will be recognized in either mode.<br>
+</p>
+<p style="margin-left: 80px;">Generally speaking, an alias definition
+will take on the <a href="#Scope_Directives">Scope</a> that is current
+at the time it is made: If Device Scope is in effect, the new
+name -- even if it is an alias to a word that has <a
+ href="#Global_Definitions">Global scope</a> -- will only be accessible
+from the <span
+ style="font-family: courier new,courier,monospace; font-style: italic;">current
+device-node</span>. An <a href="#Advisories">ADVISORY</a>
+message will be issued for this condition.
+</p>
+<h5 style="margin-left: 80px;"><a class="mozTocH5" name="mozTocId824541"></a><a
+ name="String_Gathering_Features"></a>
+<big>String-Escape characters and other String-Gathering Features</big></h5>
+<div style="margin-left: 80px;">The Standard specifies, in effect, that
+a string is terminated by a double-quote (the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">"</span>
+character) when it is immediately followed by whitespace; that if the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">"</span>
+is followed by an open-parenthesis, hex-sequence parsing begins until a
+close-parenthesis is found; and that if the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">"</span>
+is followed by any other character, "the result is
+implementation-dependent".<br>
+<h6 style="margin-left: 40px;"><big><a class="mozTocH5"
+ name="mozTocId945290"></a>Quoted
+String-Escape Characters</big></h6>
+<p style="margin-left: 40px;">Common practice -- widely enough used as
+to merit consideration as an undocumented de-facto standard -- has been
+to recognize a set of letters and to translate them into special
+characters when they immediately follow the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">"</span>
+.<br>
+</p>
+<p style="margin-left: 40px;">This
+Tokenizer translates String-Escape Quoted-pairs as follows:
+</p>
+<p style="margin-left: 60px;">
+<table style="text-align: left; width: 100%;" border="0" cellpadding="1"
+ cellspacing="4">
+ <tbody>
+ <tr>
+ <td style="vertical-align: top; text-align: left; width: 105px;"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">"n</span>
+ </td>
+ <td style="vertical-align: top;">New-Line </td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top; text-align: left; width: 105px;"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">"l</span></td>
+ <td style="vertical-align: top;">New-Line</td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top; text-align: left; width: 105px;"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">"r</span></td>
+ <td style="vertical-align: top;">Carriage-Return</td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top; text-align: left; width: 105px;"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">"t</span></td>
+ <td style="vertical-align: top;">Horizontal Tab</td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top; text-align: left; width: 105px;"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">"f</span></td>
+ <td style="vertical-align: top;">Form-Feed</td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top; text-align: left; width: 105px;"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">"b</span></td>
+ <td style="vertical-align: top;">Backspace</td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top; text-align: left; width: 105px;"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">"!</span></td>
+ <td style="vertical-align: top;">Bell</td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top; text-align: left; width: 105px;"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">"<span
+ style="font-style: italic;">^</span></span><span
+ style="font-family: arial; font-style: italic;">L</span></td>
+ <td style="vertical-align: top;">Quote-Caret followed by a letter
+is
+translated as "Control"-<span
+ style="font-family: arial; font-style: italic;">the-letter</span>.</td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top; text-align: left; width: 105px;"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">"</span><span
+ style="font-family: arial; font-style: italic;">Other</span></td>
+ <td style="vertical-align: top;">Any unrecognized character
+following the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">"</span>
+
+is taken verbatim.<br>
+ </td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">""</span></td>
+ <td style="vertical-align: top;">The way to embed a double-quote
+into a string is to
+escape it with itself. (This is a special instance of the
+preceding rule)<br>
+ </td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top; text-align: left; width: 105px;"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">"(</span></td>
+ <td style="vertical-align: top;">As was mentioned above,
+Quote-Open-Parenthesis begins parsing a hex-sequence as per Section A.2
+of the
+Standard under the description of the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">"</span>
+operator. Details will be discussed <a href="#Hex_Seq_Procg">below</a>.<br>
+ </td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top; text-align: left; width: 105px;"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">"\<a
+ name="SFeat_Str_Rem_Esc"></a></span></td>
+ <td style="vertical-align: top;">Quote-Backslash permits
+insertion of remarks into the middle of a string definition; it will
+interrupt
+string parsing, causing the remainder of
+the line, together with any whitespace that might begin the new line,
+to be ignored.
+ <p>Because this feature is not in usual
+practice, the User can disable it by invoking the <a
+ href="#SF_Flag_Str_Rem_Esc"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">noString-remark-escape</span></a> <a
+ href="#Special_Feature_Flags"> Special-Feature
+Flag</a>.</p>
+ <p>If this feature is disabled, the Backslash following the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">"</span>
+
+will be taken verbatim; the Backslash, the text following it on the
+remainder of the line, the new-line and the whitespace on the next line
+-- all of which would otherwise have been ignored -- will be included
+in the
+string parsing and incorporated into the result. </p>
+ </td>
+ </tr>
+ </tbody>
+</table>
+</p>
+</div>
+<div style="margin-left: 120px;">
+<h6><big><a class="mozTocH5" name="mozTocId758170"></a>Embedded
+New-Lines</big></h6>
+<p>The Standard makes no mention about what to do when a string reaches
+a new-line before its termination. This
+Tokenizer continues parsing and includes the new-line, together with
+any whitespace that might begin the new line, in the result.<br>
+</p>
+<h6><big><a class="mozTocH5" name="mozTocId42456"></a><a
+ name="Hex_Seq_Procg"></a>Hex-Sequence
+Processing</big></h6>
+The Standard mentions parsing hexadecimal characters in pairs in the
+substring between <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">"(</span>
+and <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">)</span>
+but makes no mention of what to do when a single hexadecimal character
+appears between nonhexadecimal characters. The usual practice is
+to treat it as representing the low-order digit of a single byte, and
+this Tokenizer follows that convention.<br>
+<p><a name="SFeat_Hex_Rem_Esc"></a>This Tokenizer also supports
+an option -- not in usual practice,
+hence listed separately here -- that permits insertion of remarks in
+the middle of a hex-sequence in a string. The occurrence of a
+single <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">\</span>
+(backslash) character will interrupt hex-sequence parsing, causing the
+remainder of the line,
+together with any whitespace that might begin the next line, to be
+ignored. The User can disable this feature by invoking the <a
+ href="#SF_Flag_Hex_Rem_Esc"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">noHex-remark-escape</span></a> <a
+ href="#Special_Feature_Flags"> Special-Feature
+Flag</a>.<br>
+</p>
+<p>If the Hex-Remark-Escape feature is disabled, the Backslash will be
+treated as an ordinary nonhexadecimal character, and Hex-Sequence
+parsing will proceed. Any hexadecimal characters on the
+remainder of the line -- which would otherwise have been ignored
+-- will be recognized and incorporated into the result. </p>
+<h6><big><a class="mozTocH5" name="mozTocId150131"></a><a
+ name="C-Style_String-Escape_Characters"></a><big>C</big>-Style
+String-Escape Characters</big></h6>
+In addition to the Quoted String-Escape sequences, this
+Tokenizer recognizes a small subset of the Backslash-based
+String-Escape
+pairs that are used in <big><b>C</b></big> and translates them
+similarly.
+<p>Specifically, <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">\n</span>
+and <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">\t</span>
+are translated into New-Line and Horizontal Tab respectively.</p>
+<p><a name="SFeat_BS_xx"></a>If the Backslash is followed by other
+characters, the
+Tokenizer will attempt to read them as a digit-string, using the
+current base, and create a numeric byte. The numeric sequence ends with
+the first non-numeric character (which is treated as a delimiter and
+consumed, unless it's a double-quote, in which case it's allowed to
+terminate the string or apply whatever action is triggered by the
+character following it). If the value represented by the numeric
+sequence exceeds
+the size of a byte, its low-order byte will be used and a <a
+ href="#A_WARNING">WARNING</a> will
+be issued.
+</p>
+<p>If the first character after the backslash was non-numeric, the
+character will be used literally (and a WARNING will be issued).
+As in <big><b>C</b></big>, the backslash can be used to escape itself.
+</p>
+</div>
+<p style="margin-left: 120px;">The User can disable this feature by
+invoking the <a href="#SF_Flag_C_Str_Esc"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">noC-Style-string-escape</span></a>
+<a href="#Special_Feature_Flags">Special-Feature
+Flag</a>.
+</p>
+<h5 style="margin-left: 80px;"><a class="mozTocH5" name="mozTocId40998"></a><big><a
+ name="SFeat_AB_Q"></a>The <big><span
+ style="font-family: courier new,courier,monospace;">ABORT"</span></big>
+(Abort-Quote) command<br>
+</big></h5>
+<div style="margin-left: 80px;">The Standard is not very clear about
+the use of this FORTH command, and does not assign it an FCode.
+Nonetheless, it has historically been treated as a macro, and this
+Tokenizer will support that treatment.<br>
+<p><a name="SFeat_Sun_AB_Q"></a>To complicate matters, there are two
+distinct styles in which this
+macro is used in FCode drivers, "Apple" style and "Sun" style:<br>
+</p>
+<p>In Sun Style, the sequence, in the Source, would look like this:<br>
+</p>
+<p style="margin-left: 40px;"><span
+ style="font-family: courier new,courier,monospace;"><span
+ style="font-style: italic;"><Condition></span> <span
+ style="font-weight: bold;">ABORT"</span> <span
+ style="font-style: italic;">Message text</span><span
+ style="font-weight: bold;">"</span></span></p>
+<p>Semantically, it would mean that if the <span
+ style="font-family: courier new,courier,monospace; font-style: italic;"><Condition></span>
+is true, the <span
+ style="font-family: courier new,courier,monospace; font-style: italic;">Message
+text</span> would be printed and a <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-2
+THROW</span> would be performed; conversely, if the <span
+ style="font-family: courier new,courier,monospace; font-style: italic;"><Condition></span>
+is false, the <span
+ style="font-family: courier new,courier,monospace; font-style: italic;">Message
+text</span> would be bypassed and execution would continue with
+the next token after.
+</p>
+<p>The sequence could be translated into FCode as a macro like this:</p>
+<div style="margin-left: 40px;"><span
+ style="font-family: courier new,courier,monospace;"><span
+ style="font-style: italic;"><Condition></span> <span
+ style="font-weight: bold;">IF</span> <span style="font-weight: bold;">"</span>
+<span style="font-style: italic;">Message text</span><span
+ style="font-weight: bold;">" TYPE</span> <span
+ style="font-weight: bold;">-2 THROW</span>
+<span style="font-weight: bold;">THEN</span></span><br>
+</div>
+<p>In Apple Style, the Source supplies the surrounding <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">IF</span>
+... <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">THEN</span>
+. The action of the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">ABORT"</span>
+command is to leave
+the <span
+ style="font-family: courier new,courier,monospace; font-style: italic;">Message
+text</span> on the stack and perform the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-2
+THROW</span> unconditionally, with the expectation that the system <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">CATCH</span>
+will print the string
+it finds on the stack. <br>
+</p>
+<p>The Source sequence would look like this:<br>
+</p>
+<p style="margin-left: 40px;"><span
+ style="font-family: courier new,courier,monospace;"><span
+ style="font-style: italic;"><Condition></span> <span
+ style="font-weight: bold;">IF</span> <span style="font-weight: bold;">ABORT"</span>
+<span style="font-style: italic;">Message text</span><span
+ style="font-weight: bold;">" </span><span style="font-weight: bold;">THEN</span></span><br>
+</p>
+<p>The <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">ABORT"</span>
+...
+<span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">"</span>
+portion of the
+sequence would be translated into FCode as a macro like this:</p>
+<div style="margin-left: 40px;"><span
+ style="font-family: courier new,courier,monospace;"><span
+ style="font-weight: bold;">"</span> <span style="font-style: italic;">Message
+text</span><span style="font-weight: bold;">"</span> <span
+ style="font-weight: bold;">-2 THROW
+</span></span><br>
+</div>
+<p>Because the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">ABORT"</span>
+command is not specified in the Standard, the User can disable it by
+invoking the <a href="#SF_Flag_AB_Q"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">noABORT-Quote</span></a>
+<a href="#Special_Feature_Flags">Special-Feature
+Flag</a>.
+</p>
+<p>The User who chooses to enable this feature, can, further, select to
+disable "Sun" style in favor of "Apple" style by invoking the <a
+ href="#SF_Flag_Sun_AB_Q"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">noSun-ABORT-Quote</span></a>
+<a href="#Special_Feature_Flags">Special-Feature
+Flag</a>.<br>
+</p>
+<p><a name="Abort_Quote_Abort"></a>And to complicate matters even
+further, some Legacy applications prefer to use the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">ABORT</span>
+command (note there's no quote) in place of the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-2
+THROW</span> sequence. Although the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">ABORT</span>
+command is not recommended, it <span style="font-style: italic;">is</span>
+a legitimate FCode function, and this Tokenizer supports a <a
+ href="#Special_Feature_Flags">Special-Feature
+Flag</a>, called <a href="#SF_Flag_AB_Q_Throw">Abort-Quote-Throw</a>,
+which controls whether an <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">ABORT"</span>
+(Abort-Quote) phrase will be tokenized with the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">-2
+THROW</span> sequence or with the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">ABORT</span>
+function. The User who chooses to have <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">ABORT"</span>
+(Abort-Quote) phrases tokenized with the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">ABORT</span>
+function can do so by invoking <a href="#SF_Flag_AB_Q_Throw">noAbort-Quote-Throw</a>
+</p>
+</div>
+<h5 style="margin-left: 80px;"><a name="mozTocId526780"></a><big><a
+ name="Char_Seq_To_Num"></a>Conveniently Convert Short
+Character-Sequence to Number</big><br>
+</h5>
+<p style="margin-left: 80px;">Occasionally, a User needs to create a
+numeric constant whose value corresponds to a short sequence of
+characters. For instance, <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">PCIR</span>
+will get coded as <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">h#
+50434952</span>. This tokenizer supports a convenient directive
+called <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">a#</span>
+, syntactically similar to <a href="#The_h_d_and_o_directives_"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">h#
+d# </span>and <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">o#</span></a>
+, which makes the conversion directly. The above example can be
+written: <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">a#
+PCIR</span> , sparing the programmer -- and the maintainer -- from
+needing to translate ASCII on the fly.<br>
+</p>
+<p style="margin-left: 80px;">The <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">a#</span>
+operator expects
+its target argument <a href="#Expected_on_same_line">on the same line</a>.<br>
+</p>
+<p style="margin-left: 80px;">If the target-sequence contains more than
+four characters, the last four will become the number; if the
+target-sequence contains fewer than four characters, they will
+fill the low-order part of the number. (I.e., the operation
+of <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">a#</span>
+is right-justified.) Thus:<br>
+</p>
+<div style="margin-left: 160px;"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">a#
+CPU</span>
+ is equivalent to
+
+ <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">h#
+00435055</span>
+</div>
+<div style="margin-left: 120px;"> and
+</div>
+<div style="margin-left: 160px;"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">a#
+LotsOfStuff</span> is equivalent to <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">a#
+tuff</span> or <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">h#
+74756666</span></div>
+<p style="margin-left: 80px;">Also, the conversion is case-sensitive:
+ <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">a#
+cpu</span> is equivalent to <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">h#
+00637075</span></p>
+<h6 style="margin-left: 120px;"><a class="mozTocH5" name="mozTocId53626"></a><big><a
+ name="Char_to_Num_Left_Justified"></a>Left-Justified</big></h6>
+<div style="margin-left: 120px;">To accommodate situations that call
+for
+the characters to occupy the high-order part of the number, this
+Tokenizer supports an
+"Ascii-Left" conversion directive called <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">al#</span>
+, which is equivalent to <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">a#</span>
+in all respects except when the
+target-sequence contains fewer than four characters: <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">al#
+CPU</span> is equivalent to <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">h#
+43505500</span></div>
+<h5 style="margin-left: 80px;"><a class="mozTocH5" name="mozTocId54171"></a><a
+ name="F_Eff-Bracket-Tick-Bracket"></a><big>F[']
+("Eff-Bracket-Tick-Bracket")</big></h5>
+<p style="margin-left: 80px;">Syntactically similar to the Standard <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[']</span>
+("Bracket-Tick-Bracket"). Valid targets for <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">F[']</span>
+are the same as for <a href="#mozTocId73206"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[']</span>
+or <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">'</span></a>
+. Attempts to apply <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">F[']</span>
+to an invalid target will be handled similarly.<br>
+</p>
+<p style="margin-left: 80px;">This directive acquires the given word's
+FCode-Token number,
+which is then used according to whether the directive is invoked during
+"Normal Tokenization" or "Tokenizer-Escape" mode:</p>
+<h6 style="margin-left: 120px;"><big><big><a name="mozTocId54716"></a><a
+ name="F_B-T-B_Normal"></a>F['] in "Normal Tokenization" Mode:</big></big></h6>
+<p style="margin-left: 120px;">The given word's FCode-Token number is
+tokenized as a literal, which can be used, for instance, as the
+argument to a <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">get-token</span>
+or <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">set-token</span>
+command.<br>
+</p>
+<div style="margin-left: 120px;">For example, the sequence:<big> </big><br>
+</div>
+<div style="margin-left: 200px;"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">F[']
+rl@ get-token</span><span
+ style="font-family: helvetica,arial,sans-serif;"></span>
+</div>
+<div style="margin-left: 160px;">is equivalent to:<big> </big><br>
+</div>
+<div style="margin-left: 200px;"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;"> h#
+234 get-token</span><br>
+</div>
+<h6 style="margin-left: 120px;"><big><big><a name="mozTocId55261"></a><a
+ name="F_B-T-B_TkzEsc"></a>F['] in "Tokenizer-Escape" Mode:</big></big></h6>
+<p style="margin-left: 120px;">This function is the one <a
+ href="#Tkz_Esc_Scope">exception to the general rule</a> about the <a
+ href="#Scope_Directives">scope</a> of words recognized in
+"Tokenizer-Escape" mode; it will recognize function-names that
+were defined during normal tokenization mode and that were <a
+ href="#current_device-node">current at the time</a> "Tokenizer-Escape"
+mode was entered.<br>
+</p>
+<p style="margin-left: 120px;">The given word's FCode-Token number is
+pushed
+onto the data-stack, from whence it can be used, for instance, as the
+numeric argument to a <a href="#Tkz_Esc_Const"><span
+ style="font-family: courier new; font-weight: bold;">constant</span></a>
+definition.<br>
+</p>
+<h5 style="margin-left: 80px;"><a name="mozTocId887752"></a><big><a
+ name="Shell_Env_Vbles_in_File_Names"></a>Shell-Environment
+Variables in
+File-Names</big></h5>
+<p style="margin-left: 80px;">The filename that follows the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">fload</span>
+command or the <a href="#ENCODE_FILE"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">encode-file</span></a>
+directive may be an
+absolute path, a path relative to the Current Working
+Directory, or a path relative to one of the
+directories in the <a href="#Include_List">Include-List</a>. It
+may also contain Shell Environment Variables and
+related expressions recognized by the Host Operating System environment
+in which the
+Tokenizer is running. These will all be expanded before loading
+the
+file. An illustration may be
+seen in <a href="#Example_4">Example #4</a>. </p>
+<p style="margin-left: 80px;">An <a href="#Advisories">ADVISORY</a>
+message showing the expanded value will be printed if the <a
+ style="font-style: italic; font-weight: bold;" href="#verbose_option">verbose</a>
+<a href="#Command-Line_options_">option</a> has
+been selected or in the event of a failure to read the file.<br>
+</p>
+<h4 style="margin-left: 40px;"><a class="mozTocH4" name="mozTocId505746"></a>Featured
+behaviors, supported by this
+Tokenizer, that are not mentioned in the Standard</h4>
+<h5 style="margin-left: 80px;"><a name="mozTocId530910"></a><big><a
+ name="Macros"></a>User-Defined Macros</big></h5>
+<div style="margin-left: 80px;">The Standard mentions built-in
+tokenizer macros (such as <span
+ style="font-family: courier new,courier,monospace;">3drop</span> for
+example) but makes no provision for the User to define any additional
+macros.
+<p>This Tokenizer supports a directive that allows the User to define
+additional macros. Its syntax is:</p>
+<p style="margin-left: 40px;">
+<span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[macro]</span>
+<span style="font-family: courier new,courier,monospace;"><<span
+ style="font-style: italic;">macroname</span>> <span
+ style="font-style: italic;">cmnd1 cmnd2 cmnd3 ... cmndN</span></span></p>
+<p>The entire body of the macro definition must be contained on a
+single line. The linefeed at the end of the line will be included
+as part of the macro definition.<br>
+</p>
+<p>In this Tokenizer, macros are implemented as simple
+string
+substitutions, interpreted at the time they are invoked. If a
+component of the macro should change its meaning -- i.e., be redefined
+-- then, on subsequent invocations of the macro, the new meaning will
+take effect. (Note that this is different from an <a
+ href="#Alias">alias</a>). It is also (eminently) possible to
+define a macro
+that uses a name that has not been defined at the time the macro is
+defined, to define that name later, and to invoke the macro after
+the name has been defined. This is legitimate and will work.<br>
+</p>
+<p>For the same reason, macros may be nested; i.e., one macro may be
+defined in such a way as to invoke another. However, if a macro
+-- or a series of nested macros -- were to invoke a macro that is
+already running, that will be detected and reported as an <a
+ href="#An_ERROR">Error</a> condition.
+For a simple example, a User who needed to identify all occurrences of
+the word <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">2drop</span>
+might attempt to write:</p>
+<div
+ style="margin-left: 40px; font-family: courier new,courier,monospace;"> <span
+ style="font-weight: bold;">overload</span> <span
+ style="font-weight: bold;">[macro]</span> 2drop <span
+ style="font-weight: bold;">message"</span> 2DROP called here<span
+ style="font-weight: bold;">"</span> <span style="font-weight: bold;">2drop</span>
+</div>
+ in the expectation that the second <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">2drop</span>
+would be interpreted as the generic one, which outputs the
+corresponding token.
+<p>However, because the macro definition is not "compiled" in the same
+way
+as a colon-definition, but is, instead, interpreted at run-time, the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">2drop</span>
+that would be executed would, in fact, be the macro itself, leading to
+an infinite loop of messages (if the condition were not
+detected...). In order to protect against this condition, the
+User should, instead, do something like this:</p>
+<div
+ style="margin-left: 40px; font-family: courier new,courier,monospace;">\
+Keep a "generic" 2DROP handy.<br>
+<span style="font-weight: bold;">alias</span>
+generic-2drop 2drop<br>
+<span style="font-weight: bold;">overload</span> <span
+ style="font-weight: bold;">[macro]</span> 2drop <span
+ style="font-weight: bold;">message"</span> 2DROP called here<span
+ style="font-weight: bold;">" </span>generic-2drop
+</div>
+<p>
+This has the added advantage that, when the passage in which the
+notification is needed comes to an end, the User can restore <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">2drop</span>
+to its Standard behavior with:<br>
+</p>
+<div
+ style="margin-left: 40px; font-family: courier new,courier,monospace;"><span
+ style="font-weight: bold;">overload</span> <span
+ style="font-weight: bold;">alias</span> 2drop generic-2drop</div>
+<p>A User-Defined Macro takes on the <a href="#Scope_Directives">Scope</a>
+that is current at the time it is created. An illustration may be
+seen in <a href="#Example_4">Example #4</a>. </p>
+</div>
+<h5 style="margin-left: 80px;"><a class="mozTocH5" name="mozTocId539069"></a><big><a
+ name="Multiple_device_nodes"></a>Multiple
+device-nodes</big></h5>
+<div style="margin-left: 80px;">The typical use of a tokenizer is to
+write a driver for a single-node device. For such an application,
+the commands <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">new-device</span>
+and <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">finish-device</span>
+are not required. However, many newer devices consist of
+complexes of subordinate and peer devices within a single assembly;
+some additional caution is required when developing drivers for such
+configurations.<br>
+<p><a name="INSTANCE_at_run_time"></a>In particular, an attempt within
+one device-node to access directly
+a method defined in another device-node must be flagged as an
+error. Consider
+what would happen at run-time if it were allowed: the called
+method
+would be expecting the instance-pointer to be pointing to the instance
+data of the device-node in which that method was defined, but it would,
+instead,
+be pointing to the instance data of the device-node that made the
+call.
+This is an invitation to havoc that would be -- to put it politely --
+somewhat difficult to trace.<br>
+</p>
+<p>The correct way to invoke a method across device-node boundaries is
+via <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">$call-parent</span>
+or <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">$call-method</span>
+or the like.<br>
+</p>
+<p><a name="device-node_vocabularies"></a>In order to detect such
+errors early on, this Tokenizer keeps track
+of separate but linked "vocabularies"
+associated with device-nodes. When the command <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">new-device</span>
+is encountered in interpretation mode, a new device-node vocabulary is
+opened and new
+definitions are entered into it. Definition-names created in the
+preceding device-node -- presumably the parent of the newly started
+device -- are suspended from accessiblity. <br>
+</p>
+<p>Correspondingly, when the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">finish-device</span>
+command is encountered in interpretation mode, the "vocabulary" of the
+device
+being ended is emptied ("forgotten" in classic Forth parlance) and the
+"vocabulary" of the parent-device is resumed.<br>
+</p>
+<p><a name="current_device-node"></a>The device-node vocabulary to
+which definitions are being entered at
+any given time, and from which definitions are accessible, may be
+referred to as the <span
+ style="font-family: courier new,courier,monospace; font-style: italic;">current
+device-node</span> for purposes of discussion.<br>
+</p>
+<p>Note that the Tokenizer does not switch vocabularies when the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">new-device</span>
+or <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">finish-device</span>
+commands are encountered in compilation mode (i.e., when they are being
+compiled-in to a method); they are treated as ordinary tokens, since
+the shift to a new device-node will not occur until run-time.
+</p>
+<p>The commands <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">new-device</span>
+and <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">finish-device</span>
+must remain in balance. If a <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">finish-device</span>
+is encountered without a prior corresponding <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">new-device</span>,
+or if the end of FCode (or a <a
+ href="#Resetting_Symbols_Defined_in_Either_Mode"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">Reset-Symbols</span></a>
+directive issued in "normal" mode) is reached and not all occurrences
+of <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">new-device</span>
+are balanced by a call to <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">finish-device</span>,
+it will be reported as an <a href="#An_ERROR">Error</a> condition. </p>
+<p>Definitions made in "Tokenizer-Escape" mode, however, are
+independent of device-node vocabularies and remain accessible until
+they
+are explicitly reset by a <a
+ href="#Resetting_Symbols_Defined_in_Either_Mode"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">Reset-Symbols</span></a>
+directive issued in "Tokenizer-Escape" mode.<br>
+</p>
+</div>
+<h6 style="margin-left: 120px;"><a name="mozTocId540605"></a><big><big><a
+ name="Global_Definitions"></a>Global
+Definitions</big></big></h6>
+<div style="margin-left: 120px;">Occasionally, the User might need to
+create definitions of methods that are
+intended to be directly accessible to all the device-nodes in a
+driver, even though they reside in one device
+node. Such
+definitions are, effectively, added to the "core" vocabulary, and are
+Global in scope. <a href="#Scope_Directives">Directives</a> to
+control the creation of Global Definitions are supported by this
+Tokenizer.</div>
+<h5 style="margin-left: 80px;"><a class="mozTocH5" name="mozTocId354426"></a><big><a
+ name="Multiple_FCode-block_Images"></a>Multiple
+FCode-block Images</big></h5>
+<div style="margin-left: 80px;">In addition to supporting complexes of
+subordinate and peer devices within a single assembly, this Tokenizer
+supports configurations in which subordinate devices' drivers are kept
+in separate but related FCode blocks. This is accomplished simply
+by invoking multiple bodies of code bracketed by <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">fcode-version<span
+ style="font-style: italic;"><</span></span><span
+ style="font-family: courier new,courier,monospace; font-style: italic;">n</span><span
+ style="font-family: courier new,courier,monospace; font-weight: bold; font-style: italic;">></span>
+and <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">fcode-end</span>
+(or one of its synonyms).<br>
+<p>When the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">fcode-end</span>
+(or equivalent) that ends one body of code is processed, and before
+the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">fcode-version<span
+ style="font-style: italic;"><</span></span><span
+ style="font-family: courier new,courier,monospace; font-style: italic;">n</span><span
+ style="font-family: courier new,courier,monospace; font-weight: bold; font-style: italic;">></span>
+that begins the next, the definitions that had been created are
+forgotten, but assignment of FCode-token numbers will continue in
+sequence. Likewise, definitions made in "Tokenizer-Escape" mode
+will persist.<br>
+</p>
+<p>The User who desires to reset one or the other of these, or both,
+can do so by issuing the directives:<br>
+</p>
+<div style="margin-left: 40px;"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">FCode-Reset<br>
+</span>
+<div style="margin-left: 40px;">or<br>
+</div>
+</div>
+<div style="margin-left: 40px;"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">Reset-Symbols</span><br>
+</div>
+</div>
+<div style="margin-left: 40px;">
+<div style="margin-left: 40px;"><br>
+respectively, in "Tokenizer-Escape" mode. This is illustrated in <a
+ href="#Example_3">Example #3</a>.<br>
+</div>
+</div>
+<h5 style="margin-left: 80px;"><a class="mozTocH5" name="mozTocId232809"></a><big><a
+ name="Multiple_PCI_Image"></a>Multiple
+PCI-Image</big></h5>
+<div style="margin-left: 80px;">The PCI Standard allows for a chain of
+PCI Images to be bundled together in a single binary (as indicated by
+the <a href="#Last_Image_Indicator_bit">"Last Image" bit</a>).
+This Tokenizer supports such configurations by correctly processing
+Source that contains multiple occurrences of blocks of code bracketed
+by <span
+ style="font-family: courier new,courier,monospace; color: rgb(68, 34, 0); font-weight: bold;">pci-header</span>
+... <span
+ style="font-family: courier new,courier,monospace; color: rgb(68, 34, 0); font-weight: bold;">pci-header-end</span>
+directives. An illustration can be seen in <a href="#Example_1">Example
+#1</a>, below.<br>
+</div>
+<h2><a class="mozTocH2" name="mozTocId194505"></a><a name="Examples:"></a>Examples:</h2>
+<h3><a class="mozTocH3" name="mozTocId544211"></a><a name="Example_1"></a>Example
+#1:</h3>
+In the first example, the "Inner Body" file has some sections that
+compile
+different code, depending on the value of a named-constant
+switch. The "Outer Shell " file controls the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">fload</span>ing
+of the
+"Inner Body": It reminds the User to specify the setting of the
+switch, then produces an image with two PCI-Images, based on opposite
+settings of the switch. Note that the use of <span
+ style="font-family: courier new,courier,monospace; font-weight: bold; color: rgb(68, 34, 0);">Reset-Symbols</span>
+in "Tokenizer-Escape" mode before the redefinition of <span
+ style="font-family: courier new,courier,monospace; color: rgb(68, 34, 0);">function-switch</span>,
+to avoid a "Duplicate definition" condition, may be omitted if the User
+is willing to tolerate the warning.
+<h5><a class="mozTocH5" name="mozTocId563670"></a>File:
+InnerBody.fth</h5>
+<span
+ style="font-family: courier new,courier,monospace; color: rgb(68, 34, 0);"><span
+ style="font-weight: bold;">fcode-version2</span><br>
+<span style="font-style: italic;">... Common code <obligatory
+sneeze> ...</span><br>
+<span style="font-weight: bold;">F[</span>
+function-switch <span style="font-weight: bold;">F]</span>
+<span style="font-weight: bold;">[if]</span><br>
+ <span style="font-style: italic;">True-conditional
+code</span><br>
+
+<span style="font-weight: bold;">[message]</span> The true
+path was wisely chosen<br>
+<span style="font-weight: bold;">[else]</span><br>
+
+<span style="font-style: italic;">False-conditional code</span><br>
+
+<span style="font-weight: bold;">[message]</span> You have
+foolishly chosen the false path.<br>
+<span style="font-weight: bold;">[then]</span><br>
+<span style="font-style: italic;">...
+More common code <now cough>.</span><br>
+<span style="font-weight: bold;">end0</span></span><br>
+<h5><a class="mozTocH5" name="mozTocId570875"></a>File:
+OuterShell.fth</h5>
+<span
+ style="font-family: courier new,courier,monospace; color: rgb(68, 34, 0);"><span
+ style="font-weight: bold;">[ifndef]</span> first-path<br>
+
+<span style="font-weight: bold;">F[</span><br>
+ <span style="font-weight: bold;">."</span> Add a
+command-line switch:
+-d ""first-path=<true|false>"" "n"\<br>
+ <span style="font-weight: bold;"> </span> "tthen run
+this again.<span style="font-weight: bold;">"</span><br>
+
+<span style="font-weight: bold;">F]</span><br>
+<span style="font-weight: bold;">[else]</span><br>
+ <span style="font-weight: bold;">F[</span><br>
+ <span style="font-weight: bold;">[defined]</span>
+first-path <span style="font-weight: bold;">constant</span>
+function-switch<br>
+<div style="margin-left: 40px;"><span style="font-style: italic;">vendor-id</span>
+<span style="font-style: italic;">device1-id</span> <span
+ style="font-style: italic;">class-code1</span> <span
+ style="font-weight: bold;">pci-header</span><br>
+
+<span style="font-weight: bold;">F]</span><br>
+<span style="font-weight: bold;">not-last-image</span><br>
+<span style="font-weight: bold;">fload</span> InnerBody.fth<br>
+<span style="font-weight: bold;">pci-header-end</span><br>
+<br>
+</div>
+ <span style="font-weight: bold;">F[</span> <span
+ style="font-weight: bold;">reset-symbols</span><br>
+ <span style="font-weight: bold;">[defined]</span>
+first-path <span style="font-weight: bold;">0=</span> <span
+ style="font-weight: bold;">constant</span> function-switch<br>
+<div style="margin-left: 40px;"><span style="font-style: italic;">vendor-id</span>
+<span style="font-style: italic;">device2-id</span> <span
+ style="font-style: italic;">class-code2</span> <span
+ style="font-weight: bold;">pci-header</span><br>
+
+<span style="font-weight: bold;">F]</span><br>
+<span style="font-weight: bold;">last-image</span><br>
+<span style="font-weight: bold;">fload</span> InnerBody.fth<br>
+<span style="font-weight: bold;">pci-header-end</span><br>
+</div>
+<span style="font-weight: bold;">[then]</span></span><br>
+<h5><a class="mozTocH5" name="mozTocId953372"></a>Command-Line
+invocation:</h5>
+<span
+ style="font-family: courier new,courier,monospace; color: rgb(68, 34, 0); font-weight: bold;">toke
+-v -d "first-path=true"
+OuterShell.fth</span><br>
+<br>
+<h3><a class="mozTocH3" name="mozTocId80432"></a><a name="Example_2"></a>Example
+#2:<br>
+</h3>
+<p>The second example illustrates the use of
+<a href="#Special_Feature_Flags">Special-Feature
+Flags</a> to select or de-select
+specific non-standard
+features.<br>
+</p>
+<p>The User is developing code that will run across all platforms, and
+therefore must
+must be neutral with regard to "Sun"- or "Apple"- -style usage of <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">ABORT"</span>
+; this can be best achieved by disallowing the use of <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">ABORT"</span>
+altogether.
+</p>
+<p>There is no concern, however, about compatibility of the Source with
+other Tokenizers, so the User need not forgo the conveniences of Local
+Values and String-remark-escapes.
+</p>
+<p>Furthermore, the Source contains many passages taken from IBM Legacy
+sources, and the User does not wish to see a WARNING message when the
+Legacy Locals Separator is used.
+</p>
+<p>The command-line for these conditions would include the following:</p>
+<span
+ style="font-family: courier new,courier,monospace; color: rgb(68, 34, 0); font-weight: bold;">toke
+-f NOabort-quote -f local-values -f NOlv-legacy-warning</span>
+<p>Alternatively, these flags may be set from <a
+ href="#Changing_C-L_Flags_from_Source">within the Source code</a>
+thus:
+</p>
+<div
+ style="margin-left: 40px; color: rgb(68, 34, 0); font-family: courier new,courier,monospace; font-weight: bold;">[flag]
+NOabort-quote<br>
+[flag] local-values<br>
+[flag] NOlv-legacy-warning
+</div>
+<p>Note that the invocation of <span
+ style="font-family: courier new,courier,monospace; color: rgb(68, 34, 0);">-f
+local-values</span> is necessary, as its default state is to be
+disabled.
+Also, because <span
+ style="font-family: courier new,courier,monospace; color: rgb(68, 34, 0);">-f
+NOabort-quote</span> is invoked, the setting of the <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">Sun-ABORT-Quote</span>
+flag is irrelevant.<br>
+</p>
+<h3><a class="mozTocH3" name="mozTocId455242"></a><a name="Example_3"></a>Example
+#3:</h3>
+<p>The third example illustrates two situations where two or three
+<a href="#Multiple_FCode-block_Images">FCode blocks</a>
+are incorporated into a single PCI Image.<br>
+</p>
+<p>In the first situation, the "Outer" block will <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">byte-load</span>
+the code of
+the "Inner" block before the "Outer" block has been completely
+interpreted. It is therefore important to avoid collisions in
+FCode-token numeric assignments.<br>
+</p>
+<div
+ style="color: rgb(68, 34, 0); font-family: courier new,courier,monospace; margin-left: 40px;">
+<span style="font-weight: bold;">F[</span><br>
+<div style="margin-left: 40px;">h# 5afe <span
+ style="font-weight: bold;">set-rev-level</span>
+<br>
+h# beef
+\ Vendor<br>
+h# c0de
+\ Device ID<br>
+h# 90210 \
+Class Code (A "classy" ZIP Code... ;-)<br>
+</div>
+<span style="font-weight: bold;">F]</span> <span
+ style="font-weight: bold;">pci-header</span><br>
+<br>
+<span style="font-weight: bold;">fcode-version2</span><br>
+<br>
+<span style="font-weight: bold;">fload</span>
+outer-block.fth<span><br>
+</span><br>
+<span style="font-weight: bold;">fcode-end<br>
+<br>
+</span><span style="font-family: helvetica,arial,sans-serif;">\
+At this point, the last definition's assigned FCode number
+is approximately 0Xac0</span><br>
+<br>
+<span style="font-weight: bold;">fcode-version2</span><br>
+<br>
+<span style="font-family: helvetica,arial,sans-serif;">\ The next
+definitions' assigned FCode numbers continue from
+0Xac1</span><br>
+<br>
+<span style="font-weight: bold;">fload</span>
+inner-block.fth<span style="font-weight: bold;"><br>
+</span><br>
+<span style="font-weight: bold;">fcode-end</span><br>
+<br>
+<span style="font-weight: bold;">pci-header-end</span><br>
+<br>
+</div>
+<p>In the second situation, the "Outer" block will have been completely
+interpreted before it begins to <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">byte-load</span>
+the code of the two "Inner" blocks. It can safely discard the
+token-table of the interpreter, and allow its assigned FCode-token
+numbers to be re-cycled. Furthermore, the large number of
+definitions presents a real risk that the full range of usable
+FCode-token numbers will be exhausted. For these reasons, the
+User finds it necessary to reset the FCode-token numeric assignments to
+their initial state before tokenizing the two "Inner" blocks. <br>
+</p>
+<div
+ style="margin-left: 40px; color: rgb(68, 34, 0); font-family: courier new,courier,monospace;">
+<span style="font-weight: bold;">F[</span><br>
+<div style="margin-left: 40px;">
+h# face
+ <span style="font-weight: bold;">set-rev-level</span><br>
+h# cafe
+ \
+Vendor<br>
+h# d00d
+ \
+Device ID<br>
+h# 95014
+ \ Another Class(y
+ZIP) Code</div>
+<span style="font-weight: bold;">F]</span> <span
+ style="font-weight: bold;">pci-header</span><br>
+<br>
+<span style="font-weight: bold;">fcode-version2</span><br>
+<br>
+<span style="font-weight: bold;">fload</span> outer-block.fth<br>
+<br>
+<span style="font-weight: bold;">fcode-end</span><br>
+<br>
+<span style="font-family: helvetica,arial,sans-serif;">\ At this
+point, the last definition's assigned FCode number
+is approximately 0Xae0</span><br>
+<br>
+<span style="font-weight: bold;">fcode-version2<br>
+<br>
+</span><span style="font-family: helvetica,arial,sans-serif;">\
+Reset the assigned FCode numbers for the first "inner" block<br>
+ </span><br>
+<span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">FCode-Reset</span><span
+ style="font-weight: bold;"><br>
+</span> <br>
+<span style="font-weight: bold;">fload</span> inner-block_01.fth<br>
+<br>
+<span style="font-weight: bold;">fcode-end</span><br>
+<br>
+\ Load the second "inner" block.<br>
+<br>
+<span style="font-weight: bold;">fcode-version2</span><br>
+<br>
+<span style="font-family: helvetica,arial,sans-serif;">\ Reset
+the assigned FCode numbers for the second "inner" block</span><br>
+<br>
+<span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">FCode-Reset</span><br>
+<br>
+<span style="font-weight: bold;">fload</span> inner-block_02.fth<br>
+<br>
+<span style="font-weight: bold;">fcode-end</span><br>
+<br>
+<span style="font-weight: bold;">pci-header-end</span>
+</div>
+<br>
+<h3><a class="mozTocH3" name="mozTocId861304"></a><a name="Example_4"></a>Example
+#4</h3>
+<p>This example serves to illustrate the use of the directives that
+control the
+<a href="#Scope_Directives">Scope of Definitions</a>, and also to show
+a means whereby the IBM-Style
+Local Values
+Support File can be incorporated at a <a href="#Global_Definitions">Global</a>
+level. Normally, <a href="#Multiple_device_nodes">that would be
+problematical</a> because
+the <a href="TokenizerLocalValues.htm#Instance_Data_in_L_V_Support">Local
+Values
+Support functions</a> are written to use <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span>
+data, in order to conserve use of System memory. By temporarily
+over-riding the definition of <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">instance</span>
+in the <a href="#over_ride_instance">manner shown</a>, the User has
+traded-off economy of System-memory
+for convenience of programming.
+</p>
+<p>This example also offers an illustration of the use of <a
+ href="#Shell_Env_Vbles_in_File_Names">Shell-Environment Variables in
+File-Names</a>: Let us suppose that the directory in which the
+main file for the controller of the assembly whose driver being
+compiled here resides in a directory-tree, several layers under the
+root. Immediately below the root is a sub-directory called <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">shared</span>
+that contains shared functions and the Local Values support, and
+elsewhere under the tree are sharable bodies of driver code for
+device-modules that can be incorporated into various assemblies.
+Let us also suppose that the Makefile that governs this Tokenization
+process sets Environment Variables; the root of the tree is called <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">DevRoot</span>,
+and the directory in which the sharable bodies reside are called <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">SCZ</span>
+and <span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">SLZ</span>
+respectively. And let us further suppose that the <a
+ href="#Example_4_Condl_FLoad">inclusion of these two subsidiary devices</a>
+is
+optional, controlled by command-line symbol definitions. </p>
+<div
+ style="margin-left: 40px; color: rgb(68, 34, 0); font-family: courier new,courier,monospace;">
+\ Define a few macros and functions that will become available<br>
+\ to all subordinate device-nodes in this bundle.<br>
+<br>
+\ Some of our functions are written using Local Values.<br>
+\ We can make the Local Values Support accessible Globally<br>
+\ without incurring any Warning messages, and
+without<br>
+\ altering the LocalValuesSupport file, if we
+temporarily<br>
+\ disable the definition of INSTANCE<br>
+<br>
+<span style="font-weight: bold;">fcode-version2</span><br>
+<br>
+<span style="font-weight: bold;">headers</span><br>
+<br>
+<span style="font-weight: bold;">global-definitions</span><br>
+<br>
+<a name="over_ride_instance"></a>\ Bypass warning about
+Instance<br>
+\ without altering
+LocalValuesSupport file<br>
+<br>
+\ Leave ourselves a way to recover<br>
+<span style="font-weight: bold;">alias</span> generic-instance
+instance<br>
+<br>
+\ Here's where we disable it. During development, give
+confirmation<br>
+\ that the macro has been activated by
+printing a message. Also,<br>
+\ insert a token in the place where
+the Instance would have<br>
+\ gone so that our detokenizations line
+up
+when we inspect. We<br>
+\ do this by defining a comand-line
+symbol called proto-code<br>
+\ For the final production run, we can make the macro completely<br>
+\ silent by leaving proto-code
+undefined.<br>
+<span style="font-weight: bold;">[ifdef]</span> proto-code<br>
+ <span style="font-weight: bold;">overload [macro]</span>
+instance <span style="font-weight: bold;">message"</span>
+Bypassing Instance<span style="font-weight: bold;">"</span> <span
+ style="font-weight: bold;">noop</span><br>
+<span style="font-weight: bold;">[else]</span><br>
+ \ Make it completely silent<br>
+ <span style="font-weight: bold;">overload [macro]</span>
+instance <span style="font-weight: bold;">f[ noop ]f</span><br>
+<span style="font-weight: bold;">[endif]</span><br>
+<br>
+<span style="font-weight: bold;">fload</span> ${DevRoot}/shared/<span
+ style="font-weight: bold;">LocalValuesSupport.fth</span><br>
+<br>
+\ Restore normal meaning of Instance , also in Global scope.<br>
+<span style="font-weight: bold;">overload alias</span> instance
+generic-instance<br>
+<br>
+\ Here's a global definition that uses Local Values<br>
+: $CAT ( _max _str1 _len1 _str2 _len2 -- _max _str1 _len1' )<br>
+ <span style="font-weight: bold;">{</span> _max _str1
+_len1 _str2 _len2 <span style="font-weight: bold;">}</span><br>
+ _len1 _max <
+if
+\ there is room<br>
+ _str2 _str1 _len1 + _len2 _max _len1 -
+min move<br>
+ then<br>
+ _max _str1 _len1 _len2 + _max min \ always leave
+total length<br>
+;<br>
+<br>
+\ Here is a global macro<br>
+<span style="font-weight: bold;">[macro]</span> 4DUP 2over 2over<br>
+<br>
+\ And another<br>
+<span style="font-weight: bold;">[macro]</span> 4DROP 2drop
+2drop<br>
+<br>
+\ And yet another<br>
+<span style="font-weight: bold;">[macro]</span> (.h) base @
+swap hex (.) rot base !<br>
+<br>
+\ Other shared functions are in a file in the Shared Code
+directory:<br>
+<span style="font-weight: bold;">fload</span>
+${DevRoot}/shared/sharedfuncts.fth<br>
+<br>
+\ Definitions in all subsequent device-nodes will be able to
+access<br>
+\ the $CAT function and the macros
+4DUP and
+4DROP, as well as<br>
+\ to make use of IBM-Style Local Values
+without re-<span style="font-style: italic; font-weight: bold;">fload</span>ing<br>
+\ the Support File<br>
+<br>
+\ Now let's get back into the primary device-node.<br>
+<span style="font-weight: bold;">device-definitions</span><br>
+<br>
+\ Use instance data to create a large temporary buffer<br>
+d# 40 dup instance buffer: temp-buf
+( max )<br>
+<br>
+\ Convolutions to create a name on the fly...<br>
+s" controller_" tuck
+
+( max len adr len )<br>
+temp-buf
+swap
+ ( max len adr buf len )<br>
+move
+ ( max len )<br>
+temp-buf
+swap
+ ( max buf len )<br>
+my-self
+(.h)
+( max buf len adr2 len2 )<br>
+$cat
+( max buf len )<br>
+device-name drop<br>
+<br>
+\ Make a macro of that. Define it in parts.<br>
+\ Requires the core of the name on the stack.<br>
+\ Macro will create its own temp-buf in the current
+device.<br>
+<br>
+<span style="font-weight: bold;">global-definitions<br>
+<br>
+</span>\ First part of the operation: ( adr len --
+max adr len )<br>
+\ Note that "instance" is allowed here because it is not<br>
+\ invoked -- or even parsed --
+until the macro is invoked.<br>
+<span style="font-weight: bold;">[macro]</span>
+create-buffr d# 40 dup instance buffer: temp-buf -rot<br>
+<br>
+\ Second part of the operation: ( max adr len -- max buf
+len )<br>
+<span style="font-weight: bold;">[macro]</span>
+name-to-buffr tuck temp-buf swap move temp-buf swap<br>
+<br>
+\ Last part of the operation: ( max buf len -- )<br>
+\ We're using my-self as part of the device-name<br>
+\ for no particularly good reason other than<br>
+\ that it makes for an interesting example...
+;-}<br>
+<span style="font-weight: bold;">[macro]</span>
+buffr-to-dev-name my-self (.h) $cat device-name drop<br>
+<br>
+\ Combine the parts:<br>
+<span style="font-weight: bold;">[macro]</span> make-my-dev
+create-buffr name-to-buffr buffr-to-dev-name<br>
+<br>
+\ Back to the primary device-node.<br>
+<span style="font-weight: bold;">device-definitions</span><br>
+<br>
+\ Load its methods from the Current Directory<br>
+<span style="font-weight: bold;">fload</span> controller_methods.fth<br>
+<br>
+<a name="timestamp_prop"></a>\ Create timestamp property based on
+actual tokenization date and time<br>
+\ Combine into a single string (with a space between).<br>
+\ No trailing null-byte until end.<br>
+[fcode-date] encode-bytes " " encode-bytes encode+<br>
+[fcode-time] encode-string encode+ " release-time" property<br>
+<br>
+\ Log timestamp to the Audit Trail<br>
+tokenizer[ [fcode-date] [fcode-time] ]tokenizer<br>
+<br>
+<a name="Example_4_Condl_FLoad"></a>\ First optional subsidiary
+device. Inclusion controlled by command-line symbol.<br>
+<span style="font-weight: bold;">[ifdef]</span> scuzzy<br>
+<div style="margin-left: 40px;"><span style="font-weight: bold;">new-device</span><br>
+<br>
+" scuzzy_" make-my-dev<br>
+<br>
+\ Load its methods<br>
+<span style="font-weight: bold;">fload</span> ${SCZ}/scuzzy_methods.fth<br>
+<br>
+<span style="font-weight: bold;">finish-device</span><br>
+</div>
+<span style="font-weight: bold;">[endif]</span><br>
+<br>
+\ Second optional subsidiary device, controlled by command-line
+symbol.<br>
+<span style="font-weight: bold;">[ifdef]</span> sleazy<br>
+<div style="margin-left: 40px;"><span style="font-weight: bold;">new-device</span><br>
+<br>
+" sleazy_" make-my-dev<br>
+<br>
+\ Load its methods<br>
+<span style="font-weight: bold;">fload</span> ${SLZ}sleazy_methods.fth<br>
+<br>
+<span style="font-weight: bold;">finish-device</span><br>
+</div>
+<span style="font-weight: bold;">[endif]</span><br>
+<br>
+\ That's enough for now...<br>
+<span style="font-weight: bold;">fcode-end</span><br>
+</div>
+<h3><a class="mozTocH3" name="mozTocId866180"></a><a name="Example_5"></a>Example
+#5</h3>
+<p>This example serves to illustrate the use of the <a
+ href="#function_name"><span
+ style="font-family: courier new,courier,monospace; font-weight: bold;">[function-name]</span></a>
+directive to create a series of "you are here" debugging messages.<br>
+</p>
+<p>We will create a pair of macros whose names we can cut'n'paste at
+the beginning and end of every function we want to give a "you are
+here" message, switchable by a local debug-flag. The macros will
+be globally defined, but will make reference to locally-defined names
+for the debug-flag and the device-node name string. </p>
+<div
+ style="margin-left: 40px; color: rgb(68, 34, 0); font-family: courier new,courier,monospace;">
+<br>
+<span style="font-weight: bold;">fcode-version2</span><br>
+<br>
+<span style="font-weight: bold;">global-definitions</span><br>
+\ Each dev-node will create its own debug-flag and alias it
+to debug-me?<br>
+\ Each dev-node creates a macro called my-dev-name giving its
+device-name<br>
+<span style="font-weight: bold;"></span><br>
+<span style="font-weight: bold;">[macro]</span> .fname&dev <span
+ style="font-weight: bold;">[function-name]</span> <span
+ style="font-weight: bold;">type</span> <span
+ style="font-weight: bold;">."</span> in <span
+ style="font-weight: bold;">"</span> my-dev-name <span
+ style="font-weight: bold;">type</span> <br>
+ <br>
+<span style="font-weight: bold;">[macro]</span> name-my-dev
+my-dev-name <span style="font-weight: bold;">device-name<br>
+</span><br>
+<span style="font-weight: bold;">[macro]</span> .dbg-enter
+debug-me? <span style="font-weight: bold;">@</span> <span
+ style="font-weight: bold;">if</span> <span style="font-weight: bold;">."</span>
+Entering<span style="font-weight: bold;"> "</span> .fname&dev
+<span style="font-weight: bold;">cr</span> <span
+ style="font-weight: bold;">then</span><br>
+<span style="font-weight: bold;">[macro]</span> .dbg-leave
+debug-me? <span style="font-weight: bold;">@</span> <span
+ style="font-weight: bold;">if</span> <span style="font-weight: bold;">."</span>
+Leaving <span style="font-weight: bold;">"</span>
+.fname&dev <span style="font-weight: bold;">cr</span> <span
+ style="font-weight: bold;">then</span><br>
+<span style="font-weight: bold;">device-definitions</span><br>
+<br>
+<span style="font-weight: bold;">headers</span><br>
+\ Top-most device, named billy<br>
+<span style="font-weight: bold;">[macro]</span> my-dev-name "
+billy"<br>
+name-my-dev<br>
+<br>
+\ debug-billy? is a flag the user can turn "on" to get
+debug-messages<br>
+\ from the methods of the device we call "billy"<br>
+<span style="font-weight: bold;">variable</span> debug-billy?
+debug-billy? <span style="font-weight: bold;">off</span><br>
+\ Set it up for the macro<br>
+<span style="font-weight: bold;">alias</span> debug-me? debug-billy?<br>
+<br>
+: bill<br>
+
+.dbg-enter
+\ This will display Entering bill in billy<br>
+ <span style="font-weight: bold;">[char]</span> G <span
+ style="font-weight: bold;">dup</span><br>
+ <span style="font-weight: bold;">control</span> G <span
+ style="font-weight: bold;">3drop</span><br>
+
+.dbg-leave
+\ This will display Leaving bill in billy<br>
+<br>
+;<br>
+<br>
+: factl recursive ( n -- n! )<br>
+<span style="font-weight: bold;">type</span> <span
+ style="font-weight: bold;">."</span> Entering First vers. of <span
+ style="font-weight: bold;">"</span> .fname&dev <span
+ style="font-weight: bold;">cr</span><br>
+ <span style="font-weight: bold;">?dup</span> <span
+ style="font-weight: bold;">0=</span> <span style="font-weight: bold;">if</span>
+<span style="font-weight: bold;">1</span><br>
+ <span style="font-weight: bold;">else</span> <span
+ style="font-weight: bold;">dup</span> <span style="font-weight: bold;">1-</span>
+factl <span style="font-weight: bold;">*</span><br>
+ <span style="font-weight: bold;">then</span><br>
+ <span style="font-weight: bold;">."</span> Leaving
+First vers. of <span style="font-weight: bold;">"</span>
+.fname&dev <span style="font-weight: bold;">type</span> <span
+ style="font-weight: bold;">cr</span><br>
+;<br>
+<br>
+: factl ( n -- n! )<br>
+<span style="font-weight: bold;">type</span> <span
+ style="font-weight: bold;">."</span> Entering Second vers. of <span
+ style="font-weight: bold;">"</span> <span style="font-weight: bold;">[function-name]</span>
+<span style="font-weight: bold;">cr</span><br>
+ <span style="font-weight: bold;">?dup</span> <span
+ style="font-weight: bold;">0=</span> <span style="font-weight: bold;">if</span>
+<span style="font-weight: bold;">1</span> factl<br>
+ <span style="font-weight: bold;">else</span> <span
+ style="font-weight: bold;">dup</span> <span style="font-weight: bold;">1-</span>
+<span style="font-weight: bold;">recurse</span> <span
+ style="font-weight: bold;">*</span><br>
+ <span style="font-weight: bold;">then</span><br>
+<span style="font-weight: bold;">type</span> <span
+ style="font-weight: bold;">."</span> Leaving Second vers. of <span
+ style="font-weight: bold;">"</span> <span style="font-weight: bold;">[function-name]</span>
+<span style="font-weight: bold;">cr</span><br>
+;<br>
+<br>
+<span style="font-weight: bold;">variable</span> naught<br>
+<span style="font-weight: bold;">defer</span> do-nothing<br>
+20 <span style="font-weight: bold;">value</span> twenty<br>
+30 <span style="font-weight: bold;">value</span> thirty<br>
+40 <span style="font-weight: bold;">buffer:</span> forty<br>
+50 <span style="font-weight: bold;">constant</span> fifty<br>
+<span style="font-weight: bold;">create</span> three 0 <span
+ style="font-weight: bold;">,</span> 00 <span
+ style="font-weight: bold;">,</span> <span style="font-weight: bold;">h#</span>
+000 <span style="font-weight: bold;">,</span><br>
+<span style="font-weight: bold;">struct</span><br>
+4 <span style="font-weight: bold;">field</span> >four<br>
+<span style="font-weight: bold;">constant</span> /four<br>
+<br>
+: peril<br>
+
+.dbg-enter
+\ This will display Entering peril in billy<br>
+ <span style="font-weight: bold;">[']</span> <span
+ style="font-weight: bold;">noop</span> <span
+ style="font-weight: bold;">to</span> do-nothing<br>
+ 100 <span style="font-weight: bold;">to</span>
+thirty<br>
+ 5 <span style="font-weight: bold;">to</span>
+naught
+<span style="font-style: italic;">\ Generates a WARNING</span><br>
+ thirty <span style="font-weight: bold;">dup</span> <span
+ style="font-weight: bold;">-</span> <span style="font-weight: bold;">abort"</span>
+Never Happen<span style="font-weight: bold;">"</span><br>
+
+.dbg-leave
+\ You get the idea...<br>
+;<br>
+<br>
+: thirty ( new-val -- )<br>
+ .dbg-enter<br>
+ <span style="font-weight: bold;">dup</span> <span
+ style="font-weight: bold;">to</span> thirty<br>
+ <span style="font-weight: bold;">alias</span> .dec <span
+ style="font-weight: bold;">.d</span>
+\ Generates a WARNING and an ADVISORY<br>
+ ." Dirty" .dec<br>
+ .dbg-leave<br>
+;<br>
+<br>
+\ First subsidiary device, "child" of billy<br>
+<span style="font-weight: bold;">new-device</span><br>
+ <span style="font-weight: bold;">instance</span> <span
+ style="font-weight: bold;">variable</span> cheryl<br>
+ <span style="font-weight: bold;">[macro]</span>
+my-dev-name <span style="font-weight: bold;">"</span> cheryl<span
+ style="font-weight: bold;">"</span><br>
+ name-my-dev<br>
+<br>
+ \ Third-level device, "grandchild" of billy<br>
+ <span style="font-weight: bold;">new-device</span><br>
+ <span
+ style="font-weight: bold;">[macro]</span> my-dev-name <span
+ style="font-weight: bold;">"</span> meryl<span
+ style="font-weight: bold;">"</span><br>
+ name-my-dev<br>
+ <span
+ style="font-weight: bold;">variable</span> debug-meryl?
+debug-meryl? <span style="font-weight: bold;">off</span><br>
+ <span
+ style="font-weight: bold;">alias</span> debug-me? debug-meryl?<br>
+<br>
+ : merle<br>
+
+.dbg-enter
+\ This will display Entering merle in meryl<br>
+
+cheryl
+\ ERROR. Is in a different dev-node.<br>
+ .dbg-leave<br>
+ ;<br>
+ <span style="font-weight: bold;">variable</span>
+beryl<br>
+ <span style="font-weight: bold;">finish-device</span><br>
+<br>
+ \ Now we're back to "cheryl"<br>
+ <br>
+ <span style="font-weight: bold;">variable</span>
+debug-cheryl? debug-cheryl? <span style="font-weight: bold;">off</span><br>
+ alias debug-me? debug-cheryl?<br>
+<br>
+ : queryl<br>
+
+.dbg-enter
+\ This will display Entering queryl in cheryl<br>
+ <span style="font-weight: bold; font-style: italic;">over
+rot dup nip drop swap</span> \ Not the most useful
+code... ;-}<br>
+ .dbg-leave<br>
+ ;<br>
+<span style="font-weight: bold;">finish-device</span><br>
+\ And we're back to billy.<br>
+: droop ( -- )<br>
+
+.dbg-enter
+\ This will display Entering droop in billy<br>
+ twenty<br>
+ 0 <span style="font-weight: bold;">?do</span> i .h <span
+ style="font-weight: bold;">loop</span><br>
+
+.dbg-leave
+\ You get the idea....<br>
+;<br>
+<br>
+<a name="Example_5_func_nam"></a><br>
+\ The following will generate some unexpected errors:<br>
+: quack ( maybe not -- oops! I-forgot-the-close-paren<br>
+
+.dbg-enter
+\ This should display Entering quack in billy<br>
+
+\ But it doesn't display anything and I don't know why.<br>
+ h# 30 .d<br>
+
+.dbg-leave
+\ and I'm still baffled...<br>
+; \ Oh, well, soldier on...<br>
+: cluck ( don't count -- before hatched ) \ Now, <span
+ style="font-style: italic;">there's</span> a close-paren....
+</div>
+<br>
+<div
+ style="color: black; font-family: helvetica,arial,sans-serif; font-weight: bold;"><span
+ style="font-style: italic;">Note:</span> At this point,
+the Tokenizer has issued a <a href="#Allow_Multi_Line">Multi-Line
+Warning</a> about a Comment that
+began six lines earlier, which gives the User a good indication as to
+just what
+went wrong... </div>
+<br>
+<div
+ style="margin-left: 40px; color: rgb(68, 34, 0); font-family: courier new,courier,monospace;">
+.dbg-enter
+\ This does display, but not what I expected.<br>
+ ." Coming from" <a href="#Inp_Fil_Nm_Strg">[input-file-name]</a>
+type ." line
+" <a href="#Inp_Fil_Nm_Strg">[line-number]</a> .d cr<br>
+tokenizer[ <a href="#function_name">[function-name]</a>
+]tokenizer \ Let's not wait for run-time<br>
+
+.dbg-leave
+\ Now I get it...<br>
+;<br>
+<span style="font-weight: bold;">fcode-end</span><br>
+<br>
+</div>
+<br>
+<h2><a class="mozTocH2" name="mozTocId856440"></a>End Of Document</h2>
+<!-- =========================================================================== -->
+</body>
+</html>
Added: fcode-utils/documentation/workbook.css
===================================================================
--- fcode-utils/documentation/workbook.css (rev 0)
+++ fcode-utils/documentation/workbook.css 2006-10-30 16:58:53 UTC (rev 109)
@@ -0,0 +1,426 @@
+/************ This page modified on March 14, 2001 by Sharon Rempert ***************/
+.title
+{
+ text-align: right;
+}
+/*table*/
+table
+{
+ padding: 3px;
+ border: 1px;
+ margin-left: 20px;
+}
+.small
+{
+ font-size: 10pt;
+}
+
+/* body */
+body
+{
+ margin: 1em 2em 2em 1em;
+ font-family: sans-serif;
+ color: black;
+ background: white;
+}
+
+.draft
+{
+ margin: 1em 2em 2em 2em;
+ color: black;
+ background: white url(/:/projects/esw/process/doc/draft.gif) no-repeat fixed top left;
+}
+
+p, a,ul,dt,li,dd,ol,b,i,blockquote,font
+{
+ font-family: sans-serif;
+}
+
+address
+{
+ font-size: 10pt;
+ text-align: center;
+ font-family: sans-serif;
+}
+
+.logo
+{
+ text-align: center;
+}
+
+/*text*/
+
+
+p.adoption
+{
+ color: #0050B2;
+ background: white;
+ font-size: large;
+}
+
+p.copyright {font-size: small;}
+
+p.warning
+{
+ color: #901010;
+ background: white;
+ margin: 1em 4em 1em 4em;
+ border: solid red;
+}
+
+.note1
+{
+ width: 80%;
+ border: solid #800080;
+}
+.note
+{
+ color: green;
+ background: white;
+}
+
+pre
+{
+ white-space: pre;
+ font-family: monospace;
+ margin-left: 2em;
+ color: maroon;
+ background: white;
+}
+
+pre.example
+{
+ white-space: pre;
+ color: #203838;
+ background: #B0E0E0;
+ margin: 1em 4em 1em 4em;
+ padding: 0.5em 0.5em 0.5em 0.5em;
+ font-family: monospace;
+ border: none;
+}
+
+pre.code
+{
+ white-space: pre;
+ color: maroon;
+ background: #eed6b4;
+ margin: 1em 4em 1em 0em;
+ padding: 1em 1em 1em 1em;
+ font-family: monospace;
+ border: none;
+}
+
+h1, h2, h3, h4, h5, h6
+{
+ font-family: sans-serif;
+ text-align: left;
+ font-weight: bold;
+ color: #0050B2;
+ background: white;
+}
+
+.special
+{
+ color: #FF0000;
+}
+.spec_head
+{
+ color: #FF0000;
+ text-decoration: underline;
+ font-weight: bold;
+}
+.spec_pre
+{
+ font-style: oblique;
+}
+
+
+h1.title
+{
+ text-align: left;
+}
+
+ul.toc
+{
+ list-style: none;
+}
+
+dl { margin-top: 1em; }
+
+th, td
+{
+ font-family: sans-serif;
+ vertical-align:top;
+}
+.command
+{
+ font-weight: 700;
+ color: #0050B2;
+ background-color: white;
+}
+
+.description
+{
+ margin: 40px 0px 0px 0px;
+ font-family: sans-serif;
+}
+
+/*media*/
+
+@media screen
+{
+ a:hover
+ {
+ background: #FFFFAA;
+ color: blue;
+ }
+}
+
+@media aural
+{
+ h1, h2, h3
+ {
+ stress: 20;
+ richness: 90;
+ }
+
+ .hide {speak: none;}
+
+ p.copyright
+ {
+ volume: x-soft;
+ speech-rate: x-fast;
+ }
+
+ dt {pause-before: 20%;}
+ pre {speak-punctuation: code;}
+}
+
+/* inline markup */
+
+em {font-style: italic;}
+
+strong {font-weight: bold;}
+
+.emp
+{
+ font-weight: bold;
+ text-decoration: underline;
+}
+
+
+.strongerEmp
+{
+ font-weight: 900;
+ font-style: italic;
+}
+
+cite {font-style: italic;}
+
+dfn
+{
+ font-weight: 700;
+ font-style: italic;
+}
+
+var
+{
+ font-style: italic;
+ font-family: monospace;
+ color: #0000CD;
+ background: white;
+}
+
+acronym
+{
+ font-variant: small-caps;
+ font-style: normal;
+}
+
+abbr {font-style: normal;}
+
+code
+{
+ font-style: normal;
+ font-family: monospace;
+ color: #a72ea0;
+ background: white;
+}
+
+samp
+{
+ font-style: normal;
+ font-family: monospace;
+ color: #a723a0;
+ background: white;
+}
+
+kbd
+{
+ font-style: italic;
+ font-family: monospace;
+ color: #0000CD;
+ background: white;
+}
+
+/*hide*/
+
+.hide {display: none}
+
+/*span*/
+
+span.doc-string
+{
+ /* purple */
+ color: purple;
+ background-color: white;
+}
+
+span.reference
+{
+ /* red3 */
+ color: rgb(205,0,0);
+ background-color: white;
+}
+
+span.type
+{
+ /* MediumPurple3 */
+ color: rgb(137,104,205);
+ background-color: white;
+}
+
+span.function-name
+{
+ /* forestgreen */
+ color: rgb(34,139,34);
+ font-weight: bold;
+ background-color: white;
+}
+
+span.string
+{
+ /* blue4 */
+ color: rgb(0,0,139);
+ background-color: white;
+}
+
+span.comment
+{
+ /* red */
+ color: red;
+ font-style:italic;
+ background-color: white;
+}
+
+span.variable-name
+{
+ /* blue3 */
+ color: rgb(0,0,205);
+ background-color: white;
+}
+
+span.preprocessor
+{
+ /* blue3 */
+ color: rgb(0,0,205);
+ background-color: white;
+}
+
+span.keyword
+{
+ /* goldenrod3 */
+ color: rgb(205,155,29);
+ background-color: white;
+}
+
+.lists
+{
+ font-size: 14pt;
+ font-family: sans-serif;
+ text-align: left;
+ font-weight: bold;
+ color: #0050B2;
+ background: white;
+}
+
+
+.text
+{
+ font-family: sans-serif;
+}
+
+/*div*/
+
+.subtoc
+{
+ /*padding: 1em;*/
+ border: solid thin;
+ /*margin: 1em 0;*/
+ color: white;
+ background: #d0d0d0;
+}
+
+
+div.head {margin-bottom: 1em;}
+
+div.head h1
+{
+ margin-top: 2em;
+ clear: both;
+}
+
+div.head table
+{
+ margin-left: 2em;
+ margin-top: 2em;
+}
+
+div.head img
+{
+ color: black;
+ background: white;
+ border: none;
+}
+
+.document-control_2
+{
+ border: solid #404040;
+ color: black;
+ background: #e0e0e0;
+}
+
+.document-control
+{
+ margin-top: 1em;
+ margin-left: 10%;
+ margin-bottom: 1em;
+ border: solid #404040;
+ color: black;
+ background: #e0e0e0;
+}
+
+/* why doesn't dt work here? */
+div.document-control dl dt
+{
+ font-weight: bold;
+}
+
+
+/*links*/
+
+a.normref
+{
+ color: red;
+ background: white;
+}
+
+a.informref
+{
+ color: green;
+ background: white;
+}
+.no_bullet
+{
+ list-style-type: none;
+}
1
0
Author: stepan
Date: 2006-10-30 17:29:59 +0100 (Mon, 30 Oct 2006)
New Revision: 108
Added:
fcode-utils/COPYING
fcode-utils/README
fcode-utils/TODO
fcode-utils/romheaders/COPYING
Log:
some more infrastructure
Added: fcode-utils/COPYING
===================================================================
--- fcode-utils/COPYING (rev 0)
+++ fcode-utils/COPYING 2006-10-30 16:29:59 UTC (rev 108)
@@ -0,0 +1,341 @@
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) 19yy <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Added: fcode-utils/README
===================================================================
--- fcode-utils/README (rev 0)
+++ fcode-utils/README 2006-10-30 16:29:59 UTC (rev 108)
@@ -0,0 +1,16 @@
+This is the OpenBIOS FCODE suite.
+
+It consists of:
+
+- toke
+- detok
+- romheaders
+- localvalues
+
+NOTE: all parts of the OpenBIOS FCODE suite are GPL v2, except the localvalues
+implementation which is released under the Common Public License (CPL) version
+1.0 (see: http://www.opensource.org/licenses/cpl1.0.php)
+
+
+For information please contact info(a)coresystems.de
+
Added: fcode-utils/TODO
===================================================================
--- fcode-utils/TODO (rev 0)
+++ fcode-utils/TODO 2006-10-30 16:29:59 UTC (rev 108)
@@ -0,0 +1,298 @@
+fcode-utils/detok/decode.c
+ Line 46:
+ *
+ * Still to be done:
+ * Handling of indent-level is not correct. Branches should
+ * balance with their resolvers; constructs like do..loop
+ * case/of/endof/endcase are a few major examples.
+ * This will be tricky; the rules need to be carefully thought
+ * out, and the implementation might be more complex than
+ * at first meets the eye...
+ *
+
+ Line 280:
+ *
+ * Still to be done:
+ * More sophisticated error-checking for invalid offsets. Look
+ * at the type of branch, and what should be expected in the
+ * vicinity of the destination. (This might be best served
+ * by a separate routine).
+ * This might also help with handling the indent-level correctly...
+ * Also, if indentation were to be handled in this routine,
+ * there would be no need to return the value of the offset.
+ *
+
+
+fcode-utils/detok/pcihdr.c
+ Line 67:
+ *
+ * Still to be done:
+ * Print (as remarks) full descriptions of headers' fields
+ * Error check for wrong "Format"
+ * Skip past non-FCode blocks, thru multiple data-blocks
+ * Recognize PCI header in unexpected place or out-of-place
+ *
+
+ Line 130:
+ *
+ * Still to be done:
+ * Error-check; look for inconsistencies:
+ * Return a Negative Number if data-stream appears to be a PCI
+ * header, but has erroneous or inconsistent sub-field contents.
+ * Value and meaning of the Negative Number yet to be defined.
+ *
+
+ Line 188:
+ *
+ * Still to be done:
+ * Error-check; look for wrong "Code Type" or other inconsistencies:
+ * Return a Negative Number if data-stream appears to be a
+ * valid PCI Data Structure, but has erroneous or inconsistent
+ * sub-field contents.
+ * Value and meaning of the Negative Number yet to be defined.
+ * Skip past non-FCode data-blocks, even multiple blocks
+ *
+
+ Line 364:
+ *
+ * Still to be done:
+ * Handle error cases. At present, neither is_pci_header()
+ * nor is_pci_data_struct() returns a negative number,
+ * but when they are modified to do so, we must handle it.
+ *
+
+ Line 442:
+ *
+ * Still to be done:
+ * Come up with something more elegant for non-zero filler.
+ *
+
+
+fcode-utils/detok/printformats.c
+ Line 74:
+ *
+ * Still to be done:
+ * Define a routine, call it PrintComment , to print the given
+ * string surrounded by open-paren-space ... space-close-paren
+ * Define a single central routine, call it safe_malloc ,
+ * to do the test for null and print "No Memory" and exit.
+ * Define a single central routine, call it PrintError , to:
+ * Print the given error message
+ * Show the input file and line number
+ * Collect error-flags for failure-exit at end of operation.
+ *
+
+
+fcode-utils/toke/devnode.c
+ Line 67:
+ *
+ * Still to be done:
+ * Add a pair of fields to the data-structure for the Input File and
+ * Line Number where "finish-device" occurred. When a device-node
+ * is "finish"ed, do not delete it, but instead fill in those
+ * fields and the move the node to a separate linked-list.
+ * When looking whether a word exists in an ancestor-node, also
+ * check whether it was in a device-node that was finished and
+ * print both where it was started and where it was finished.
+ *
+
+
+fcode-utils/toke/emit.c
+ Line 34:
+ *
+ * Still to be done:
+ * Re-arrange routine and variable locations to clarify the
+ * functions of this file and its companion, stream.c
+ * This file should be concerned primarily with management
+ * of the Outputs; stream.c should be primarily concerned
+ * with management of the Inputs.
+ * Hard to justify, pragmatically, but will make for easier
+ * maintainability down the proverbial road...
+ *
+
+
+fcode-utils/toke/flowcontrol.c
+ Line 75:
+ *
+ * Still to be done:
+ * Correct analysis of Return-Stack usage around Flow-Control
+ * constructs, including within Do-Loops or before Loop
+ * Elements like I and J or UNLOOP or LEAVE.
+ * Similarly, Return-Stack usage around IF ... ELSE ... THEN
+ * statements needs analysis. For instance, the following:
+ *
+ * blablabla >R yadayada IF R> gubble ELSE flubble R> THEN
+ *
+ * is, in fact, correct, while something like:
+ *
+ * blablabla >R yadayada IF R> gubble THEN
+ *
+ * is an error.
+ *
+ * Implementing an analysis that would be sufficiently accurate
+ * to justify reporting an ERROR with certainty (rather than
+ * a mere WARNING speculatively) would probably require full
+ * coordination with management of Flow-Control constructs,
+ * and so is noted here.
+ *
+
+
+fcode-utils/toke/macros.c
+ Line 166:
+ *
+ * Still to be done:
+ * If an error is encountered during Macro evaluation, display
+ * supplemental information giving the name of the Macro
+ * being run, and the file and line number in which it was
+ * defined.
+ * This will require changes to the way user Macros are added
+ * and retained, and to the way error messages are displayed.
+ *
+
+
+fcode-utils/toke/nextfcode.c
+ Line 90:
+ *
+ * Still to be done:
+ * Detect and report when the Current Range stops overlapping
+ * one particular Range and starts overlapping another.
+ *
+
+
+fcode-utils/toke/scanner.c
+ Line 1046:
+ *
+ * Still to be done:
+ * Better protection against PC pointer-over-run past END.
+ * Currently, this works, but it's held together by threads:
+ * Because init_stream forces a null-byte at the end of
+ * the input buffer, parse_number() exits immediately upon
+ * encountering it. This situation could be covered more
+ * robustly...
+ *
+
+ Line 2192:
+ *
+ * Still to be done:
+ * Full detection of whether the Return-Stack has been cleared
+ * when required, including analysis of Return-Stack usage
+ * within Flow-Control constructs, and before Loop elements...
+ *
+
+ Line 2259:
+ *
+ * Still to be done:
+ * Correct analysis of Return-Stack usage around Flow-Control
+ * constructs. Consider, for instance, the following:
+ *
+ * blablabla >R yadayada IF R> gubble ELSE flubble R> THEN
+ *
+ * It is, in fact, correct, but the present scheme would
+ * tag it as a possible error. Conversely, something like:
+ *
+ * blablabla >R yadayada IF R> gubble THEN
+ *
+ * would not get tagged, even though it is actually an error.
+ *
+ * The current simple scheme also does not cover Return-Stack
+ * usage within Do-Loops or before Loop elements like I and
+ * J or UNLOOP or LEAVE. Implementing something like that
+ * would probably need to be integrated in with Flow-Control
+ * constructs, and will be noted in flowcontrol.c
+ *
+
+ Line 2323:
+ *
+ * Still to be done:
+ * Correct analysis of Return-Stack usage...
+ *
+
+ Line 3299:
+ *
+ * Still to be done:
+ * If the definer-name is not found, we might still look up
+ * the target name in the various vocabularies and use
+ * a phrase for those. E.g., if it is a valid token,
+ * we could say it's defined as a "primitive". (I'm
+ * not sure what we'd say about an FWord...)
+ *
+
+ Line 4617:
+ *
+ * Still to be done:
+ * Correct analysis of Return-Stack usage within Do-Loops
+ * or before Loop Elements like I and J or UNLOOP or LEAVE.
+ *
+
+
+fcode-utils/toke/stream.c
+ Line 60:
+ *
+ * Still to be done:
+ * Re-arrange routine and variable locations to clarify the
+ * functions of this file and its companion, emit.c
+ * This file should be concerned primarily with management
+ * of the Inputs; emit.c should be primarily concerned
+ * with management of the Outputs.
+ * Hard to justify, pragmatically, but will make for easier
+ * maintainability down the proverbial road...
+ *
+
+ Line 1070:
+ *
+ * Still to be done:
+ * Set a flag when carr-ret has been replaced by space;
+ * when a string crosses a line, if this flag is set,
+ * issue a warning that an extra space has been inserted.
+ *
+
+
+fcode-utils/toke/toke.c
+ Line 363:
+ *
+ * Still to be done:
+ * Devise a syntax to allow the command-line to specify multiple
+ * input files together with an output file name for each.
+ * Currently, the syntax allows only one output file name to be
+ * specified; when multiple input file names are specified,
+ * the specification of an output file name is disallowed,
+ * and only the default output file names are permitted.
+ * While this works around the immediate problem, a more
+ * elegant solution could be devised...
+ *
+
+
+fcode-utils/toke/usersymbols.c
+ Line 78:
+ *
+ * Still to be done:
+ * Convert the handling of user-defined symbols to the T.I.C.
+ * data-structure and its support routines. This should
+ * eliminate any further need of String-Substitution-type
+ * vocabularies. User-defined symbols will, however, still
+ * need to be a separate vocabulary from the Global, because
+ * they are required to stay in effect for the duration of
+ * the entire batch of tokenizations...
+ * (Afterthought: This is only true for user-defined symbols that
+ * were created on the command-line; if we ever allow symbols
+ * to be defined in the Source file, they should be as volatile
+ * as anything else that comes from a source file...
+ * Appending source-file-derived user-defined symbols to the Global
+ * Vocabulary could be a quasi-simple way to accomplish this.)
+ *
+
+ Line 246:
+ *
+ * Still to be done:
+ * Hook-in this routine to the processing of: ['] F['] H# FLOAD
+ * etc., and wherever else it might be needed or useful.
+ *
+
+ Line 316:
+ *
+ * Still to be done:
+ * Space the duplicate-name notation evenly; line it up past
+ * the longest name-with-value.
+ *
+
+
Added: fcode-utils/romheaders/COPYING
===================================================================
--- fcode-utils/romheaders/COPYING (rev 0)
+++ fcode-utils/romheaders/COPYING 2006-10-30 16:29:59 UTC (rev 108)
@@ -0,0 +1,341 @@
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) 19yy <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
1
0
r107 - in fcode-utils/testsuite: TokBrack TokCondl TokMisc TokeErrs TokoLoco
by svn＠openbios.org 30 Oct '06
by svn＠openbios.org 30 Oct '06
30 Oct '06
Author: stepan
Date: 2006-10-30 17:25:35 +0100 (Mon, 30 Oct 2006)
New Revision: 107
Added:
fcode-utils/testsuite/TokBrack/TokBrkTst_04.fth
fcode-utils/testsuite/TokMisc/ContErr0.fth
fcode-utils/testsuite/TokMisc/DtkVSFcTst.scr
fcode-utils/testsuite/TokMisc/VSFCtest.fth
fcode-utils/testsuite/TokMisc/VendSpecFCodes
fcode-utils/testsuite/TokeErrs/DecodProp.fth
fcode-utils/testsuite/TokoLoco/GlobalLocalValuesDevel.fth
fcode-utils/testsuite/TokoLoco/LocalValuesDevelSupport.fth
fcode-utils/testsuite/TokoLoco/LocalValuesSupport.fth
fcode-utils/testsuite/TokoLoco/TotalLocalValuesSupport.fth
Removed:
fcode-utils/testsuite/TokMisc/OldTkzr/
Modified:
fcode-utils/testsuite/TokBrack/TestArgs
fcode-utils/testsuite/TokCondl/CondMacAlias_01.fth
fcode-utils/testsuite/TokCondl/TestArgs
fcode-utils/testsuite/TokMisc/AllBiFCTypes.fth
fcode-utils/testsuite/TokMisc/ContErr3.fth
fcode-utils/testsuite/TokMisc/MiscFeatures.DOS.fth
fcode-utils/testsuite/TokMisc/MiscFeatures.fth
fcode-utils/testsuite/TokMisc/StringsGenl.fth
fcode-utils/testsuite/TokMisc/TestArgs
fcode-utils/testsuite/TokeErrs/DevImbal.fth
fcode-utils/testsuite/TokeErrs/DupNams.fth
fcode-utils/testsuite/TokeErrs/MiscFeatErrs.fth
fcode-utils/testsuite/TokeErrs/TestArgs
fcode-utils/testsuite/TokoLoco/GlobalLocalValues.fth
fcode-utils/testsuite/TokoLoco/TestArgs
Log:
update testsuite to 1.0.2
Modified: fcode-utils/testsuite/TokBrack/TestArgs
===================================================================
--- fcode-utils/testsuite/TokBrack/TestArgs 2006-10-30 13:26:11 UTC (rev 106)
+++ fcode-utils/testsuite/TokBrack/TestArgs 2006-10-30 16:25:35 UTC (rev 107)
@@ -10,7 +10,7 @@
# Lines that have no label, no switches, and no script
# do not need any commas.
-# Updated Wed, 08 Mar 2006 at 19:11 PST by David L. Paktor
+# Updated Wed, 11 Oct 2006 at 24:44 PDT by David L. Paktor
# Might as well get the date-and-time one out of the way first...
TokBrkTst_02 , , -i -l
@@ -18,3 +18,4 @@
TokBrkTst_01 , alwyshdr , -i -f ALWays-heADers
TokBrkTst_03
TokBrkErrTst_01 , , -i
+TokBrkTst_04 , , -i -T pele_yoetz_ne-ema-an_anochi_hu_ha-omer_v-oseh_v-ain_c-moni_bchol_ha_aretz -T whatsis
Added: fcode-utils/testsuite/TokBrack/TokBrkTst_04.fth
===================================================================
--- fcode-utils/testsuite/TokBrack/TokBrkTst_04.fth (rev 0)
+++ fcode-utils/testsuite/TokBrack/TokBrkTst_04.fth 2006-10-30 16:25:35 UTC (rev 107)
@@ -0,0 +1,76 @@
+\ Test of long names and duplication of names and maybe Tracing
+\ Updated Wed, 18 Oct 2006 at 13:34 PDT by David L. Paktor
+
+fcode-version2
+
+global-definitions
+
+true constant flunky?
+
+alias whoosis whatsis
+alias whatsis whoosis
+
+external
+decimal
+
+100 constant pele_yoetz_ne-ema-an_anochi_hu_ha-omer_v-oseh_v-ain_c-moni_bchol_ha_aretz
+
+device-definitions
+
+headers
+
+h# 3760 constant whatsis
+
+#message" Sync Up Diffs w/ prev. release."n"
+alias whoosis pele_yoetz_ne-ema-an_anochi_hu_ha-omer_v-oseh_v-ain_c-moni_bchol_ha_aretz
+#message"
+Sync Up again."n"
+headerless
+: pele_yoetz_ne-ema-an_anochi_hu_ha-omer_v-oseh_v-ain_c-moni_bchol_ha_aretz
+ 100
+;
+pele_yoetz_ne-ema-an_anochi_hu_ha-omer_v-oseh_v-ain_c-moni_bchol_ha_aretz 2 * constant clone
+
+\ Make sure the matching goes all the way...
+instance
+: pele_yoetz_ne-ema-an_anochi_hu_ha-omer_v-oseh_v-ain_c-moni_bchol_ha_oilum
+ clone
+ ['] whoosis execute
+;
+
+new-device
+80 constant this_name_has_a_whole_lot_of_syllables_and_so_would_not_be_a_good_ingredient_in_ice_cream_but_at_least_you_know_what_it_means
+
+headers
+ f[ 1cec6ea3 constant a_name_with_too_many_letters_should_not_matter_in_tokenizer_escape_mode
+ ]f
+
+: brand-x-ice-cream \ Because it uses ingredients with too many syllables
+ pele_yoetz_ne-ema-an_anochi_hu_ha-omer_v-oseh_v-ain_c-moni_bchol_ha_aretz dup 20 - do i . loop cr
+ ." Nameless one..." this_name_has_a_whole_lot_of_syllables_and_so_would_not_be_a_good_ingredient_in_ice_cream_but_at_least_you_know_what_it_means ." equals " . cr
+ ." But everyone likes an "
+ f[ a_name_with_too_many_letters_should_not_matter_in_tokenizer_escape_mode
+ f] fliteral .
+ clone . cr
+;
+
+flunky? if
+ d# 3760 constant whatsis
+else
+ d# 374 constant whatsis
+then
+
+
+finish-device
+
+overload : clone
+ pele_yoetz_ne-ema-an_anochi_hu_ha-omer_v-oseh_v-ain_c-moni_bchol_ha_aretz
+ pele_yoetz_ne-ema-an_anochi_hu_ha-omer_v-oseh_v-ain_c-moni_bchol_ha_oilum
+ whatsis
+ whoosis
+;
+
+end0
+
+
+
Modified: fcode-utils/testsuite/TokCondl/CondMacAlias_01.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/CondMacAlias_01.fth 2006-10-30 13:26:11 UTC (rev 106)
+++ fcode-utils/testsuite/TokCondl/CondMacAlias_01.fth 2006-10-30 16:25:35 UTC (rev 107)
@@ -76,7 +76,7 @@
f[ ." Let's try some spurious [else] action, whaddya say?" ]f
: [else] ." Don't do it" ; [message] Fake [else] got through
create [else] [message] Fake [else] got through
- h# defeca8e constant [else] [message] Fake [else] got through
+ h# DeFeCA8e constant [else] [message] Fake [else] got through
h# -41100132 value [else] [message] Fake [else] got through
d# 64 buffer: [else] [message] Fake [else] got through
struct
Modified: fcode-utils/testsuite/TokCondl/TestArgs
===================================================================
--- fcode-utils/testsuite/TokCondl/TestArgs 2006-10-30 13:26:11 UTC (rev 106)
+++ fcode-utils/testsuite/TokCondl/TestArgs 2006-10-30 16:25:35 UTC (rev 107)
@@ -10,7 +10,7 @@
# Lines that have no label, no switches, and no script
# do not need any commas.
-# Updated Thu, 27 Jul 2006 at 15:20 PDT by David L. Paktor
+# Updated Fri, 13 Oct 2006 at 16:19 PDT by David L. Paktor
TokExstCondTstY , , -l
TokExstCondTstN , , -l
Modified: fcode-utils/testsuite/TokMisc/AllBiFCTypes.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/AllBiFCTypes.fth 2006-10-30 13:26:11 UTC (rev 106)
+++ fcode-utils/testsuite/TokMisc/AllBiFCTypes.fth 2006-10-30 16:25:35 UTC (rev 107)
@@ -1,7 +1,7 @@
\ Test all the known Built-In FCode tokens
\ that have specific definition Types
-\ Updated Wed, 16 Aug 2006 at 14:30 PDT by David L. Paktor
+\ Updated Tue, 10 Oct 2006 at 11:00 PDT by David L. Paktor
\ Applying "TO" to them ought to generate errors
\ except for the ones that legitimately take "TO",
@@ -9,7 +9,6 @@
fcode-version2
-
[message] Constants. Should generate errors
d# 10 to -1 ( CONST )
d# 10 to -1 ( CONST )
@@ -61,4 +60,12 @@
h# 12 to span ( VRBLE )
h# 12 to state ( VRBLE )
+multi-line #message" Using ['] on words that are both FWords and FCodes "\
+ should generate no errors"
+['] new-device drop
+['] finish-device drop
+['] offset16 drop
+['] instance drop
+['] end0 drop
+
fcode-end
Added: fcode-utils/testsuite/TokMisc/ContErr0.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/ContErr0.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/ContErr0.fth 2006-10-30 16:25:35 UTC (rev 107)
@@ -0,0 +1,73 @@
+\ Test Erroneous Control Constructs, cunningly contrived
+\ to pass the "Old" tokenizer, which doesn't have the
+\ check for Control-Structure matching.
+
+\ Updated Thu, 29 Jun 2006 at 14:52 PDT by David L. Paktor
+
+
+fcode-version2
+
+headers
+
+: garfield
+ ." if" if
+ ." begin" begin
+ \ \ Leave this out because Old tokenizer duzzent dew it rite....
+ \ ." Question-Leave?" ?leave
+ ." 0 if unloop exit then" 0 if unloop exit then
+ ." Would you be leave..." leave
+ ." loop?" loop
+ ." Done with garfield"
+;
+
+: odie
+ ." 0 0 ?do" 0 0 ?do
+ ." i drop" i drop
+ ." zero if unloop exit then" 0 if unloop exit then
+ ." Who would be leave..." leave
+ ." again" again
+ ." then" then
+ ." Done with odie"
+;
+
+." Outside of colon"
+." 1 0 do" 1 0 do
+ i constant what? ." This is actually supposed to be legit..."
+." again" again
+." then" then
+." Was that awful or what?"
+
+\ Snippet similar to something in Firmworks manual
+
+h# 5000 constant /DHCP-SCRATCH
+
+/DHCP-SCRATCH ( size ) ['] alloc-mem
+." dhcp-scratch alloc-mem" cr .s cr
+catch
+." catch dhcp-scratch alloc-mem" cr .s cr
+?dup if
+ ." alloc-mem Failed!!!" cr .s cr
+ throw
+ ." This is also worng..." exit
+else
+ ." alloc-mem okay." .s cr
+ ( vaddr )
+ ( vaddr ) constant DHCP-SCRATCH
+then
+
+\ A CASE statement where the ENDOFs are missing
+\ still passes the "Old" tokenizer.
+
+: crazy-aces ( n -- )
+ case
+ 0 of ." And a-nutt'n'"
+ 1 of ." And a-won"
+ 2 of ." And a-too"
+ 3 of ." And a-tree"
+ 4 of ." and afford"
+ 5 of ." Dat's enuff"
+ ( default ) ." It's not my default!"
+ endcase ." Just in case you end up here..."
+;
+
+fcode-end
Modified: fcode-utils/testsuite/TokMisc/ContErr3.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/ContErr3.fth 2006-10-30 13:26:11 UTC (rev 106)
+++ fcode-utils/testsuite/TokMisc/ContErr3.fth 2006-10-30 16:25:35 UTC (rev 107)
@@ -132,8 +132,8 @@
then
loop
-#message" Same line as a loop" ." ...Same line as a loop"
-
+#message"
+ Same line as a loop" ." ...Same line as a loop"
4 0 do i test_something if to targ : runny_stuff begin
1 0 do targ u. #message" Error here, too..." j
#message" But not here either" 1 0 do j . loop
Added: fcode-utils/testsuite/TokMisc/DtkVSFcTst.scr
===================================================================
--- fcode-utils/testsuite/TokMisc/DtkVSFcTst.scr (rev 0)
+++ fcode-utils/testsuite/TokMisc/DtkVSFcTst.scr 2006-10-30 16:25:35 UTC (rev 107)
@@ -0,0 +1,41 @@
+#! /bin/csh -f
+#
+# Script to run detokenizer with Vendor-Specific FCodes.
+# This worked just fine on the TestArgs command line, in the "script" field
+# on CygWin and GNU_Linux, but gets jammed-up on AI
+# So we have to pump it into a separate script. Fooey!
+#
+# Well, in for a penny and all that...X
+# Let's make it a bit more general.
+# First param is the base-name of both the input .fc file
+# and the output .DeTok file
+# Second param is the name of the Vendor-Specific FCodes file
+
+# If it's already a script, might as well error-check
+alias onecr 'echo "" ; alias onecr true'
+if ( $#argv < 1 ) then
+ onecr
+ echo $0 Missing First arg, Base-name of input .fc and output .DeTok files
+ set ERROR
+endif
+if ( $#argv < 2 ) then
+ onecr
+ echo $0 Missing Second arg, Name of the Vendor-Specific FCodes file
+ set ERROR
+endif
+if ( $?ERROR ) exit 1
+
+if ( ! -r $1.fc ) then
+ onecr
+ echo $0 Cannot read input file $1.fc
+ set ERROR
+endif
+if ( ! -r $2 ) then
+ onecr
+ echo $0 Cannot read Vendor-Specific FCodes file $2
+ set ERROR
+endif
+if ( $?ERROR ) exit 2
+
+
+../detok -v -o -f $2 $1.fc > $1.DeTok
Property changes on: fcode-utils/testsuite/TokMisc/DtkVSFcTst.scr
___________________________________________________________________
Name: svn:executable
+ *
Modified: fcode-utils/testsuite/TokMisc/MiscFeatures.DOS.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/MiscFeatures.DOS.fth 2006-10-30 13:26:11 UTC (rev 106)
+++ fcode-utils/testsuite/TokMisc/MiscFeatures.DOS.fth 2006-10-30 16:25:35 UTC (rev 107)
@@ -1,7 +1,6 @@
\ Obvious pun intended...
-\ Updated Tue, 31 May 2005 at 12:07 by David L. Paktor
+\ Updated Tue, 17 Oct 2006 at 12:57 PDT by David L. Paktor
-
alias // \
fcode-version2
@@ -12,21 +11,41 @@
char G emit
control G emit
control [ emit
+global-definitions
+\ Each dev-node will create its own debug-flag and alias it to debug-me?
+\ Each dev-node will create a macro called my-dev-name giving its device-name
+ [macro] .fname&dev [function-name] type ." in " my-dev-name type
+ [macro] name-my-dev my-dev-name device-name
+ [macro] .dbg-enter debug-me? @ if ." Entering " .fname&dev cr then
+ [macro] .dbg-leave debug-me? @ if ." Leaving " .fname&dev cr then
+device-definitions
+
+\ Top-most device, named billy
+[macro] my-dev-name " billy"
+name-my-dev
+
+variable debug-bell? debug-bell? off alias debug-me? debug-bell?
: bell
+ .dbg-enter
[char] G dup
control G 3drop
+ .dbg-leave
;
: factl recursive ( n -- n! )
+ ." Entering First vers. of " [function-name] type cr
?dup 0= if 1
- else dup 1- * factl
+ else dup 1- factl *
then
+ ." Leaving First vers. of " [function-name] type cr
;
: factl ( n -- n! )
+ ." Entering Second vers. of " [function-name] type cr
?dup 0= if 1 factl
else dup 1- recurse *
then
+ ." Leaving Second vers. of " [function-name] type cr
;
variable naught
@@ -41,31 +60,88 @@
constant /four
: peril
+ .dbg-enter
['] noop is do-nothing
100 is thirty
5 is naught
thirty dup - abort" Never Happen"
+ .dbg-leave
;
: thirty ( new-val -- )
+ .dbg-enter
dup to thirty
alias .dec .d \ Should this be allowed?
." Dirty" .dec
+ .dbg-leave
;
tokenizer[
alias fliteral1 fliteral // This should be a harmless remark.
h# deadc0de ]tokenizer fliteral1
+\ First subsidiary device, "child" of billy
+new-device
+ instance variable cheryl
+ [macro] my-dev-name " cheryl"
+ name-my-dev
+
+ instance
+ \ Third-level device, "grandchild" of billy
+ new-device
+ [macro] my-dev-name " meryl"
+ name-my-dev
+
+ variable beryl
+
+ variable debug-meryl? debug-meryl? off
+ alias debug-me? debug-meryl?
+ : meryl
+ .dbg-enter
+ cheryl
+ alias .deck .dec
+ alias feral cheryl
+ alias .heck .h
+ .dbg-leave
+ ;
+ finish-device
+
+ \ Now we're back to "cheryl"
+
+ variable debug-cheryl? debug-cheryl? off
+ alias debug-me? debug-cheryl?
+ : queryl
+ .dbg-enter
+ over rot dup nip drop swap \ Not the most useful code... ;-}
+ .dbg-leave
+ ;
+finish-device
+
+\ Some interpretation-time after the fact markers...
+alias colon :
+overload [macro] : ." Cleared " [input-file-name] type ." line " [line-number] .d cr colon
+
+alias semicolon ;
+overload [macro] ; semicolon ." Finished defining " [function-name] type cr
+
+\ And we're back to billy.
: droop ( -- )
+ .dbg-enter \ This will display Entering droop in billy
twenty
tokenizer[
alias .x .h \ Should this generate a warning?
+ [function-name]
]tokenizer
0 ?do i .x loop
-;
+ .dbg-leave
+; f[ [function-name] ]f
+headerless
: ploop ( -- )
+ .dbg-enter
fifty 0 do i drop 2 +loop
+ .dbg-leave
;
+overload alias : colon
+overload alias ; semicolon
fcode-end
Modified: fcode-utils/testsuite/TokMisc/MiscFeatures.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/MiscFeatures.fth 2006-10-30 13:26:11 UTC (rev 106)
+++ fcode-utils/testsuite/TokMisc/MiscFeatures.fth 2006-10-30 16:25:35 UTC (rev 107)
@@ -1,5 +1,5 @@
\ Obvious pun intended...
-\ Updated Fri, 10 Feb 2006 at 15:53 PST by David L. Paktor
+\ Updated Tue, 17 Oct 2006 at 12:57 PDT by David L. Paktor
alias // \
fcode-version2
@@ -116,22 +116,32 @@
;
finish-device
+\ Some interpretation-time after the fact markers...
+alias colon :
+overload [macro] : ." Cleared " [input-file-name] type ." line " [line-number] .d cr colon
+
+alias semicolon ;
+overload [macro] ; semicolon ." Finished defining " [function-name] type cr
+
\ And we're back to billy.
: droop ( -- )
.dbg-enter \ This will display Entering droop in billy
twenty
tokenizer[
alias .x .h \ Should this generate a warning?
+ [function-name]
]tokenizer
0 ?do i .x loop
.dbg-leave
-;
+; f[ [function-name] ]f
headerless
: ploop ( -- )
.dbg-enter
fifty 0 do i drop 2 +loop
.dbg-leave
;
+overload alias : colon
+overload alias ; semicolon
fcode-end
Modified: fcode-utils/testsuite/TokMisc/StringsGenl.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/StringsGenl.fth 2006-10-30 13:26:11 UTC (rev 106)
+++ fcode-utils/testsuite/TokMisc/StringsGenl.fth 2006-10-30 16:25:35 UTC (rev 107)
@@ -1,6 +1,6 @@
\ Test of various formats of strings
-\ Updated Mon, 06 Mar 2006 at 17:39 PST by David L. Paktor
+\ Updated Tue, 10 Oct 2006 at 11:46 PDT by David L. Paktor
fcode-version2
@@ -9,13 +9,14 @@
."
Empty string next."
." "
-." BSlashes: \t\1fea9\abdc\n\1f\\fece"
+." BSlashes#1: \t\1fea9\abdc\n\1f\\fece"
decimal
-." BSlashes: \t\a7\c01a"
+." BSlashes#2: \t\a7\c01a"
+." Dec 1193176 = 0x1234D8 Dec 176 = 0xB0 \1193176\"
hex
-." BSlashes: \n\a7\c01a"
-." BSlashes: \t\a7\\c0\\1a"
-." BSlashes: \t\a7\\c0\\1a"( feedface)"
+." BSlashes#3: \n\a7\c01a"
+." BSlashes#4: \t\a7\\c0\\1a"
+." BSlashes#5: \t\a7\\c0\\1a"( feedface)"
." 3 BSlashes, then QOpen. \t\Q\n"(090abcdefeca8e beeffece b020)Zoh. "(1 23 4 567 8 9 0 1 2 3 0 a b c 30)"
.( Dot-Paren-NoSpace)cr cr
.( Dot-Paren Space) cr cr
Modified: fcode-utils/testsuite/TokMisc/TestArgs
===================================================================
--- fcode-utils/testsuite/TokMisc/TestArgs 2006-10-30 13:26:11 UTC (rev 106)
+++ fcode-utils/testsuite/TokMisc/TestArgs 2006-10-30 16:25:35 UTC (rev 107)
@@ -7,8 +7,9 @@
# A script-command with arguments (but no commas).
# Lines that have no label, no switches, and no script
# do not need any commas.
+# A leading +V in the script-command field will suppress -v
-# Updated Thu, 07 Sep 2006 at 11:49 PDT by David L. Paktor
+# Updated Mon, 16 Oct 2006 at 17:22 PDT by David L. Paktor
MiscFeatures , , -i
MiscFeatures , applabq , -i -f NOSUN-ABORT-Quote
@@ -23,15 +24,15 @@
StringsGenl , noqbsrmk , -f NOSTRING-REMARK-ESCAPE
BasicCont
ExtCont
-OldTkzr/ContErr0 , , -i
+ContErr0 , , -i
ContErr1 , , -i
ContErr2 , , -i
ContErr3 , , -i
MulDev , , -i
MulDev_01 , , -i
MulDev_02 , , -i -T jeeky -T kinky
+MulDev_02 , NoV , -T jeeky -T kinky , +V
MinPCIHtst
-OldTkzr/SimplStrEscs
StrEscs
StrEscs_01
FlagSet , , -i
@@ -72,3 +73,7 @@
BatchTst , Help , -I. -I../TokeCommon -l -h , rm *_cpy*
CaseTkns
+
+# Vendor-Specific FCodes, just a little...
+VSFCtest
+VSFCtest , VSfc , , DtkVSFcTst.scr VSFCtest.VSfc VendSpecFCodes
Added: fcode-utils/testsuite/TokMisc/VSFCtest.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/VSFCtest.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/VSFCtest.fth 2006-10-30 16:25:35 UTC (rev 107)
@@ -0,0 +1,62 @@
+\ Generate something that looks like FCode generated by a Very Custom Tokenizer
+
+
+fcode-version1
+
+headers
+hex
+
+F[
+ \ If we want to test this against the previous release,
+ \ we can't do this: 341 emit-fcode
+ \ Instead, we have to do it in two parts:
+
+ 03 emit-byte 41 emit-byte \ 0341 = "Simple" Vendor-specific FCode"
+ ]F
+-1
+dup 0> if
+F[
+ \ Likewise here 369 emit-fcode
+ 03 emit-byte 69 emit-byte \ 0369 = "double(lit)"
+ ff emit-byte
+ ff emit-byte
+ ff emit-byte
+ ff emit-byte
+ 00 emit-byte
+ 00 emit-byte
+ 00 emit-byte
+ 00 emit-byte
+ ]F
+then
+dup 0= if
+F[
+ \ Here, too 369 emit-fcode
+ 03 emit-byte 69 emit-byte \ 0369 = "double(lit)"
+ ff emit-byte
+ ff emit-byte
+ ff emit-byte
+ f0 emit-byte
+ 00 emit-byte
+ 00 emit-byte
+ 00 emit-byte
+ 00 emit-byte
+ ]F
+then
+
+0< if
+F[
+ \ Last one 369 emit-fcode
+ 03 emit-byte 69 emit-byte \ 0369 = "double(lit)"
+ de emit-byte
+ fe emit-byte
+ ca emit-byte
+ 8e emit-byte
+ be emit-byte
+ ef emit-byte
+ fe emit-byte
+ ce emit-byte
+ ]F
+then
+constant moochie
+
+fcode-end
Added: fcode-utils/testsuite/TokMisc/VendSpecFCodes
===================================================================
--- fcode-utils/testsuite/TokMisc/VendSpecFCodes (rev 0)
+++ fcode-utils/testsuite/TokMisc/VendSpecFCodes 2006-10-30 16:25:35 UTC (rev 107)
@@ -0,0 +1,4 @@
+# Sample of Vendor-Specific FCodes for test
+
+ 0x341 Three-for-One,aBargain!
+ 0x369 double(lit) Special-Function pre-defined name
Added: fcode-utils/testsuite/TokeErrs/DecodProp.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/DecodProp.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/DecodProp.fth 2006-10-30 16:25:35 UTC (rev 107)
@@ -0,0 +1,26 @@
+\ Updated Tue, 17 Oct 2006 at 15:32 PDT by David L. Paktor
+
+
+fcode-version2
+
+\ The classic definition, using the return-stack
+[macro] decade-bites >r over r@ + swap r@ - rot r>
+
+" grubby-nit-picker" device-name
+" bloated lackey of the capitalist toy-mongers"
+ encode-bytes " santa-claus" property
+
+" name" get-my-property if ." Sorry, Charlie!"
+else
+ 6 decade-bites ." Starts with: " type
+ 2drop
+then cr
+
+
+" santa-claus" get-my-property if ." Eat flaming death!"
+else
+ 7 decode-bytes ." Starts with: " type
+ 2drop
+then cr
+
+fcode-end
Modified: fcode-utils/testsuite/TokeErrs/DevImbal.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/DevImbal.fth 2006-10-30 13:26:11 UTC (rev 106)
+++ fcode-utils/testsuite/TokeErrs/DevImbal.fth 2006-10-30 16:25:35 UTC (rev 107)
@@ -22,7 +22,12 @@
new-device
create eek! 18 c, 17 c, 80 c, 79 c,
: freek eek! 4 bounds ?do i c@ . 1 +loop ;
-: greek -1 if freek then ;
+: greek
+ recursive -1 if ." By name" greek
+ ." other name" freek
+ else ." Re-Curse you!" recurse
+ then
+;
[message] About to access method from parent node
: hierareek
eek!
Modified: fcode-utils/testsuite/TokeErrs/DupNams.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/DupNams.fth 2006-10-30 13:26:11 UTC (rev 106)
+++ fcode-utils/testsuite/TokeErrs/DupNams.fth 2006-10-30 16:25:35 UTC (rev 107)
@@ -1,10 +1,39 @@
\ Let's make a batch of duplicate definitions in various scopes...
-\ Updated Fri, 02 Jun 2006 at 09:48 PDT by David L. Paktor
+\ Updated Thu, 12 Oct 2006 at 13:17 PDT by David L. Paktor
+\ Tracing: alley-oop boop croop doop drop dup foop
+\ gloop _harpo hoop koop loop noop poop
+\ shtoop zoop
+\ fontbytes blink-screen base bell
+
+\ alley-oop
+\ boop
+\ croop Global Macro
+\ doop
+\ drop Built-in word, aliased, invoked
+\ dup Built-in word
+\ foop Global alias to dup
+\ floop Global Macro, Alias to flop (alias to drop),
+\ redefined in subordinate device
+\ gloop Undefined, invoked
+\ _harpo Local, in subordinate device
+\ hoop
+\ koop
+\ loop Built-in word
+\ noop Built-in word, redefined in second FCode block
+\ poop
+\ shtoop
+\ zoop
+\ fontbytes Built-in VALUE
+\ blink-screen Built-in DEFER
+\ base Built-in VARIABLE
+\ bell Built-in CONSTANT
+
+
alias foop dup
-[macro] croop foop message" Using FOOP "
+[macro] croop foop #message" Using FOOP "
alias dup croop
@@ -22,7 +51,8 @@
global-definitions
alias flop drop
-[macro] floop flop message" Using FLOOP "
+#message" Sync Up Diffs w/ prev. Release."n"n"
+[macro] floop flop #message" Using FLOOP "
alias drop floop
device-definitions
@@ -32,13 +62,15 @@
fcode-version2
: noop ." Op? No!" ;
-[macro] zoop noop message" I Care."
+[macro] zoop noop #message" I Care."
: poop h# -21013572 ;
new-device
: zoop ." Nothing like the other zoop" croop ;
: croop ." Sort of like F-Troop with a higher GPA..."
foop
+ drop
+ floop
;
: foop ." Shop bop-a-looma, a-lop bam boom!" ;
: floop ." Oh, Jiggly!" ;
@@ -46,6 +78,7 @@
f[ 127 constant _harpo ]f
poop -> _cheeko
f[ _cheeko constant a__gent ]f
+ floop
;
alias droop drop
@@ -59,6 +92,8 @@
_harpo
droop
drupe
+ boop
+ floop
;
alias shoop encode-int
@@ -73,6 +108,18 @@
finish-device
+ : stoop
+ floop
+ gloop
+ shoop
+ ;
+ alias coop floop
+ : troop
+ shoop
+ coop
+ poop
+ ;
+
finish-device
start4 \ Let's just stick in an extra, and another error besides...
fcode-end
Modified: fcode-utils/testsuite/TokeErrs/MiscFeatErrs.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/MiscFeatErrs.fth 2006-10-30 13:26:11 UTC (rev 106)
+++ fcode-utils/testsuite/TokeErrs/MiscFeatErrs.fth 2006-10-30 16:25:35 UTC (rev 107)
@@ -1,11 +1,17 @@
\ Obvious pun intended...
-\ Updated Fri, 14 Jul 2006 at 12:50 PDT by David L. Paktor
+\ Updated Mon, 09 Oct 2006 at 09:57 PDT by David L. Paktor
[flag] Local-Values
f[ ." This is a test" ]f
fcode-version1
-fload LocalValuesSupport.fth
+global-definitions
+ headers
+ h# 130 constant _local-storage-size_
+ headerless
+device-definitions
+
+fload TotalLocalValuesSupport.fth
noop noop noop
headers
@@ -59,10 +65,16 @@
_a _b + i * dup -> d
_c * to _e
j . loop
+ ['] _a
+ f['] _e
+ f[ f['] _b
+ f['] dup emit-fcode
+ h# 0f emit-fcode ]f
+ _a _b + _c * [']
+ factl catch if ." Run in circles, scream and shout!" then
;
-
: DMA-ALLOC ( n -- vaddr ) " dma-alloc" $call-parent ;
: HOOBARTH ( n -- vaddr ) " hoobarth" $call-parent ;
: MY-END0 ( -- n ) ['] end0 ;
Modified: fcode-utils/testsuite/TokeErrs/TestArgs
===================================================================
--- fcode-utils/testsuite/TokeErrs/TestArgs 2006-10-30 13:26:11 UTC (rev 106)
+++ fcode-utils/testsuite/TokeErrs/TestArgs 2006-10-30 16:25:35 UTC (rev 107)
@@ -13,21 +13,26 @@
# Most files in this category need the -i switch
# Some may have additional variants.
-# Updated Thu, 07 Sep 2006 at 11:49 PDT by David L. Paktor
+# Updated Wed, 18 Oct 2006 at 11:44 PDT by David L. Paktor
MiscFeatErrs , , -i -I. -I..
-LocalTest , NoLvSupp , -i -f Local-Values -I. -I..
-LocalTest , , -i -f Local-Values -I. -I.. -f Always-Headers -d dont_omit_support
-LocalTest1 , , -f Local-Values -f noLV-Legacy-Message -I. -I..
+MiscFeatErrs , GLoc , -i -I. -I.. -d Global-Locals
+MiscFeatErrs , LocR , -i -I. -I.. -d Locals-Release
+MiscFeatErrs , GlLr , -i -I. -I.. -d Global-Locals -d Locals-Release
+MiscFeatErrs , Lss , -i -I. -I.. -d _local-storage-size_=3022
+MiscFeatErrs , NoLss , -i -I. -I.. -d _local-storage-size_
+LocalTest , NoLvSupp , -i -f Local-Values -I. -I../TokoLoco
+LocalTest , , -i -f Local-Values -I. -I../TokoLoco -f Always-Headers -d dont_omit_support
+LocalTest1 , , -f Local-Values -f noLV-Legacy-Message -I. -I../TokoLoco
ControlMismatch , , -i
-SuppLocErrTest4 , , -i -f Local-Values -l -I. -I..
-testLocDevSupG , , -i -f Local-Values -I. -I..
-testLocDevSupG , SymSiz , -i -f Local-Values -d "_local-storage-size_= d# 120" -I. -I..
+SuppLocErrTest4 , , -i -f Local-Values -l -I. -I../TokoLoco
+testLocDevSupG , , -i -f Local-Values -I. -I../TokoLoco
+testLocDevSupG , SymSiz , -i -f Local-Values -d "_local-storage-size_= d# 120" -I. -I../TokoLoco
PCIhdrErrs , , -i
FCShdrErrs , , -i
PCI_FCShdrErrs , , -i
CommOvrRun , , -i -l
-LocOvrRun , , -i -f Local-Values -l -I. -I..
+LocOvrRun , , -i -f Local-Values -l -I. -I../TokoLoco
SplitImbal , , -i -l
TokCondUnconcF , , -i -l
TokCondUnconcT , , -i -l
@@ -46,13 +51,13 @@
UserMacroErrors , , -i
CStrEscOvflw , , -i -l
DevImbal , , -i
-DevNodAli , , -i -l -I. -I..
-DevNodAli_01 , , -i -l -I. -I..
-GlobScopErrTst , NoI , -f Local-Values -I. -I..
-GlobScopErrTst , , -i -f Local-Values -I. -I..
-GlobScopErrTst_01 , , -i -f Local-Values -I. -I..
-GlobScopErrTst_02 , , -i -f Local-Values -I. -I..
-GlobScopErrTst_03 , , -i -f Local-Values -I. -I..
+DevNodAli , , -i -l -I. -I../TokoLoco
+DevNodAli_01 , , -i -l -I. -I../TokoLoco
+GlobScopErrTst , NoI , -f Local-Values -I. -I../TokoLoco
+GlobScopErrTst , , -i -f Local-Values -I. -I../TokoLoco
+GlobScopErrTst_01 , , -i -f Local-Values -I. -I../TokoLoco
+GlobScopErrTst_02 , , -i -f Local-Values -I. -I../TokoLoco
+GlobScopErrTst_03 , , -i -f Local-Values -I. -I../TokoLoco
# The script-fields below prepare for the ExpPath InclLst and DePList tests
Frinstnce , , -i , touch ExpPath.NoV.{P,f{c,l{,.missing}}}
Frinstnce , NoI , , chmod a-rw ../TokeCommon/{MyBeerAndYouCannotHaveIt.fth,NoRead.bin} ExpPath.NoV.{P,f{c,l{,.missing}}}
@@ -69,7 +74,7 @@
# Done with the ExpPath and InclLst tests
ToAtEnd , , -i
-ToAtEnd , WLocSup , -i -I . -I ..
+ToAtEnd , WLocSup , -i -I . -I ../TokoLoco
ObsoFCodes , , -i
ObsoFCodes , NoWarn , -f NoObsolete-FCode-Warning
@@ -84,7 +89,7 @@
AbrtWQuotStr , , -i
# The new "Trace" feature, and handling of duplicate and mis-scoped names...
-DupNams , , -f Local-Values -T croop -T drop -T _harpo -T dup -T noop -T zoop -T foop
+DupNams , , -f Local-Values -T alley-oop -T boop -T croop -T doop -T drop -T dup -T foop -T floop -T gloop -T _harpo -T koop -T loop -T noop -T poop -T shtoop -T zoop -T fontbytes -T blink-screen -T base -T bell
TooManyFCodes , , -l -o TooManyFCodes.fl
TooManyFCodes , Reg , -i
@@ -98,3 +103,6 @@
RetStkDep , , -i
CondlDefn , , -i
+
+DecodProp
+DecodProp , nrsi , -f noRet-Stk-Interp
Modified: fcode-utils/testsuite/TokoLoco/GlobalLocalValues.fth
===================================================================
--- fcode-utils/testsuite/TokoLoco/GlobalLocalValues.fth 2006-10-30 13:26:11 UTC (rev 106)
+++ fcode-utils/testsuite/TokoLoco/GlobalLocalValues.fth 2006-10-30 16:25:35 UTC (rev 107)
@@ -1,7 +1,13 @@
+\ %Z%%M% %I% %W% %G% %U%
+\ (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+\ Licensed under the Common Public License (CPL) version 1.0
+\ for full details see:
+\ http://www.opensource.org/licenses/cpl1.0.php
+\
+\ Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+
\ Load Locals Support under Global-Definitions. Bypass Instance warning
-\ Updated Fri, 10 Mar 2006 at 14:47 PST by David L. Paktor
-
\ Make sure this option is turned on.
[flag] Local-Values
Added: fcode-utils/testsuite/TokoLoco/GlobalLocalValuesDevel.fth
===================================================================
--- fcode-utils/testsuite/TokoLoco/GlobalLocalValuesDevel.fth (rev 0)
+++ fcode-utils/testsuite/TokoLoco/GlobalLocalValuesDevel.fth 2006-10-30 16:25:35 UTC (rev 107)
@@ -0,0 +1,31 @@
+\ %Z%%M% %I% %W% %G% %U%
+\ (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+\ Licensed under the Common Public License (CPL) version 1.0
+\ for full details see:
+\ http://www.opensource.org/licenses/cpl1.0.php
+\
+\ Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+
+\ Load Support file for development of FCode that uses Local Values
+\ under Global-Definitions. Bypass Instance warning.
+\ Replace this with GlobalLocalValues.fth in your final product.
+
+\ Make sure this option is turned on.
+[flag] Local-Values
+
+global-definitions
+
+\ Bypass warning about Instance without altering LocalValuesSupport file
+alias generic-instance instance
+[macro] bypass-instance f[ noop .( Bypassed instance!) f]
+
+overload alias instance bypass-instance
+
+fload LocalValuesSupport.fth
+fload LocalValuesDevelSupport.fth
+
+\ Replace normal meaning of Instance, still in Global scope.
+overload alias instance generic-instance
+
+\ Restore Device-Definitions scope.
+device-definitions
Added: fcode-utils/testsuite/TokoLoco/LocalValuesDevelSupport.fth
===================================================================
--- fcode-utils/testsuite/TokoLoco/LocalValuesDevelSupport.fth (rev 0)
+++ fcode-utils/testsuite/TokoLoco/LocalValuesDevelSupport.fth 2006-10-30 16:25:35 UTC (rev 107)
@@ -0,0 +1,46 @@
+\ %Z%%M% %I% %W% %G% %U%
+\ (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+\ Licensed under the Common Public License (CPL) version 1.0
+\ for full details see:
+\ http://www.opensource.org/licenses/cpl1.0.php
+\
+\ Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+
+\ Support file for development of FCode that uses Local Values
+\ FLoad this right after LocalValuesSupport.fth
+\ Remove it from your final product.
+
+\ Exported Function: max-local-storage-size ( -- n )
+\ Returns the measured maximum size of storage for Local Values
+\ used by any given test run. This number can be used to guide
+\ the declaration of _local-storage-size_
+\
+\ (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+\ Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+
+\ Count the current depth on a per-instance basis,
+\ but collect the maximum depth over all instances.
+
+headers
+0 instance value local-storage-depth
+
+external
+0 value max-local-storage-size
+headers
+
+\ Overload the {push-locals} and {pop-locals} routines to do this.
+\ Do not suppress the overload warnings; they'll serve as a reminder.
+: {pop-locals} ( #locals -- )
+ local-storage-depth over - to local-storage-depth
+ {pop-locals}
+;
+
+: {push-locals} ( #ilocals #ulocals -- )
+ 2dup + local-storage-depth +
+ dup to local-storage-depth
+ max-local-storage-size max
+ to max-local-storage-size
+ {push-locals}
+;
+
+
Added: fcode-utils/testsuite/TokoLoco/LocalValuesSupport.fth
===================================================================
--- fcode-utils/testsuite/TokoLoco/LocalValuesSupport.fth (rev 0)
+++ fcode-utils/testsuite/TokoLoco/LocalValuesSupport.fth 2006-10-30 16:25:35 UTC (rev 107)
@@ -0,0 +1,134 @@
+\ %Z%%M% %I% %W% %G% %U%
+\ (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+\ Licensed under the Common Public License (CPL) version 1.0
+\ for full details see:
+\ http://www.opensource.org/licenses/cpl1.0.php
+\
+\ Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+
+\ The support routines for Local Values in FCode.
+
+\ Function imported
+\ _local-storage-size_ \ Size, in cells, of backing store for locals
+\ \ A constant. If not supplied, default value of d# 64 will be used.
+\
+\ Functions exported:
+\ {push-locals} ( #ilocals #ulocals -- )
+\ {pop-locals} ( #locals -- )
+\ _{local} ( local-var# -- addr )
+\
+\ Additional overloaded function:
+\ catch \ Restore Locals after a throw
+
+\ The user is responsible for declaring the maximum depth of the
+\ run-time Locals stack, in storage units, by defining the
+\ constant _local-storage-size_ before floading this file.
+\ The definition may be created either by defining it as a constant
+\ in the startup-file that FLOADs this and other files in the
+\ source program, or via a command-line user-symbol definition
+\ of a form resembling: -d '_local-storage-size_=d# 42'
+\ (be sure to enclose it within quotes so that the shell treats
+\ it as a single string, and, of course, replace the "42" with
+\ the actual number you need...)
+\ If both forms are present, the command-line user-symbol value will
+\ be used to create a duplicate definition of the named constant,
+\ which will prevail over the earlier definition, and will remain
+\ available for examination during development and testing. The
+\ duplicate-name warning, which will not be suppressed, will also
+\ act to alert the developer of this condition.
+\ To measure the actual usage (in a test run), use the separate tool
+\ found in the file LocalValuesDevelSupport.fth .
+\ If the user omits defining _local-storage-size_ the following
+\ ten-line sequence will supply a default:
+
+[ifdef] _local-storage-size_
+ f[ [defined] _local-storage-size_ true ]f
+[else]
+ [ifexist] _local-storage-size_
+ f[ false ]f
+ [else]
+ f[ d# 64 true ]f
+ [then]
+[then] ( Compile-time: size true | false )
+[if] fliteral constant _local-storage-size_ [then]
+
+_local-storage-size_ \ The number of storage units to allocate
+ cells \ Convert to address units
+ dup \ Keep a copy around...
+ ( n ) instance buffer: locals-storage \ Use one of the copies
+
+\ The Locals Pointer, added to the base address of locals-storage
+\ points to the base-address of the currently active set of Locals.
+\ Locals will be accessed as a positive offset from there.
+\ Start the Locals Pointer at end of the buffer.
+\ A copy of ( N ), the number of address units that were allocated
+\ for the buffer, is still on the stack. Use it here.
+ ( n ) instance value locals-pointer
+
+\ Support for {push-locals}
+
+\ Error-check.
+: not-enough-locals? ( #ilocals #ulocals -- error? )
+ + cells locals-pointer swap - 0<
+;
+
+\ Error message.
+: .not-enough-locals ( -- )
+ cr ." FATAL ERROR: Local Values Usage exceeds allocation." cr
+;
+
+\ Detect, announce and handle error.
+: check-enough-locals ( #ilocals #ulocals -- | <ABORT> )
+ not-enough-locals? if
+ .not-enough-locals
+ abort
+ then
+;
+
+\ The uninitialized locals can be allocated in a single batch
+: push-uninitted-locals ( #ulocals -- )
+ cells locals-pointer swap - to locals-pointer
+;
+
+\ The Initialized locals are initted from the items on top of the stack
+\ at the start of the routine. If we allocate them one at a time,
+\ we get them into the right order. I.e., the last-one named gets
+\ the top item, the earlier ones get successively lower items.
+: push-one-initted-local ( pstack-item -- )
+ locals-pointer 1 cells -
+ dup to locals-pointer
+ locals-storage + !
+;
+
+\ Push all the Initialized locals.
+: push-initted-locals ( N_#ilocals-1 ... N_0 #ilocals -- )
+ 0 ?do push-one-initted-local loop
+;
+
+: {push-locals} ( N_#ilocals ... N_1 #ilocals #ulocals -- )
+ 2dup check-enough-locals
+ push-uninitted-locals ( ..... #i )
+ push-initted-locals ( )
+;
+
+\ Pop all the locals.
+\ The param is the number to pop.
+: {pop-locals} ( total#locals -- )
+ cells locals-pointer + to locals-pointer
+;
+
+\ The address from/to which values will be moved, given the local-var#
+: _{local} ( local-var# -- addr )
+ cells locals-pointer + locals-storage +
+;
+
+\ We need to overload catch such that the state of the Locals Pointer
+\ will be preserved and restored after a throw .
+overload : catch ( ??? xt -- ???' false | ???'' throw-code )
+ locals-pointer >r ( ??? xt ) ( R: old-locals-ptr )
+ catch ( ???' false | ???'' throw-code ) ( R: old-locals-ptr )
+ \ No need to inspect the throw-code.
+ \ If catch returned a zero, the Locals Pointer
+ \ is valid anyway, so restoring it is harmless.
+ r> to locals-pointer
+;
Modified: fcode-utils/testsuite/TokoLoco/TestArgs
===================================================================
--- fcode-utils/testsuite/TokoLoco/TestArgs 2006-10-30 13:26:11 UTC (rev 106)
+++ fcode-utils/testsuite/TokoLoco/TestArgs 2006-10-30 16:25:35 UTC (rev 107)
@@ -12,18 +12,18 @@
# All files in this category need the -f Local-Values switch
# Some will have additional variants.
-# Updated Mon, 20 Mar 2006 at 11:18 PST by David L. Paktor
+# Updated Fri, 13 Oct 2006 at 16:19 PDT by David L. Paktor
-testNest , , -f Local-Values -l -I. -I..
-SupportedLocalTest , , -f LOCAL-Values -l -I. -I..
-SupportedLocalTest3 , , -f Local-VALUES -l -I. -I..
-SupportedLocalTest4 , , -f Local-Values -l -I. -I..
-testDevelSupport , , -f local-values -I. -I..
+testNest , , -f Local-Values -l
+SupportedLocalTest , , -f LOCAL-Values -l
+SupportedLocalTest3 , , -f Local-VALUES -l
+SupportedLocalTest4 , , -f Local-Values -l
+testDevelSupport , , -f local-values
# Additional variants:
-SupportedLocalTest , nodupwrn , -f Local-VALUES -f NOWarn-if-DUPLicate -l -I. -I..
-SupportedLocalTest , nolegacy , -f LoCAL-VALUes -f NoLV-Legacy-Separator -l -I. -I..
-SupportedLocalTest , nolgcmsg , -f Local-ValUES -f NOLV-LEGAcy-Message -l -I. -I..
-SupportedLocalTest , nolocals , -i -f noLocal-Values -l -I. -I..
-SupportedLocalTest3 , DefLocStgSiz , -f Local-VALUes -d '_loCAL-STORagE-SIZe_=h# 42' -l -I. -I..
+SupportedLocalTest , nodupwrn , -f Local-VALUES -f NOWarn-if-DUPLicate -l
+SupportedLocalTest , nolegacy , -f LoCAL-VALUes -f NoLV-Legacy-Separator -l
+SupportedLocalTest , nolgcmsg , -f Local-ValUES -f NOLV-LEGAcy-Message -l
+SupportedLocalTest , nolocals , -i -f noLocal-Values -l
+SupportedLocalTest3 , DefLocStgSiz , -f Local-VALUes -d '_loCAL-STORagE-SIZe_=h# 42' -l
Added: fcode-utils/testsuite/TokoLoco/TotalLocalValuesSupport.fth
===================================================================
--- fcode-utils/testsuite/TokoLoco/TotalLocalValuesSupport.fth (rev 0)
+++ fcode-utils/testsuite/TokoLoco/TotalLocalValuesSupport.fth 2006-10-30 16:25:35 UTC (rev 107)
@@ -0,0 +1,52 @@
+\ %Z%%M% %I% %W% %G% %U%
+\ (C) Copyright 2005-2006 IBM Corporation. All Rights Reserved.
+\ Licensed under the Common Public License (CPL) version 1.0
+\ for full details see:
+\ http://www.opensource.org/licenses/cpl1.0.php
+\
+\ Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+
+\ Control file for loading of Local Values Support file with variants.
+\ Command-line Symbol-definitions select whether the support will
+\ be under Global-Definitions, and whether to include the extra
+\ Development-time support features.
+\
+\ The command-line symbols are:
+\ Global-Locals
+\ and
+\ Locals-Release
+\
+\ The default is device-node-specific support in a Development-time setting.
+\
+\ If Global-Locals is defined, support will be under Global-Definitions
+\ If Locals-Release is defined, this is a final production release run,
+\ and the Development-time support features will be removed.
+
+\ Make sure this option is turned on.
+[flag] Local-Values
+
+[ifdef] Global-Locals
+ \ Load Support file under Global-Definitions.
+ global-definitions
+
+ \ Bypass warning about Instance without altering LocalValuesSupport file
+ alias generic-instance instance
+ [macro] bypass-instance f[ noop .( Bypassed instance!) f]
+
+ overload alias instance bypass-instance
+[endif] \ Global-Locals
+
+fload LocalValuesSupport.fth
+
+[ifndef] Locals-Release
+ \ Load Development-time support features
+ fload LocalValuesDevelSupport.fth
+[endif] \ not Locals-Release
+
+[ifdef] Global-Locals
+ \ Replace normal meaning of Instance, still in Global scope.
+ overload alias instance generic-instance
+
+ \ Restore Device-Definitions scope.
+ device-definitions
+[endif] \ Global-Locals
1
0
Author: stepan
Date: 2006-10-30 14:26:11 +0100 (Mon, 30 Oct 2006)
New Revision: 106
Modified:
fcode-utils/testsuite/GlobalLocalValues.fth
fcode-utils/testsuite/GlobalLocalValuesDevel.fth
fcode-utils/testsuite/LocalValuesDevelSupport.fth
fcode-utils/testsuite/LocalValuesSupport.fth
fcode-utils/testsuite/TotalLocalValuesSupport.fth
Log:
fix links to use our own copy.
Modified: fcode-utils/testsuite/GlobalLocalValues.fth
===================================================================
--- fcode-utils/testsuite/GlobalLocalValues.fth 2006-10-30 11:59:18 UTC (rev 105)
+++ fcode-utils/testsuite/GlobalLocalValues.fth 2006-10-30 13:26:11 UTC (rev 106)
@@ -1 +1 @@
-link ../../LocalValues/GlobalLocalValues.fth
\ No newline at end of file
+link ../localvalues/GlobalLocalValues.fth
\ No newline at end of file
Modified: fcode-utils/testsuite/GlobalLocalValuesDevel.fth
===================================================================
--- fcode-utils/testsuite/GlobalLocalValuesDevel.fth 2006-10-30 11:59:18 UTC (rev 105)
+++ fcode-utils/testsuite/GlobalLocalValuesDevel.fth 2006-10-30 13:26:11 UTC (rev 106)
@@ -1 +1 @@
-link ../../LocalValues/GlobalLocalValuesDevel.fth
\ No newline at end of file
+link ../localvalues/GlobalLocalValuesDevel.fth
\ No newline at end of file
Modified: fcode-utils/testsuite/LocalValuesDevelSupport.fth
===================================================================
--- fcode-utils/testsuite/LocalValuesDevelSupport.fth 2006-10-30 11:59:18 UTC (rev 105)
+++ fcode-utils/testsuite/LocalValuesDevelSupport.fth 2006-10-30 13:26:11 UTC (rev 106)
@@ -1 +1 @@
-link ../../LocalValues/LocalValuesDevelSupport.fth
\ No newline at end of file
+link ../localvalues/LocalValuesDevelSupport.fth
\ No newline at end of file
Modified: fcode-utils/testsuite/LocalValuesSupport.fth
===================================================================
--- fcode-utils/testsuite/LocalValuesSupport.fth 2006-10-30 11:59:18 UTC (rev 105)
+++ fcode-utils/testsuite/LocalValuesSupport.fth 2006-10-30 13:26:11 UTC (rev 106)
@@ -1 +1 @@
-link ../../LocalValues/LocalValuesSupport.fth
\ No newline at end of file
+link ../localvalues/LocalValuesSupport.fth
\ No newline at end of file
Modified: fcode-utils/testsuite/TotalLocalValuesSupport.fth
===================================================================
--- fcode-utils/testsuite/TotalLocalValuesSupport.fth 2006-10-30 11:59:18 UTC (rev 105)
+++ fcode-utils/testsuite/TotalLocalValuesSupport.fth 2006-10-30 13:26:11 UTC (rev 106)
@@ -1 +1 @@
-link ../../LocalValues/TotalLocalValuesSupport.fth
\ No newline at end of file
+link ../localvalues/TotalLocalValuesSupport.fth
\ No newline at end of file
1
0
Author: stepan
Date: 2006-10-30 12:59:18 +0100 (Mon, 30 Oct 2006)
New Revision: 105
Modified:
fcode-utils/detok/addfcodes.c
fcode-utils/detok/dictionary.c
Log:
detok 1.0.2 merge part 3
Modified: fcode-utils/detok/addfcodes.c
===================================================================
--- fcode-utils/detok/addfcodes.c 2006-10-30 11:31:16 UTC (rev 104)
+++ fcode-utils/detok/addfcodes.c 2006-10-30 11:59:18 UTC (rev 105)
@@ -46,6 +46,10 @@
* Identified this need when working with in-house code,
* which uses some custom functions. This solution
* is (hoped to be) general enough to cover all cases.
+ * Mon, 16 Oct 2006 by David L. Paktor
+ * Add "special function" words. So far, only one added:
+ * double-literal Infrastructure will support
+ * adding others as needed.
*
**************************************************************************** */
@@ -58,6 +62,21 @@
*
**************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Global Variables Exported :
+ *
+ * For "special function" identification, we will need to
+ * export Global Variables, each of which is a pointer
+ * to the address of the FCode field of the entry in
+ * the Special Functions List for that function.
+ *
+ * Variable Associated Name
+ * double_lit_code double-literal
+ *
+ **************************************************************************** */
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -73,6 +92,8 @@
* vfc_remainder Remainder of Vendor-FCodes buffer to be scanned
* vfc_line_no Number of current line in Vendor-FCodes buffer
* vfc_buf_end Pointer to end of Vendor-FCodes buffer
+ * spcl_func_list List of reserved Special Function names
+ * spcl_func_count Number of reserved Special Function names
*
**************************************************************************** */
@@ -81,6 +102,22 @@
static int vfc_line_no = 0;
static char *vfc_buf_end;
+/* Special Functions List */
+/* Initial fcode-field value of -1 guarantees they won't be used */
+token_t spcl_func_list[] = {
+ TOKEN_ENTRY( -1, "double(lit)" ), /* Entry [0] */
+};
+
+static const int spcl_func_count = (sizeof(spcl_func_list)/sizeof(token_t)) ;
+
+/* Global Variables for "special function" identification */
+/* Each is a pointer to the FCode field of the entry in
+ * the Special Functions List for that function.
+ */
+
+u16 *double_lit_code = &spcl_func_list[0].fcode;
+
+
/* **************************************************************************
*
* Function name: skip_whitespace
@@ -231,11 +268,19 @@
* after the name will be ignored, so an extra "comment"
* is permitted. The FCode number must be in hex, with
* an optional leading 0x or 0X For example: 0X407
- * The valid range is 0x010 to 0x7ff. Numbers above 0x800
- * infringe upon the are reserved for FCodes generated
- * by the tokenization process.
+ * The valid range for the FCode numbers is 0x010 to 0x7ff.
+ * Numbers above 0x800 infringe upon the area reserved
+ * for FCodes generated by the tokenization process.
* Numbers already in use will be ignored. A Message will be
* printed even if the name matches the one on the line.
+ * Names may not be longer than 31 characters.
+ * Certain names will be reserved for special functions.
+ * Those names will be entered in the detok_table
+ * with a value of -1 and again in the static
+ * table associated with this function, below, to
+ * supply the variable that will be used to match
+ * the name with the special function.
+ *
*
**************************************************************************** */
@@ -267,6 +312,13 @@
char *lookup_result;
char *fc_name_cpy;
+ /* For each line of input, we need to check that we have
+ * two strings, one of which is the number and the
+ * second of which is the name. We will check for
+ * the various formats allowed for the number
+ */
+
+ /* Start with a lower-case 0x */
scan_result = sscanf(current_vfc_line, "0x%x %32s",
&vs_fc_number, vs_fc_name);
@@ -315,6 +367,28 @@
continue;
}
+ /* Check if the name is on the "Special Functions List" */
+ {
+ bool found_spf = FALSE;
+ int indx;
+ for (indx = 0; indx < spcl_func_count; indx++) {
+ if ( strcmp( vs_fc_name, spcl_func_list[indx].name) == 0 ) {
+ char strbuf[64];
+ found_spf = TRUE;
+ spcl_func_list[indx].fcode = vs_fc_number;
+ link_token( &spcl_func_list[indx]);
+ added_fc_count++;
+ sprintf( strbuf, "Added Special Function FCode "
+ "number 0x%03x, name %s\n", vs_fc_number, vs_fc_name);
+ printremark( strbuf);
+ break;
+ }
+ }
+
+ if (found_spf)
+ continue;
+ }
+
/* We've passed all the tests! */
fc_name_cpy = strdup(vs_fc_name);
add_token((u16) vs_fc_number, fc_name_cpy);
@@ -323,11 +397,10 @@
}
if (verbose) {
- char *strbfr = malloc(85);
+ char strbfr[32];
sprintf(strbfr,
"Added %d FCode numbers\n", added_fc_count);
printremark(strbfr);
- free(strbfr);
}
close_stream();
Modified: fcode-utils/detok/dictionary.c
===================================================================
--- fcode-utils/detok/dictionary.c 2006-10-30 11:31:16 UTC (rev 104)
+++ fcode-utils/detok/dictionary.c 2006-10-30 11:59:18 UTC (rev 105)
@@ -37,13 +37,6 @@
#include "detok.h"
bool check_tok_seq = TRUE;
-
-typedef struct token {
- char *name;
- u16 fcode;
- struct token *next;
-} token_t;
-#define TOKEN_ENTRY(num, name) { name, (u16)num, (token_t *)NULL }
static token_t *dictionary; /* Initialize dynamically to accommodate AIX */
static char *fcerror = "ferror";
@@ -52,7 +45,7 @@
{
token_t *curr;
- for (curr = dictionary; curr != NULL; curr = curr->next)
+ for (curr = dictionary; curr != NULL; curr = curr->prev)
if (curr->fcode == number)
break;
@@ -64,6 +57,33 @@
/* **************************************************************************
*
+ * Function name: link_token
+ * Synopsis: Simply link a ready-made token-table entry to
+ * the dictionary, without side-effects.
+ *
+ * Inputs:
+ * Parameters:
+ * curr_token The token-table entry to link
+ * Local Static Variables:
+ * dictionary Pointer to the "tail" of the
+ * FCode-Tokens vocabulary.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * dictionary Updated to point to the new entry.
+ *
+ **************************************************************************** */
+
+void link_token( token_t *curr_token)
+{
+ curr_token->prev = dictionary;
+
+ dictionary = curr_token;
+}
+
+/* **************************************************************************
+ *
* Function name: add_token
* Synopsis: Add an entry to the FCode-Tokens vocabulary.
*
@@ -72,8 +92,6 @@
* number Numeric value of the FCode token
* name Name of the function to display
* Global/Static Variables:
- * dictionary Pointer to the "tail" of the
- * FCode-Tokens vocabulary.
* check_tok_seq TRUE = "Check Token Sequence"
* A retro-fit to accommodate
* adding Vendor FCodes
@@ -81,7 +99,6 @@
* Outputs:
* Returned Value: NONE
* Global/Static Variables:
- * dictionary Updated to point to the new entry.
* last_defined_token Updated to the given FCode token
* Memory Allocated
* For the new entry.
@@ -116,11 +133,10 @@
exit(-ENOMEM);
}
- curr->next = dictionary;
- curr->fcode = number;
curr->name = name;
+ curr->fcode=number;
- dictionary = curr;
+ link_token( curr);
if (check_tok_seq) {
/* Error-check, but not for first time. */
@@ -543,7 +559,7 @@
dictionary_reset_position = dictionary;
for (indx = 1; indx < dictionary_indx_max; indx++) {
- detok_table[indx].next = &detok_table[indx - 1];
+ detok_table[indx].prev = &detok_table[indx - 1];
}
}
@@ -553,7 +569,7 @@
next_t = dictionary;
while (next_t != dictionary_reset_position) {
- next_t = dictionary->next;
+ next_t = dictionary->prev;
free(dictionary->name);
free(dictionary);
dictionary = next_t;
1
0
Author: stepan
Date: 2006-10-30 12:31:16 +0100 (Mon, 30 Oct 2006)
New Revision: 104
Modified:
fcode-utils/detok/decode.c
fcode-utils/detok/detok.c
Log:
detok 1.0.2 merge commit II
Modified: fcode-utils/detok/decode.c
===================================================================
--- fcode-utils/detok/decode.c 2006-10-30 10:04:23 UTC (rev 103)
+++ fcode-utils/detok/decode.c 2006-10-30 11:31:16 UTC (rev 104)
@@ -38,6 +38,7 @@
#include "detok.h"
#include "stream.h"
+#include "addfcodes.h"
static int indent; /* Current level of indentation */
@@ -125,8 +126,7 @@
static void decode_lines(void)
{
if (show_linenumbers) {
- printf("%6d: ",
- show_offsets ? token_streampos : linenum++);
+ printf("%6d: ",show_offsets ? token_streampos : linenum++);
}
}
@@ -384,6 +384,18 @@
printf("0x%x\n", lit);
}
+static void double_length_literal(void)
+{
+ u16 quadhh, quadhl, quadlh, quadll;
+
+ output_token();
+ quadhh = get_num16();
+ quadhl = get_num16();
+ quadlh = get_num16();
+ quadll = get_num16();
+ printf("0x%04x.%04x.%04x.%04x\n", quadhh, quadhl, quadlh, quadll);
+}
+
static void offset16(void)
{
decode_default();
@@ -536,10 +548,28 @@
end_found = TRUE;
decode_default();
break;
+
+#if 0 /* Fooey on C's petty limitations! */
+ /* I'd like to be able to do this: */
+ /* Special Functions */
+ case *double_lit_code:
+ double_length_literal();
+ break;
+#endif /* Fooey on C's petty limitations! */
+
default:
+ {
+ /* Have to do this clumsy thing instead */
+ if ( token == *double_lit_code )
+ {
+ double_length_literal();
+ break;
+ }
+
decode_default();
}
}
+}
/* **************************************************************************
@@ -556,15 +586,18 @@
* Outputs:
* Returned Value: NONE
* Global/Static Variables:
- * offs16 FALSE if Starter was version1, else TRUE
+ * offs16 FALSE if Starter was version1, TRUE for all
+ * other valid Starters, otherwise unchanged.
* fclen On error, gets set to reach end of input stream
* Otherwise, gets set by decode_start()
* Printout:
+ * On error, print a new-line to finish previous token's line.
*
* Error Detection:
* First byte not a valid FCode Start: Print message, restore
* input pointer to initial value, set fclen to [(end of
- * input stream) - (input pointer)], return FALSE.
+ * input stream) - (input pointer)], leave offs16 unchanged.
+ * Return FALSE.
*
* Process Explanation:
* This routine error-checks and dispatches to the routine that
@@ -578,18 +611,20 @@
{
long err_pos;
u16 token;
+ bool new_offs16 = TRUE;
err_pos = get_streampos();
indent = 0;
token = next_token();
- offs16 = TRUE;
+
switch (token) {
case 0x0fd: /* version1 */
- offs16 = FALSE;
+ new_offs16 = FALSE;
case 0x0f0: /* start0 */
case 0x0f1: /* start1 */
case 0x0f2: /* start2 */
case 0x0f3: /* start4 */
+ offs16 = new_offs16;
decode_start();
break;
default:
Modified: fcode-utils/detok/detok.c
===================================================================
--- fcode-utils/detok/detok.c 2006-10-30 10:04:23 UTC (rev 103)
+++ fcode-utils/detok/detok.c 2006-10-30 11:31:16 UTC (rev 104)
@@ -45,7 +45,7 @@
#include "stream.h"
#include "addfcodes.h"
-#define DETOK_VERSION "1.0.0"
+#define DETOK_VERSION "1.0.2"
#define CORE_COPYR "(C) Copyright 2001-2006 Stefan Reinauer.\n" \
"(C) Copyright 2006 coresystems GmbH <info(a)coresystems.de>"
@@ -69,8 +69,8 @@
CORE_COPYR "\n" IBM_COPYR "\n"
"Written by Stefan Reinauer, <stepan(a)openbios.org>\n"
"This program is free software; you may redistribute it "
- "under the terms of\nthe GNU General Public License v2. This "
- "program has absolutely no warranty.\n\n");
+ "under the terms of\nthe GNU General Public License v2. "
+ "This program has absolutely no warranty.\n\n");
pfunct = (is_error ? (vfunct) printf : printremark);
@@ -190,3 +190,4 @@
return 0;
}
+
1
0
Author: stepan
Date: 2006-10-30 11:04:23 +0100 (Mon, 30 Oct 2006)
New Revision: 103
Modified:
fcode-utils/detok/addfcodes.h
fcode-utils/detok/detok.h
Log:
detok 1.0.2 merge
Modified: fcode-utils/detok/addfcodes.h
===================================================================
--- fcode-utils/detok/addfcodes.h 2006-10-30 09:50:41 UTC (rev 102)
+++ fcode-utils/detok/addfcodes.h 2006-10-30 10:04:23 UTC (rev 103)
@@ -39,6 +39,16 @@
/* ************************************************************************** *
*
+ * Global Variables Exported
+ *
+ **************************************************************************** */
+
+/* For "special function" identification */
+extern u16 *double_lit_code;
+
+
+/* ************************************************************************** *
+ *
* Function Prototypes / Functions Exported:
*
**************************************************************************** */
Modified: fcode-utils/detok/detok.h
===================================================================
--- fcode-utils/detok/detok.h 2006-10-30 09:50:41 UTC (rev 102)
+++ fcode-utils/detok/detok.h 2006-10-30 10:04:23 UTC (rev 103)
@@ -35,10 +35,28 @@
#include "types.h"
+/* Structure of an entry in a token-table
+ * Consists of:
+ * (1) Name of the token
+ * (2) FCode of the token
+ * (3) Link-pointer to previous entry.
+ */
+
+typedef struct token {
+ char *name;
+ u16 fcode;
+ struct token *prev;
+} token_t;
+
+/* Macro for creating an entry in a token-table data-array */
+#define TOKEN_ENTRY(num, name) { name, (u16)num, (token_t *)NULL }
+
+
/* Prototypes for functions exported from
* detok.c decode.c printformats.c pcihdr.c and dictionary.c
*/
+void link_token(token_t *curr_token);
void add_token(u16 number, char *name);
void init_dictionary(void);
void reset_dictionary(void);
1
0
Author: stepan
Date: 2006-10-30 10:50:41 +0100 (Mon, 30 Oct 2006)
New Revision: 102
Added:
fcode-utils/localvalues/
fcode-utils/localvalues/GlobalLocalValues.fth
fcode-utils/localvalues/GlobalLocalValuesDevel.fth
fcode-utils/localvalues/LocalValuesDevelSupport.fth
fcode-utils/localvalues/LocalValuesSupport.fth
fcode-utils/localvalues/TotalLocalValuesSupport.fth
Log:
localvalues support, contributed by David Paktor <dlpaktor(a)netscape.net>
Added: fcode-utils/localvalues/GlobalLocalValues.fth
===================================================================
--- fcode-utils/localvalues/GlobalLocalValues.fth (rev 0)
+++ fcode-utils/localvalues/GlobalLocalValues.fth 2006-10-30 09:50:41 UTC (rev 102)
@@ -0,0 +1,27 @@
+\ (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+\ Licensed under the Common Public License (CPL) version 1.0
+\ for full details see:
+\ http://www.opensource.org/licenses/cpl1.0.php
+\
+\ Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+
+\ Load Locals Support under Global-Definitions. Bypass Instance warning
+
+\ Make sure this option is turned on.
+[flag] Local-Values
+
+global-definitions
+
+\ Bypass warning about Instance without altering LocalValuesSupport file
+alias generic-instance instance
+[macro] bypass-instance f[ noop .( Bypassed instance!) f]
+
+overload alias instance bypass-instance
+
+fload LocalValuesSupport.fth
+
+\ Replace normal meaning of Instance, still in Global scope.
+overload alias instance generic-instance
+
+\ Restore Device-Definitions scope.
+device-definitions
Added: fcode-utils/localvalues/GlobalLocalValuesDevel.fth
===================================================================
--- fcode-utils/localvalues/GlobalLocalValuesDevel.fth (rev 0)
+++ fcode-utils/localvalues/GlobalLocalValuesDevel.fth 2006-10-30 09:50:41 UTC (rev 102)
@@ -0,0 +1,30 @@
+\ (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+\ Licensed under the Common Public License (CPL) version 1.0
+\ for full details see:
+\ http://www.opensource.org/licenses/cpl1.0.php
+\
+\ Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+
+\ Load Support file for development of FCode that uses Local Values
+\ under Global-Definitions. Bypass Instance warning.
+\ Replace this with GlobalLocalValues.fth in your final product.
+
+\ Make sure this option is turned on.
+[flag] Local-Values
+
+global-definitions
+
+\ Bypass warning about Instance without altering LocalValuesSupport file
+alias generic-instance instance
+[macro] bypass-instance f[ noop .( Bypassed instance!) f]
+
+overload alias instance bypass-instance
+
+fload LocalValuesSupport.fth
+fload LocalValuesDevelSupport.fth
+
+\ Replace normal meaning of Instance, still in Global scope.
+overload alias instance generic-instance
+
+\ Restore Device-Definitions scope.
+device-definitions
Added: fcode-utils/localvalues/LocalValuesDevelSupport.fth
===================================================================
--- fcode-utils/localvalues/LocalValuesDevelSupport.fth (rev 0)
+++ fcode-utils/localvalues/LocalValuesDevelSupport.fth 2006-10-30 09:50:41 UTC (rev 102)
@@ -0,0 +1,45 @@
+\ (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+\ Licensed under the Common Public License (CPL) version 1.0
+\ for full details see:
+\ http://www.opensource.org/licenses/cpl1.0.php
+\
+\ Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+
+\ Support file for development of FCode that uses Local Values
+\ FLoad this right after LocalValuesSupport.fth
+\ Remove it from your final product.
+
+\ Exported Function: max-local-storage-size ( -- n )
+\ Returns the measured maximum size of storage for Local Values
+\ used by any given test run. This number can be used to guide
+\ the declaration of _local-storage-size_
+\
+\ (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+\ Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+
+\ Count the current depth on a per-instance basis,
+\ but collect the maximum depth over all instances.
+
+headers
+0 instance value local-storage-depth
+
+external
+0 value max-local-storage-size
+headers
+
+\ Overload the {push-locals} and {pop-locals} routines to do this.
+\ Do not suppress the overload warnings; they'll serve as a reminder.
+: {pop-locals} ( #locals -- )
+ local-storage-depth over - to local-storage-depth
+ {pop-locals}
+;
+
+: {push-locals} ( #ilocals #ulocals -- )
+ 2dup + local-storage-depth +
+ dup to local-storage-depth
+ max-local-storage-size max
+ to max-local-storage-size
+ {push-locals}
+;
+
+
Added: fcode-utils/localvalues/LocalValuesSupport.fth
===================================================================
--- fcode-utils/localvalues/LocalValuesSupport.fth (rev 0)
+++ fcode-utils/localvalues/LocalValuesSupport.fth 2006-10-30 09:50:41 UTC (rev 102)
@@ -0,0 +1,133 @@
+\ (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+\ Licensed under the Common Public License (CPL) version 1.0
+\ for full details see:
+\ http://www.opensource.org/licenses/cpl1.0.php
+\
+\ Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+
+\ The support routines for Local Values in FCode.
+
+\ Function imported
+\ _local-storage-size_ \ Size, in cells, of backing store for locals
+\ \ A constant. If not supplied, default value of d# 64 will be used.
+\
+\ Functions exported:
+\ {push-locals} ( #ilocals #ulocals -- )
+\ {pop-locals} ( #locals -- )
+\ _{local} ( local-var# -- addr )
+\
+\ Additional overloaded function:
+\ catch \ Restore Locals after a throw
+
+\ The user is responsible for declaring the maximum depth of the
+\ run-time Locals stack, in storage units, by defining the
+\ constant _local-storage-size_ before floading this file.
+\ The definition may be created either by defining it as a constant
+\ in the startup-file that FLOADs this and other files in the
+\ source program, or via a command-line user-symbol definition
+\ of a form resembling: -d '_local-storage-size_=d# 42'
+\ (be sure to enclose it within quotes so that the shell treats
+\ it as a single string, and, of course, replace the "42" with
+\ the actual number you need...)
+\ If both forms are present, the command-line user-symbol value will
+\ be used to create a duplicate definition of the named constant,
+\ which will prevail over the earlier definition, and will remain
+\ available for examination during development and testing. The
+\ duplicate-name warning, which will not be suppressed, will also
+\ act to alert the developer of this condition.
+\ To measure the actual usage (in a test run), use the separate tool
+\ found in the file LocalValuesDevelSupport.fth .
+\ If the user omits defining _local-storage-size_ the following
+\ ten-line sequence will supply a default:
+
+[ifdef] _local-storage-size_
+ f[ [defined] _local-storage-size_ true ]f
+[else]
+ [ifexist] _local-storage-size_
+ f[ false ]f
+ [else]
+ f[ d# 64 true ]f
+ [then]
+[then] ( Compile-time: size true | false )
+[if] fliteral constant _local-storage-size_ [then]
+
+_local-storage-size_ \ The number of storage units to allocate
+ cells \ Convert to address units
+ dup \ Keep a copy around...
+ ( n ) instance buffer: locals-storage \ Use one of the copies
+
+\ The Locals Pointer, added to the base address of locals-storage
+\ points to the base-address of the currently active set of Locals.
+\ Locals will be accessed as a positive offset from there.
+\ Start the Locals Pointer at end of the buffer.
+\ A copy of ( N ), the number of address units that were allocated
+\ for the buffer, is still on the stack. Use it here.
+ ( n ) instance value locals-pointer
+
+\ Support for {push-locals}
+
+\ Error-check.
+: not-enough-locals? ( #ilocals #ulocals -- error? )
+ + cells locals-pointer swap - 0<
+;
+
+\ Error message.
+: .not-enough-locals ( -- )
+ cr ." FATAL ERROR: Local Values Usage exceeds allocation." cr
+;
+
+\ Detect, announce and handle error.
+: check-enough-locals ( #ilocals #ulocals -- | <ABORT> )
+ not-enough-locals? if
+ .not-enough-locals
+ abort
+ then
+;
+
+\ The uninitialized locals can be allocated in a single batch
+: push-uninitted-locals ( #ulocals -- )
+ cells locals-pointer swap - to locals-pointer
+;
+
+\ The Initialized locals are initted from the items on top of the stack
+\ at the start of the routine. If we allocate them one at a time,
+\ we get them into the right order. I.e., the last-one named gets
+\ the top item, the earlier ones get successively lower items.
+: push-one-initted-local ( pstack-item -- )
+ locals-pointer 1 cells -
+ dup to locals-pointer
+ locals-storage + !
+;
+
+\ Push all the Initialized locals.
+: push-initted-locals ( N_#ilocals-1 ... N_0 #ilocals -- )
+ 0 ?do push-one-initted-local loop
+;
+
+: {push-locals} ( N_#ilocals ... N_1 #ilocals #ulocals -- )
+ 2dup check-enough-locals
+ push-uninitted-locals ( ..... #i )
+ push-initted-locals ( )
+;
+
+\ Pop all the locals.
+\ The param is the number to pop.
+: {pop-locals} ( total#locals -- )
+ cells locals-pointer + to locals-pointer
+;
+
+\ The address from/to which values will be moved, given the local-var#
+: _{local} ( local-var# -- addr )
+ cells locals-pointer + locals-storage +
+;
+
+\ We need to overload catch such that the state of the Locals Pointer
+\ will be preserved and restored after a throw .
+overload : catch ( ??? xt -- ???' false | ???'' throw-code )
+ locals-pointer >r ( ??? xt ) ( R: old-locals-ptr )
+ catch ( ???' false | ???'' throw-code ) ( R: old-locals-ptr )
+ \ No need to inspect the throw-code.
+ \ If catch returned a zero, the Locals Pointer
+ \ is valid anyway, so restoring it is harmless.
+ r> to locals-pointer
+;
Added: fcode-utils/localvalues/TotalLocalValuesSupport.fth
===================================================================
--- fcode-utils/localvalues/TotalLocalValuesSupport.fth (rev 0)
+++ fcode-utils/localvalues/TotalLocalValuesSupport.fth 2006-10-30 09:50:41 UTC (rev 102)
@@ -0,0 +1,51 @@
+\ (C) Copyright 2005-2006 IBM Corporation. All Rights Reserved.
+\ Licensed under the Common Public License (CPL) version 1.0
+\ for full details see:
+\ http://www.opensource.org/licenses/cpl1.0.php
+\
+\ Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+
+\ Control file for loading of Local Values Support file with variants.
+\ Command-line Symbol-definitions select whether the support will
+\ be under Global-Definitions, and whether to include the extra
+\ Development-time support features.
+\
+\ The command-line symbols are:
+\ Global-Locals
+\ and
+\ Locals-Release
+\
+\ The default is device-node-specific support in a Development-time setting.
+\
+\ If Global-Locals is defined, support will be under Global-Definitions
+\ If Locals-Release is defined, this is a final production release run,
+\ and the Development-time support features will be removed.
+
+\ Make sure this option is turned on.
+[flag] Local-Values
+
+[ifdef] Global-Locals
+ \ Load Support file under Global-Definitions.
+ global-definitions
+
+ \ Bypass warning about Instance without altering LocalValuesSupport file
+ alias generic-instance instance
+ [macro] bypass-instance f[ noop .( Bypassed instance!) f]
+
+ overload alias instance bypass-instance
+[endif] \ Global-Locals
+
+fload LocalValuesSupport.fth
+
+[ifndef] Locals-Release
+ \ Load Development-time support features
+ fload LocalValuesDevelSupport.fth
+[endif] \ not Locals-Release
+
+[ifdef] Global-Locals
+ \ Replace normal meaning of Instance, still in Global scope.
+ overload alias instance generic-instance
+
+ \ Restore Device-Definitions scope.
+ device-definitions
+[endif] \ Global-Locals
1
0
Author: stepan
Date: 2006-10-30 10:49:32 +0100 (Mon, 30 Oct 2006)
New Revision: 101
Modified:
fcode-utils/romheaders/romheaders.c
Log:
romheaders v1.0.2, contribution by David Paktor <dlpaktor(a)netscape.net>
Modified: fcode-utils/romheaders/romheaders.c
===================================================================
--- fcode-utils/romheaders/romheaders.c 2006-10-30 09:48:28 UTC (rev 100)
+++ fcode-utils/romheaders/romheaders.c 2006-10-30 09:49:32 UTC (rev 101)
@@ -35,23 +35,30 @@
#include <sys/stat.h>
#include <unistd.h>
+/* We needn't be concerned with the endian-ness of the host,
+ * only with the endian-ness of the data.
+ */
+
+#include "types.h"
#include "pcihdr.h"
+
char *rom=NULL;
size_t romlen=0;
-/* Prototypes for functions exported from shared/classcodes.c */
+/* Prototypes for functions exported from devsupp/pci/classcodes.c */
+
char *pci_device_class_name(u32 code);
char *pci_code_type_name(unsigned char code);
/* Functions local to this file:
- int dump_rom_header(rom_header_t *data);
- int dump_pci_data(pci_data_t *data);
+ bool dump_rom_header(rom_header_t *data);
+ bool dump_pci_data(pci_data_t *data);
void dump_platform_extensions(u8 type, rom_header_t *data);
*/
-static int dump_rom_header(rom_header_t *data)
+static bool dump_rom_header(rom_header_t *data)
{ /* Return TRUE for "no problem" */
const u16 pci_header_signature = 0x55aa;
u16 sig=BIG_ENDIAN_WORD_FETCH(data->signature);
@@ -71,10 +78,10 @@
printf ("\n Pointer to PCI Data Structure: 0x%04x\n\n",
LITTLE_ENDIAN_WORD_FETCH(data->data_ptr));
- return (sig == pci_header_signature);
+ return (BOOLVAL(sig == pci_header_signature) );
}
-static int dump_pci_data(pci_data_t *data)
+static bool dump_pci_data(pci_data_t *data)
{ /* Return TRUE for "no problem" */
const u32 pci_data_hdr = PCI_DATA_HDR ;
@@ -106,7 +113,7 @@
data->last_image_flag&0x80?"":"not ");
printf(" Reserved: 0x%04x\n\n", little_word(data->reserved_2));
- return (sig==PCI_DATA_HDR);
+ return (BOOLVAL(sig==PCI_DATA_HDR) );
}
static void dump_platform_extensions(u8 type, rom_header_t *data)
1
0
Author: stepan
Date: 2006-10-30 10:48:28 +0100 (Mon, 30 Oct 2006)
New Revision: 100
Modified:
fcode-utils/toke/Makefile
fcode-utils/toke/clflags.c
fcode-utils/toke/clflags.h
fcode-utils/toke/devnode.c
fcode-utils/toke/dictionary.c
fcode-utils/toke/emit.c
fcode-utils/toke/emit.h
fcode-utils/toke/errhandler.c
fcode-utils/toke/errhandler.h
fcode-utils/toke/flowcontrol.c
fcode-utils/toke/macros.c
fcode-utils/toke/nextfcode.c
fcode-utils/toke/parselocals.c
fcode-utils/toke/scanner.c
fcode-utils/toke/scanner.h
fcode-utils/toke/stream.c
fcode-utils/toke/stream.h
fcode-utils/toke/ticvocab.c
fcode-utils/toke/ticvocab.h
fcode-utils/toke/toke.c
fcode-utils/toke/tokzesc.c
fcode-utils/toke/tracesyms.c
fcode-utils/toke/tracesyms.h
fcode-utils/toke/vocabfuncts.h
Log:
tokenizer v 1.0.2, contribution by David Paktor <dlpaktor(a)netscape.net>
Modified: fcode-utils/toke/Makefile
===================================================================
--- fcode-utils/toke/Makefile 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/Makefile 2006-10-30 09:48:28 UTC (rev 100)
@@ -29,7 +29,7 @@
INCLUDES = -I../shared
# Normal flags
-CFLAGS = -O2 -Wall -Wno-pointer-sign -fno-strict-aliasing -DSYS_IS_GNU_Linux
+CFLAGS = -O2 -Wall -Wno-pointer-sign -fno-strict-aliasing
LDFLAGS =
# Coverage:
Modified: fcode-utils/toke/clflags.c
===================================================================
--- fcode-utils/toke/clflags.c 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/clflags.c 2006-10-30 09:48:28 UTC (rev 100)
@@ -104,6 +104,7 @@
bool obso_fcode_warning = TRUE ;
bool trace_conditionals = FALSE ;
bool big_end_pci_image_rev = FALSE ;
+bool allow_ret_stk_interp = TRUE ;
/* And one to trigger a "help" message */
bool clflag_help = FALSE;
@@ -242,7 +243,12 @@
"Save the Vendor's Rev Level field of the PCI Header"
" in Big-Endian format" } ,
+ { "Ret-Stk-Interp",
+ &allow_ret_stk_interp,
+ "\t\t",
+ "Allow Return-Stack Operations during Interpretation" } ,
+
/* Keep the "help" pseudo-flag last in the list */
{ "help",
&clflag_help,
Modified: fcode-utils/toke/clflags.h
===================================================================
--- fcode-utils/toke/clflags.h 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/clflags.h 2006-10-30 09:48:28 UTC (rev 100)
@@ -124,6 +124,7 @@
extern bool force_tokens_case;
extern bool force_lower_case_tokens;
+extern bool allow_ret_stk_interp;
extern bool clflag_help;
Modified: fcode-utils/toke/devnode.c
===================================================================
--- fcode-utils/toke/devnode.c 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/devnode.c 2006-10-30 09:48:28 UTC (rev 100)
@@ -580,7 +580,7 @@
}
if ( grandpa != NULL )
{
- char as_what_buf[32] = "";
+ char as_what_buf[AS_WHAT_BUF_SIZE] = "";
if ( as_a_what( found->fword_defr, as_what_buf) )
{
strcat( as_what_buf, " ");
Modified: fcode-utils/toke/dictionary.c
===================================================================
--- fcode-utils/toke/dictionary.c 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/dictionary.c 2006-10-30 09:48:28 UTC (rev 100)
@@ -50,6 +50,7 @@
#include "errhandler.h"
#include "tokzesc.h"
#include "conditl.h"
+#include "tracesyms.h"
/* **************************************************************************
*
@@ -87,10 +88,48 @@
* Begin development of implementation of a way to define both (all?)
* types of definitions in a single tic_hdr_t type vocabulary.
*
+ * Wed, 04 Oct 2006 by David L. Paktor
+ * Issue a message when a name on the trace list is invoked (as well
+ * as when it is created), but keep a limit on the speed penalty.
+ * (I.e., don't scan the trace-list for every symbol invoked.)
+ * We will scan the trace-list for every pre-defined symbol during
+ * initialization of the built-in vocabularies' lists, but that
+ * occurs only once...
+ *
**************************************************************************** */
+/* **************************************************************************
+ *
+ * Global Variables Exported
+ *
+ * scope_is_global Indication that "global" scope is in effect
+ *
+ * define_token Normally TRUE, but if the definition in progress
+ * occurs inside a control-structure, (which is an Error), we
+ * make this FALSE. We will allow the definition to proceed
+ * (in order to avoid "cascade" errors and so that other errors
+ * can be recognized normally) but we will use this to suppress
+ * adding the new definition's token to the vocab. We also use
+ * this to suppress the actions of "hide_..." and "reveal..."
+ * because if the token wasn't added to the vocabulary, there's
+ * nothing to find that needed to be "hidden"...
+ *
+ **************************************************************************** */
+bool scope_is_global = FALSE;
+bool define_token = TRUE; /* TRUE = Normal definition process;
+ * FALSE when definition is an Error.
+ * We enter definition state anyway,
+ * but must still suppress:
+ * (1) adding an entry for the token
+ * to the vocab,
+ * (2) "hiding" it at first, and
+ * (3) "revealing" it later.
+ *
+ * Makes for more "normal" error- detection...
+ */
+
/* **************************************************************************
*
* We will be creating several different lists of initial built-in
@@ -170,6 +209,8 @@
/* **************************************************************************
*
+ * Internal Static Variables
+ *
* We'll be initializing the lists later, but will be referencing
* the pointers sooner, so we need to declare the pointers here.
*
@@ -278,20 +319,20 @@
#define FC_TOKEN_FUNC emit_fc_token
#define BUILTIN_FCODE( tok, nam) \
- VALPARAM_TIC(nam, FC_TOKEN_FUNC, tok , UNSPECIFIED )
+ VALPARAM_TIC(nam, FC_TOKEN_FUNC, tok , UNSPECIFIED, TRUE )
/* Built-in FCodes with known definers: */
#define BI_FCODE_VALUE( tok, nam) \
- VALPARAM_TIC(nam, FC_TOKEN_FUNC, tok , VALUE )
+ VALPARAM_TIC(nam, FC_TOKEN_FUNC, tok , VALUE, TRUE )
#define BI_FCODE_VRBLE( tok, nam) \
- VALPARAM_TIC(nam, FC_TOKEN_FUNC, tok , VARIABLE )
+ VALPARAM_TIC(nam, FC_TOKEN_FUNC, tok , VARIABLE, TRUE )
#define BI_FCODE_DEFER( tok, nam) \
- VALPARAM_TIC(nam, FC_TOKEN_FUNC, tok , DEFER )
+ VALPARAM_TIC(nam, FC_TOKEN_FUNC, tok , DEFER, TRUE )
#define BI_FCODE_CONST( tok, nam) \
- VALPARAM_TIC(nam, FC_TOKEN_FUNC, tok , CONST )
+ VALPARAM_TIC(nam, FC_TOKEN_FUNC, tok , CONST, TRUE )
/* **************************************************************************
*
@@ -322,10 +363,10 @@
#define OBSO_FC_FUNC obsolete_fc_token
#define OBSOLETE_FCODE( tok, nam) \
- VALPARAM_TIC(nam, OBSO_FC_FUNC, tok , UNSPECIFIED )
+ VALPARAM_TIC(nam, OBSO_FC_FUNC, tok , UNSPECIFIED, TRUE )
#define OBSOLETE_VALUE( tok, nam) \
- VALPARAM_TIC(nam, OBSO_FC_FUNC, tok , VALUE )
+ VALPARAM_TIC(nam, OBSO_FC_FUNC, tok , VALUE, TRUE )
/* **************************************************************************
@@ -457,10 +498,7 @@
**************************************************************************** */
static tic_hdr_t **save_device_definitions;
-/* Export the indication that "global" scope is in effect */
-bool scope_is_global = FALSE;
-
void enter_global_scope( void )
{
if ( scope_is_global )
@@ -626,20 +664,24 @@
* name The name of the new entry
* fc_token The new entry's assigned FCode-number
* fw_definer The new entry's definer
- * define_token If FALSE, suppress adding the entry,
- * but preserve the side-effect of
- * setting save_current
* Global Variables:
* current_definitions Pointer to pointer to "tail" of the
* Vocabulary currently in effect;
* either Device-node or Global.
+ * define_token TRUE = Normal definition process;
+ * FALSE if def'n is an Error.
+ * Suppress adding entry to vocab;
+ * Display "failure" Trace-note
+ * and Duplicate-Name Warning.
*
* Outputs:
* Returned Value: NONE
* Global Variables:
* *current_definitions Updated with the new entry
* Local Static Variables:
- * save_current Pointer to previous entry
+ * save_current Saved state of current_definitions
+ * before the new entry is added,
+ * to permit "hide" and "reveal".
* Memory Allocated
* For the new entry's copy of the name.
* When Freed?
@@ -653,34 +695,38 @@
* All user-defined words have the same action, i.e., emitting
* the assigned FCode-number. The new entry's "parameter
* field" size is, of course, zero; the "ignore-function"
- * is NULL.
+ * is NULL, and the entry has a single-token FCode number.
*
* Extraneous Remarks:
- * The define_token parameter is a late addition, necessitated
- * by the decision to continue processing after an erroneous
+ * The define_token input is a late addition, necessitated by
+ * the decision to continue processing after an erroneous
* attempt to create a definition inside a control-structure,
* in order to catch other errors.
*
- *
**************************************************************************** */
void add_to_current( char *name,
TIC_P_DEFLT_TYPE fc_token,
- fwtoken definer,
- bool define_token)
+ fwtoken definer)
{
- save_current = *current_definitions;
if ( define_token )
{
char *nu_name = strdup( name);
+
+ save_current = *current_definitions;
add_tic_entry( nu_name, FC_TOKEN_FUNC, fc_token,
- definer, 0 , NULL, current_definitions );
+ definer, 0 , TRUE , NULL, current_definitions );
+ }else{
+ trace_create_failure( name, NULL, fc_token);
+ warn_if_duplicate( name);
}
}
void hide_last_colon ( void )
{
+ if ( define_token )
+ {
tic_hdr_t *temp_vocab;
/* The add_to_current() function will have been called before this
@@ -692,16 +738,20 @@
temp_vocab = save_current ;
save_current = *current_definitions;
*current_definitions = temp_vocab;
+ }
}
void reveal_last_colon ( void )
{
+ if ( define_token )
+ {
/* We call this function either when the colon-definition is
* completed, or when "recursive"-ness is intentional.
*/
*current_definitions = save_current ;
}
+}
/* **************************************************************************
@@ -724,6 +774,15 @@
* current_definitions Device-node vocabulary currently
* in effect.
* scope_is_global TRUE if "global" scope is in effect
+ * split_alias_message Message-type for announcement that
+ * the "new" name was created in
+ * a different vocabulary than where
+ * the "old" name was found, if so
+ * be. (See "Rule 3", below). An
+ * Advisory, normally, but if either
+ * of the names is being Traced, the
+ * create_split_alias() routine will
+ * change it to a Trace-Note.
* Local Static Variables:
* global_voc_dict_ptr "Tail" of Global Vocabulary
*
@@ -766,35 +825,52 @@
*
* And one other thing:
* We will always make the alias's pfld_size zero. See the
- * prolog for create_tic_alias() in ticvocab.c for details...
+ * prolog for create_split_alias() in ticvocab.c for details...
*
* Extraneous Remarks:
- * I will stretch the rules of well-structured code here, too.
+ * I tried stretching the rules of well-structured code, but
+ * I'm finding that there is a _good_reason_ for them...
*
**************************************************************************** */
bool create_current_alias( char *new_name, char *old_name )
{
bool retval = FALSE;
+ bool split_alias = FALSE;
+ /* Rules 1 & 2 are implemented in the same code. */
if ( create_tic_alias( new_name, old_name, current_definitions) )
{
- return ( TRUE );
- }
-
+ retval = TRUE;
+ }else{
if ( INVERSE(scope_is_global) )
{
- tic_hdr_t *found = lookup_core_word( old_name );
- if ( found != NULL )
- {
- add_tic_entry( new_name, found->funct,
- found->pfield.deflt_elem,
- found->fword_defr,
- 0, found->ign_func,
+ /* Rule 3.
+ * Because the vocab into which the new definition will go is
+ * not the same as the one in which the old name was found,
+ * we cannot call create_tic_alias but must replicate it.
+ */
+ /* Hmmmmmm.....
+ * We could get around that by refactoring: add a parameter,
+ * make the vocab to search separate from the one in which to
+ * create. Also, by making it a separate routine, we won't
+ * have to disturb the other callers of create_tic_alias()
+ * Yes! Excellent! Make it so!
+ */
+ split_alias = TRUE;
+ split_alias_message = INFO;
+ retval = create_split_alias(
+ new_name, old_name,
+ &global_voc_dict_ptr,
current_definitions );
- retval = TRUE;
+ }
+ }
+
+ if ( retval )
{
- tokenization_error( INFO,
+ if ( split_alias )
+ {
+ tokenization_error( split_alias_message,
"%s is a Global definition, but its alias, %s, "
"will only be defined %s",
strupr( old_name), new_name,
@@ -802,7 +878,6 @@
show_node_start();
}
}
- }
return ( retval );
}
@@ -1347,19 +1422,30 @@
*
* Process Explanation:
* We cannot rely on the "definer" field to indicate whether
- * it is a single-token entry; instead, we will look at
- * the associated function.
- * Keep this routine here to avoid needing to export the names
- * of the permitted functions or their synonymous macros.
- * If we ever need to change it, we can do so at a single
- * point of maintenance.
- * Because the entry might have been found in the initial list
- * of entries to the "FCode-Tokens" list, we need to check
- * whether the associated function is either the general
- * single-token emitting function, FC_TOKEN_FUNC , or the
- * function OBSO_FC_FUNC , which presents a message before
- * emitting, but is still a valid single-token function.
+ * it is a single-token entry, and there too many possible
+ * associated functions to be practical; instead we will
+ * look at the is_token flag of the data structure.
*
+ * Revision History:
+ * Updated Mon, 25 Sep 2006 by David L. Paktor
+ * Previously operated by examining the function associated
+ * with the entry, accepting the general single-token
+ * emitting function, FC_TOKEN_FUNC , and later adding
+ * the function OBSO_FC_FUNC , which presents a message
+ * before emitting. Now the functions that present a
+ * message before emitting might be about to proliferate,
+ * rendering this implementation strategy impractical (i.e.,
+ * ugly to code and too attention-demanding to maintain)
+ * Instead, I will introduce a flag into the TIC-entry
+ * data-structure and rely on it.
+ * Updated Wed, 11 Oct 2006 by David L. Paktor
+ * Discarded plan to have functions that present a "Trace-Note"
+ * message prior to performing their other duties (just too
+ * unwieldly all around) in favor of adding a "tracing" flag
+ * to the TIC_HDR data-structure. Could have gone back to
+ * doing this the other way, but this is so much neater a
+ * solution that I'm keeping it.
+ *
**************************************************************************** */
bool entry_is_token( tic_hdr_t *test_entry )
@@ -1367,11 +1453,7 @@
bool retval = FALSE;
if ( test_entry != NULL )
{
- if ( ( test_entry->funct == FC_TOKEN_FUNC ) ||
- ( test_entry->funct == OBSO_FC_FUNC ) )
- {
- retval = TRUE;
- }
+ retval = test_entry->is_token;
}
return ( retval );
}
@@ -1836,9 +1918,10 @@
* Inputs:
* Parameters: NONE
* Global Variables:
+ * current_device_node Vocab struct of current dev-node
+ * Local Static Variables:
* global_voc_reset_ptr Position to which to reset
* the "Global" Vocabulary
- * current_device_node Vocab struct of current dev-node
*
* Outputs:
* Returned Value: NONE
Modified: fcode-utils/toke/emit.c
===================================================================
--- fcode-utils/toke/emit.c 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/emit.c 2006-10-30 09:48:28 UTC (rev 100)
@@ -30,6 +30,19 @@
* Modifications Author: David L. Paktor dlpaktor(a)us.ibm.com
**************************************************************************** */
+/* **************************************************************************
+ *
+ * Still to be done:
+ * Re-arrange routine and variable locations to clarify the
+ * functions of this file and its companion, stream.c
+ * This file should be concerned primarily with management
+ * of the Outputs; stream.c should be primarily concerned
+ * with management of the Inputs.
+ * Hard to justify, pragmatically, but will make for easier
+ * maintainability down the proverbial road...
+ *
+ **************************************************************************** */
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -58,6 +71,20 @@
/* **************************************************************************
*
+ * Global Variables Exported:
+ * opc Output Buffer Position Counter
+ * pci_hdr_end_ob_off Offsets into Output Buffer of end
+ * of last PCI Header Block structure
+ * (To help match up the offset printed in Tokenization_error()
+ * with the offsets shown by the DeTokenizer)
+ *
+ **************************************************************************** */
+
+unsigned int opc = 0;
+unsigned int pci_hdr_end_ob_off = 0; /* 0 means "Not initialized" */
+
+/* **************************************************************************
+ *
* Macro to zero-fill a field of the size of the given structure
* into the Output Buffer using the emit_byte() routine.
*
@@ -113,8 +140,8 @@
/* **************************************************************************
*
* Function name: init_emit
- * Synopsis: Initialize Local Static Variables before starting
- * Output.
+ * Synopsis: Initialize Output-related Local Static and Global
+ * Variables before starting Output.
* Exposure as Limited as possible.
*
**************************************************************************** */
@@ -126,6 +153,8 @@
fcode_body_ob_off = -1;
pci_hdr_ob_off = -1;
pci_data_blk_ob_off = -1;
+ opc = 0;
+ pci_hdr_end_ob_off = 0;
fcode_written = FALSE;
haveend = FALSE; /* Get this one too... */
}
@@ -462,13 +491,19 @@
* Inputs:
* Parameters: NONE
* Global Variables:
+ * opc Output Buffer Position Counter
* fcode_start_ob_off Initted if FCode output has begun
* noerrors The "Ignore Errors" flag
*
* Outputs:
* Returned Value: NONE
* Global Variables:
- * FCode Output buffer:
+ * pci_hdr_end_ob_off Set to the Output Buffer Position
+ * Counter after the PCI Header
+ * FCode Output buffer
+ * :The beginning of the PCI Header will be entered, waiting for
+ * the fields that could not be determined until the end
+ * to be filled in.
*
* Error Detection:
* An attempt to write a PCI Header after FCode output -- either an
@@ -496,6 +531,8 @@
emit_pci_rom_hdr();
emit_pci_data_block();
+
+ pci_hdr_end_ob_off = opc;
}
/* **************************************************************************
@@ -561,8 +598,18 @@
pci_hdr_ob_off = -1;
pci_data_blk_ob_off = -1;
+ pci_hdr_end_ob_off = 0;
}
+
+/* **************************************************************************
+ *
+ * Function name: finish_headers
+ * Synopsis: Fill-in the fields of the FCode- and PCI- Headers
+ * that could not be determined until the end.
+ *
+ *************************************************************************** */
+
void finish_headers(void)
{
if (fcode_hdr_ob_off != -1) finish_fcodehdr();
Modified: fcode-utils/toke/emit.h
===================================================================
--- fcode-utils/toke/emit.h 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/emit.h 2006-10-30 09:48:28 UTC (rev 100)
@@ -96,6 +96,15 @@
/* ************************************************************************** *
*
+ * Global Variables Exported
+ *
+ **************************************************************************** */
+
+extern unsigned int opc;
+extern unsigned int pci_hdr_end_ob_off;
+
+/* ************************************************************************** *
+ *
* Function Prototypes / Functions Exported:
*
**************************************************************************** */
Modified: fcode-utils/toke/errhandler.c
===================================================================
--- fcode-utils/toke/errhandler.c 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/errhandler.c 2006-10-30 09:48:28 UTC (rev 100)
@@ -59,7 +59,15 @@
*
**************************************************************************** */
+/* **************************************************************************
+ *
+ * Revision History:
+ * Updated Fri, 13 Oct 2006 by David L. Paktor
+ * Added "(Output Position ..." to standard message format.
+ *
+ **************************************************************************** */
+
/* **************************************************************************
*
* We will define a set of bit-valued error-types and a
@@ -89,13 +97,18 @@
* It's a deprecated feature, or one
* that might be incompatible with
* other standard tokenizers.
+ *
+ * Other types of Messages fall into these broad categories:
* INFO Nothing is changed in processing, but
- * an advisory is still in order.
+ * an advisory is still in order. Omitted
+ * if "verbose" is not specified.
* MESSAGE Message generated by the user. (Complete;
* new-line will be added by display routine.)
* P_MESSAGE Partial Message -- Instigated by user, but
* pre-formatted and not complete. New-line
* will be added by follow-up routine.
+ * TRACER Message related to the trace-symbols option;
+ * either a creation or an invocation message.
*
**************************************************************************** */
@@ -108,6 +121,7 @@
#include "types.h"
#include "toke.h"
#include "stream.h"
+#include "emit.h"
#include "errhandler.h"
#include "scanner.h"
@@ -118,6 +132,9 @@
* lineno Current line-number being processed
* noerrors "Ignore Errors" flag, set by "-i" switch
* opc FCode Output Buffer Position Counter
+ * pci_hdr_end_ob_off
+ * Position in FCode Output Buffer of
+ * end of last PCI Header Block structure
* verbose If true, enable Advisory Messages
*
**************************************************************************** */
@@ -139,6 +156,7 @@
* warn_count Count of Warning Messages
* info_count Count of "Advisory" Messages
* user_msg_count Count of User-generated Messages
+ * trace_msg_count Count of Trace-Note Messages
* fatal_err_exit Exit code to be used for "Fatal" error.
* This is a special accommodation
* for the safe_malloc routine.
@@ -147,12 +165,13 @@
static bool print_msg ;
static int errs_to_print = ( FATAL | TKERROR | WARNING |
- MESSAGE | P_MESSAGE | FORCE_MSG ) ;
+ MESSAGE | P_MESSAGE | TRACER | FORCE_MSG ) ;
static int err_types_found = 0 ;
static int err_count = 0 ;
static int warn_count = 0 ;
static int info_count = 0 ;
static int user_msg_count = 0 ;
+static int trace_msg_count = 0 ;
static int fatal_err_exit = -1 ;
static FILE *message_dest; /* Would like to init to ERRMSG_DESTINATION
* here, but the compiler complains...
@@ -186,15 +205,14 @@
{ WARNING, "Warning" , "", "s", &warn_count , FALSE },
{ INFO, "Advisor" , "y", "ies", &info_count , FALSE },
{ MESSAGE , "Message" , "", "s", &user_msg_count , TRUE },
- { P_MESSAGE , "Message" , "", "s", &user_msg_count , FALSE }
+ { P_MESSAGE , "Message" , "", "s", &user_msg_count , FALSE },
+ { TRACER , "Trace-Note" , "", "s", &trace_msg_count , FALSE }
};
static const int num_categories =
( sizeof(error_categories) / sizeof(err_category) );
-#ifdef NEEDS_STRUPR
-
/* **************************************************************************
*
* Function name: toup
@@ -328,8 +346,6 @@
}
-#endif /* NEEDS_STRUPR */
-
/* **************************************************************************
*
* Function name: init_error_handler
@@ -359,6 +375,7 @@
* warn_count Count of Warning Messages
* info_count Count of "Advisory" Messages
* user_msg_count Count of User-generated Messages
+ * trace_msg_count Count of Trace-Note Messages
* Other Exotic Effects:
* Flush stdout if Error message destination is not stdout, to
* avoid collisions with stderr once Error Messaging begins.
@@ -371,13 +388,18 @@
void init_error_handler( void)
{
+ int indx ;
+
message_dest = ERRMSG_DESTINATION;
if ( verbose ) errs_to_print |= INFO ;
err_types_found = 0 ;
- err_count = 0 ;
- warn_count = 0 ;
- info_count = 0 ;
- user_msg_count = 0 ;
+
+ /* Start at indx = 1 to skip resetting FATALs */
+ for ( indx = 1; indx < num_categories ; indx ++ )
+ {
+ *(error_categories[indx].counter) = 0 ;
+ }
+
FFLUSH_STDOUT
}
@@ -397,6 +419,11 @@
* iname Name of file currently being processed
* lineno Current line-number being processed
* fatal_err_exit Exit code for "Fatal" error, if applicable.
+ * opc FCode Output Buffer Position Counter
+ * pci_hdr_end_ob_off
+ * Position in FCode Output Buffer of end
+ * of last PCI Header Block structure
+
* Macro:
* ERRMSG_DESTINATION Error message destination;
* (Development-time switch)
@@ -444,6 +471,11 @@
* Error-Category string also identifies the applicable
* Category Counter; increment it.
* Of course, there's no return from a FATAL error; it exits.
+ * The Message will show:
+ * The Error-Category (always)
+ * The Input File-name and Line Number (if input file was opened)
+ * The Output Buffer Position (if output has begun)
+ * The PCI-Block Position (if different from Output Buffer Pos'n)
*
**************************************************************************** */
@@ -490,15 +522,25 @@
{
va_list argp;
+ fprintf(ERRMSG_DESTINATION, "%s%s: ",
+ catgy_name, catgy_suffx);
if ( iname != NULL )
{
- fprintf(ERRMSG_DESTINATION, "%s%s: File %s, Line %d. ",
- catgy_name, catgy_suffx, iname, lineno);
- }else{
/* Don't print iname or lineno if no file opened. */
- fprintf(ERRMSG_DESTINATION, "%s%s: ",
- catgy_name, catgy_suffx);
+ fprintf(ERRMSG_DESTINATION, "File %s, Line %d. ",
+ iname, lineno);
}
+ if ( opc > 0 )
+ {
+ /* Don't print Output Position if no output started. */
+ fprintf(ERRMSG_DESTINATION, "(Output Position = %d). ", opc);
+ }
+ if ( pci_hdr_end_ob_off > 0 )
+ {
+ /* Don't print PCI-Block Position if no PCI-Block in effect. */
+ fprintf(ERRMSG_DESTINATION, "(PCI-Block Position = %d). ",
+ opc - pci_hdr_end_ob_off );
+ }
va_start(argp, msg);
vfprintf(ERRMSG_DESTINATION, msg, argp);
@@ -618,7 +660,7 @@
if ( may_show_incolon )
{
- in_last_colon();
+ in_last_colon( TRUE );
}else{
fprintf(message_dest, "\n");
}
@@ -765,7 +807,10 @@
* Can be used to finish the line in either case.
*
* Inputs:
- * Parameters: NONE
+ * Parameters:
+ * say_in If TRUE, lead phrase with " in ".
+ * If FALSE, print even if not
+ * inside a Colon-def'n.
* Global Variables:
* incolon TRUE if Colon-definition is in progress
* last_colon_defname Name of last colon-definition
@@ -787,17 +832,17 @@
* Because this routine does some of its own printing, it needs
* to check the residual state of print_msg first.
* The calling routine does not need to test incolon ; it can
- * call this to end the line in either case.
+ * call this (with TRUE) to end the line in either case.
*
**************************************************************************** */
-void in_last_colon( void )
+void in_last_colon( bool say_in )
{
if ( print_msg )
{
- if ( incolon )
+ if ( incolon || ( ! say_in ) )
{
- fprintf( message_dest, " in definition of %s ",
+ fprintf( message_dest, "%s definition of %s ", say_in ? " in" : "",
strupr( last_colon_defname) );
print_where_started( TRUE, FALSE,
last_colon_filename, last_colon_lineno, FALSE);
Modified: fcode-utils/toke/errhandler.h
===================================================================
--- fcode-utils/toke/errhandler.h 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/errhandler.h 2006-10-30 09:48:28 UTC (rev 100)
@@ -44,6 +44,7 @@
#define TKERROR 0x04000000
#define WARNING 0x00200000
#define INFO 0x00010000
+#define TRACER 0x00008000
#define MESSAGE 0x00000800
#define P_MESSAGE 0x00000040
#define FORCE_MSG 0x00000001
@@ -55,7 +56,7 @@
void just_started_at( char * saved_ifile, unsigned int saved_lineno);
void where_started( char * saved_ifile, unsigned int saved_lineno);
void just_where_started( char * saved_ifile, unsigned int saved_lineno);
-void in_last_colon( void );
+void in_last_colon( bool say_in );
_PTR safe_malloc( size_t size, char *phrase);
bool error_summary( void ); /* Return TRUE if OK to produce output. */
@@ -88,17 +89,7 @@
#define FFLUSH_STDOUT /* Don't need to do anything here */
#endif /* Switchable error-message destination */
-/* Some systems don't seem to have strupr */
-#ifdef SYS_IS_GNU_Linux
-#define NEEDS_STRUPR
-#endif /* SYS_IS_GNU_Linux */
-#ifdef SYS_IS_AIX
-#define NEEDS_STRUPR
-#endif /* SYS_IS_AIX */
-/* ??? Should this instead be tuned to Proc'r is PPC ??? Why? */
-#ifdef NEEDS_STRUPR
-
/* **************************************************************************
*
* A necessary hack for systems that don't seem
@@ -114,6 +105,4 @@
#define strlwr strlower
-#endif /* NEEDS_STRUPR */
-
#endif /* _TOKE_ERRHANDLER_H */
Modified: fcode-utils/toke/flowcontrol.c
===================================================================
--- fcode-utils/toke/flowcontrol.c 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/flowcontrol.c 2006-10-30 09:48:28 UTC (rev 100)
@@ -479,7 +479,7 @@
retval = FALSE;
tokenization_error ( TKERROR,
"Control-Stack underflow at %s", strupr(statbuf) );
- in_last_colon();
+ in_last_colon( TRUE);
not_cs_underflow = FALSE; /* See expl'n early on in this file */
}
Modified: fcode-utils/toke/macros.c
===================================================================
--- fcode-utils/toke/macros.c 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/macros.c 2006-10-30 09:48:28 UTC (rev 100)
@@ -57,13 +57,13 @@
#include <string.h>
#include <errno.h>
+#include "macros.h"
#include "errhandler.h"
#include "ticvocab.h"
#include "stream.h"
#include "scanner.h"
#include "dictionary.h"
#include "devnode.h"
-#include "macros.h"
/* **************************************************************************
*
@@ -297,7 +297,15 @@
BUILTIN_MACRO( "blank", "bl fill") ,
BUILTIN_MACRO( "carret", "h# d") ,
BUILTIN_MACRO( ".d", "base @ swap h# a base ! . base !") ,
- BUILTIN_MACRO( "decode-bytes", ">r over r@ + swap r@ - rot r>") ,
+
+ /* Note: The Standard gives: ">r over r@ + swap r@ - rot r>"
+ * as its example of the macro for decode-bytes
+ * But here's one that does the same thing without
+ * using return-stack operations. And it's one step
+ * shorter, into the bargain!
+ */
+ BUILTIN_MACRO( "decode-bytes", "tuck - -rot 2dup + swap 2swap rot") ,
+
BUILTIN_MACRO( "3drop", "drop 2drop") ,
BUILTIN_MACRO( "3dup", "2 pick 2 pick 2 pick") ,
BUILTIN_MACRO( "erase", "0 fill") ,
@@ -473,9 +481,6 @@
tic_hdr_t **target_vocab = current_definitions;
if ( in_tokz_esc ) target_vocab = &tokz_esc_vocab ;
- warn_if_duplicate( macroname);
- trace_creation( MACRO_DEF, macroname);
-
/* Tack on a new-line, so that a remark will appear
* to be properly terminated. This might trigger
* an undeserved multi-line warning if the Macro
@@ -489,7 +494,7 @@
add_tic_entry( macroname, EVAL_MAC_FUNC,
(TIC_P_DEFLT_TYPE)macrobody,
- MACRO_DEF, mac_body_len,
+ MACRO_DEF, mac_body_len, FALSE,
EVAL_MAC_FUNC, target_vocab );
failure = FALSE;
}
Modified: fcode-utils/toke/nextfcode.c
===================================================================
--- fcode-utils/toke/nextfcode.c 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/nextfcode.c 2006-10-30 09:48:28 UTC (rev 100)
@@ -556,8 +556,6 @@
* Inputs:
* Parameters:
* test_fcode FCode to be tested
- * Global Variables:
- *
* Local Static Variables:
* ranges_exist If not TRUE, no need to test
* first_fc_range Start of Ranges to test
@@ -610,7 +608,7 @@
* Parameters:
*
* Global Variables:
- * nextfcode
+ * nextfcode The FCode-number to be assigned
* Local Static Variables:
* ranges_exist TRUE if FCode Ranges have been created
* first_fc_range First entry in linked list of Ranges.
@@ -618,7 +616,6 @@
*
* Outputs:
* Returned Value: NONE
- * Global Variables:
* Local Static Variables:
* changes_listed Reset to FALSE
* One of these two will be set to nextfcode
Modified: fcode-utils/toke/parselocals.c
===================================================================
--- fcode-utils/toke/parselocals.c 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/parselocals.c 2006-10-30 09:48:28 UTC (rev 100)
@@ -78,15 +78,18 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+
+#include "parselocals.h"
#include "ticvocab.h"
#include "dictionary.h"
#include "scanner.h"
-#include "parselocals.h"
#include "errhandler.h"
#include "clflags.h"
#include "stream.h"
+#include "emit.h"
#include "devnode.h"
#include "flowcontrol.h"
+#include "tracesyms.h"
/* **************************************************************************
*
@@ -335,8 +338,8 @@
lnamecopy = strdup( lname);
add_tic_entry( lnamecopy, invoke_local, lnum,
- LOCAL_VAL, 0, NULL, &local_names );
- trace_creation( LOCAL_VAL, lname);
+ LOCAL_VAL, 0, FALSE, NULL,
+ &local_names );
}
@@ -423,7 +426,7 @@
tokenization_error ( TKERROR,
"Excess separator -- %s -- found "
"in Local-Values declaration", statbuf);
- in_last_colon();
+ in_last_colon( TRUE);
continue;
}
}
@@ -570,7 +573,7 @@
if ( last_local_colon == lastcolon )
{
tokenization_error ( TKERROR, "Excess Locals Declaration");
- in_last_colon();
+ in_last_colon( TRUE);
retval = TRUE;
}else{
last_local_colon = lastcolon;
Modified: fcode-utils/toke/scanner.c
===================================================================
--- fcode-utils/toke/scanner.c 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/scanner.c 2006-10-30 09:48:28 UTC (rev 100)
@@ -82,6 +82,9 @@
bool haveend = FALSE; /* TRUE if the "end" code was read. */
int do_loop_depth = 0; /* How deep we are inside DO ... LOOP variants */
+/* State of headered-ness for name-creation */
+headeredness hdr_flag = FLAG_HEADERLESS ; /* Init'l default state */
+
/* Used for error-checking of IBM-style Locals */
int lastcolon; /* Location in output stream of latest colon-definition. */
@@ -92,6 +95,10 @@
bool report_multiline = TRUE; /* False to suspend multiline warning */
unsigned int last_colon_abs_token_no;
+ /* Shared phrases */
+char *in_tkz_esc_mode = "in Tokenizer-Escape mode.\n";
+char *wh_defined = ", which is defined as a ";
+
/* **************************************************************************
* Local variables
**************************************************************************** */
@@ -103,13 +110,6 @@
static unsigned int last_colon_do_depth = 0;
-/* State of headered-ness for name-creation */
-typedef enum headeredness_t {
- FLAG_HEADERLESS ,
- FLAG_EXTERNAL ,
- FLAG_HEADERS } headeredness ;
-static headeredness hdr_flag = FLAG_HEADERLESS ; /* Init'l default state */
-
/* Local variables having to do with: */
/* ... the state of the tokenization */
static bool is_instance = FALSE; /* Is "instance" is in effect? */
@@ -133,10 +133,7 @@
/* Has a gap developed between "instance" and its application? */
static bool instance_definer_gap = FALSE;
- /* Shared phrases */
-static char *in_tkz_esc_mode = "in Tokenizer-Escape mode.\n";
-
/* **************************************************************************
*
* Function name: skip_ws
@@ -821,7 +818,7 @@
unterm_is_colon = FALSE;
}else{
tokenization_error( severity, "Unterminated %s", something);
- in_last_colon();
+ in_last_colon( TRUE);
}
lineno = tmp;
}
@@ -1349,7 +1346,8 @@
* -delimiting whitespace character. Regard any sub-
* sequent whitespace characters as part of the string
*/
- if (*pc++=='\n') lineno++;
+ if ( *pc == '\n' ) lineno++;
+ pc++;
got_until_eof = TRUE ;
@@ -1564,7 +1562,8 @@
{
if ( *pc != '\n') pc++;
}else{
- if (*pc++=='\n') lineno++;
+ if ( *pc == '\n' ) lineno++;
+ pc++;
multiline_start = lineno;
check_multiline = TRUE;
}
@@ -1914,7 +1913,7 @@
*
* Outputs:
* Returned Value: None
- * Local Static Variables:
+ * Global Variables:
* hdr_flag Adjusted to new setting
*
* Process Explanation:
@@ -2161,7 +2160,7 @@
tokenization_error( TKERROR,
"%s outside of %s structure", strupr(statbuf), deep_do);
- in_last_colon();
+ in_last_colon( TRUE);
}
}
@@ -2288,7 +2287,7 @@
tokenization_error( WARNING,
"Possible Return-Stack %s before %s", what_flow, what_phr);
- in_last_colon();
+ in_last_colon( TRUE);
if ( clear_it )
{
@@ -2335,7 +2334,7 @@
"Possible Return-Stack access attempt by %s "
"without value having been placed there",
strupr(statbuf) );
- in_last_colon();
+ in_last_colon( TRUE);
}
}
@@ -2462,7 +2461,7 @@
*
**************************************************************************** */
-static bool definer_name(fwtoken definer, char **reslt_ptr)
+bool definer_name(fwtoken definer, char **reslt_ptr)
{
bool retval = TRUE;
switch (definer)
@@ -2533,6 +2532,11 @@
* are needed, they, too, are the responsibility of the
* calling routine. The return value gives a helpful clue.
*
+ * Extraneous Remarks:
+ * We define a Macro -- kept in scanner.h --that will give the
+ * recommended length for the buffer passed to this routine.
+ * It will be called AS_WHAT_BUF_SIZE
+ *
**************************************************************************** */
bool as_a_what( fwtoken definer, char *as_what)
@@ -2639,7 +2643,7 @@
*
**************************************************************************** */
-static char lookup_where_pt1_buf[32];
+static char lookup_where_pt1_buf[AS_WHAT_BUF_SIZE];
tic_hdr_t *lookup_word( char *stat_name, char **where_pt1, char **where_pt2 )
{
@@ -2883,7 +2887,10 @@
*
* Outputs:
* Returned Value: NONE
- * Printout: Error message. Possible Advisory about
+ * Printout:
+ * Error message.
+ * Possible Advisory about where the word might be found.
+ * Trace-Note, if the word was on the Trace-List
*
* Error Detection:
* Error was detected by the calling routine...
@@ -2911,6 +2918,8 @@
bool sav_in_tokz_esc = in_tokz_esc;
in_tokz_esc = INVERSE(sav_in_tokz_esc);
+ traced_name_error( stat_name);
+
found_somewhere = word_exists( stat_name, &where_pt1, &where_pt2);
if ( found_somewhere )
{
@@ -3073,88 +3082,6 @@
/* **************************************************************************
*
- * Function name: trace_creation
- * Synopsis: If the word being created is on the Trace List,
- * display the appropriate message
- *
- * Inputs:
- * Parameters:
- * definer Internal token for the defining-word
- * nu_name The word being created
- * Global Variables:
- * verbose No point in doing all this if we're
- * not showing the message anyway...
- * in_tokz_esc TRUE if we are in Tokenizer-Escape mode
- * scope_is_global TRUE if "global" scope is in effect
- * current_device_node Current dev-node data-struct
- *
- * Outputs:
- * Returned Value: NONE
- * Printout:
- * Advisory Message, if the word is on the Trace List.
- *
- * Process Explanation:
- * The order of scope-checking is important:
- * A Local has no scope beyond the definition in which it occurs.
- * Tokenizer-Escape mode supercedes "Normal" mode, and renders
- * moot the differences between Global and Device scope.
- * Global scope is mutually exclusive with Device scope.
- * Device scope needs to identify where the Current device-node
- * began.
- *
- **************************************************************************** */
-
-void trace_creation( fwtoken definer, char *nu_name)
-{
- if ( verbose )
- {
- if ( is_on_trace_list( nu_name) )
- {
- char as_what[96] = "";
- bool show_last_colon = BOOLVAL( definer == LOCAL_VAL);
-
- as_a_what( definer, as_what); /* No need to check return value. */
-
- /* Scope-checking starts here, unless show_last_colon is TRUE.
- * Come out of this with as_what[] filled up and
- * terminated with a new-line, if appropriate,
- */
- while ( ! show_last_colon )
- {
- strcat( as_what, " ");
-
- if ( in_tokz_esc )
- {
- strcat( as_what, in_tkz_esc_mode);
- break;
- }
-
- if ( scope_is_global )
- {
- strcat( as_what, "with Global scope.\n");
- }else{
- /* In Device scope. Show the Current node. */
- strcat( as_what, in_what_node( current_device_node));
- }
- break;
-
- } /* Destination of BREAKs ... */
-
- tokenization_error(INFO, "Creating %s %s", nu_name, as_what);
-
- if ( show_last_colon )
- {
- in_last_colon();
- }else{
- show_node_start();
- }
-
- }
- }
-}
-
-/* **************************************************************************
- *
* Function name: create_word
* Synopsis:
*
@@ -3180,6 +3107,15 @@
* nextfcode Incremented (by bump_fcode() )
* statbuf Advanced to next symbol; must be re-read
* pc Advanced, then restored to previous value
+ * define_token Normally TRUE. Made FALSE if the definition
+ * occurs inside a control-structure, (which
+ * is an Error); we allow the definition to
+ * proceed (so as to avoid "cascade" errors
+ * and catch other errors normally) but we
+ * suppress adding its token to the vocab,
+ * "hiding" it and "revealing" it (because
+ * there's nothing to hide).
+ * NOTE: Make this a Global. Use it in the routines it controls...
* Memory Allocated
* Copy of the name being defined, by support routine.
* Copy of input-source file name, for error-reporting
@@ -3249,8 +3185,9 @@
{
char defn_type_buffr[32] = "";
unsigned int old_lineno = lineno; /* For error message */
- bool define_token = TRUE;
+ define_token = TRUE;
+
{ /* Set up definition-type text for error-message */
/* No need to check the return value */
@@ -3280,20 +3217,17 @@
}else{
bool emit_token_name = TRUE;
- /* Handle Tracing of new definitions */
- trace_creation( definer, statbuf);
-
/* Other Error or Warnings as applicable */
validate_instance( definer);
- warn_if_duplicate( statbuf);
- check_name_length( wlen);
/* Bump FCode; error-check as applicable */
assigning_fcode();
/* Define the new token, unless disallowed */
- add_to_current( statbuf, nextfcode, definer, define_token);
+ add_to_current( statbuf, nextfcode, definer);
+ check_name_length( wlen);
+
/* Emit appropriate FCodes: Type of def'n, */
switch ( hdr_flag )
{
@@ -3375,7 +3309,7 @@
static void cannot_apply( char *func_nam, char *targ_nam, fwtoken defr)
{
char *defr_name = "" ;
- const char *defr_phrase = ", which is defined as a " ;
+ char *defr_phrase = wh_defined ;
if ( ! definer_name(defr, &defr_name) )
{
@@ -3797,24 +3731,29 @@
* Outputs:
* Returned Value: TRUE if successful (i.e., no error)
* Supplied Pointers:
- * *tok_entry The token entry, if no error
+ * *tok_entry The token entry, if no error.
+ * Unchanged if error.
* Global Variables:
* statbuf The next word in the input stream
* pc Restored to previous value if error
+ * Other Effects:
+ * Display Invocation Message if entry found and is being Traced
*
* Error Detection:
* The next word in the input stream is expected to be on the
* same line as the directive. The get_word_in_line()
* routine will check for that.
- * If the next word in the input stream is not a symbol
- * for which a single-token FCode number is assigned,
- * report an ERROR and restore PC to its previous value.
+ * If the next word in the input stream is a known symbol, but
+ * not one for which a single-token FCode number is assigned,
+ * report an ERROR and restore PC to its previous value. The
+ * supplied pointer tok_entry will remain unaltered.
*
**************************************************************************** */
static bool get_token(tic_hdr_t **tok_entry)
{
bool retval = FALSE;
+ tic_hdr_t *found;
u8 *save_pc;
/* Copy of command being processed, for error message */
@@ -3837,8 +3776,8 @@
* need to search again, specifically within the list
* of FCode Tokens.
*/
- *tok_entry = lookup_with_definer( statbuf, &defr);
- if ( *tok_entry != NULL )
+ found = lookup_with_definer( statbuf, &defr);
+ if ( found != NULL )
{
/* Built-in FWords can be uniquely identified by their
* definer, BI_FWRD_DEFN . The definer for "shared"
@@ -3848,15 +3787,19 @@
*/
if ( defr == BI_FWRD_DEFN )
{
- *tok_entry = lookup_token( statbuf);
- retval = BOOLVAL( *tok_entry != NULL );
+ found = lookup_token( statbuf);
+ retval = BOOLVAL( found != NULL );
}else{
- retval = entry_is_token( *tok_entry);
+ retval = entry_is_token( found);
}
}
- if ( INVERSE( retval) )
+ handle_invocation( found);
+
+ if ( retval)
{
+ *tok_entry = found;
+ }else{
cannot_apply( cmnd_cpy, strupr(statbuf), defr );
pc = save_pc;
}
@@ -4180,9 +4123,7 @@
* Two words will be read.
*
* Outputs:
- * Returned Value: TRUE if succeeded.
- * Global Variables:
- * statbuf New name will be copied back into here.
+ * Returned Value: NONE
* Memory Allocated
* The two words will be copied into freshly-allocated memory
* that will be passed to the create_..._alias() routine.
@@ -4195,16 +4136,15 @@
* If the ALIAS command was given during colon-definition, that
* can be handled by this tokenizer, but it is not supported
* by IEEE 1275-1994. Issue a WARNING.
- * If the new name is a copy of an existing word-name, issue a warning.
* If the word to which an alias is to be created does not exist
* in the appropriate mode -- relative to "Tokenizer-Escape" --
* that is an ERROR.
* If "instance" is in effect, the ALIAS command is an ERROR.
+ * Duplicate-name Warning is handled by support-routine.
*
* Process Explanation:
* Get two words -- the new name and the "old" word -- from the
* same line of input as the ALIAS command.
- * Copy the new name back into statbuf for use in trace_creation.
* Determine whether or not we are in "Tokenizer-Escape" mode.
* Subsequent searches will take place in that same mode.
* If the "new" name already exists, issue a warning.
@@ -4234,10 +4174,15 @@
* Revision History:
* Updated Tue, 10 Jan 2006 by David L. Paktor
* Convert to tic_hdr_t type vocabularies.
+ * Updated Fri, 22 Sep 2006 by David L. Paktor
+ * Move the warn_if_duplicate() call to the calling routine.
+ * Updated Wed, 11 Oct 2006 by David L. Paktor
+ * Move the Tracing and Duplicate-Warning message functions
+ * into support routine.
*
**************************************************************************** */
-static bool create_alias( void )
+static void create_alias( void )
{
char *new_alias ;
@@ -4257,30 +4202,6 @@
{
char *old_name = strdup((char *)statbuf) ;
- /* Copy the "new" alias name back into statbuf.
- * This is a HACK ^H^H^H^H awkward way to retrofit
- * support for the trace_creation() function.
- */
- strcpy( statbuf, new_alias);
-
- /* We don't call trace_creation() here because we don't
- * know if the creation succeeded. However, we want
- * to issue a "Duplicate" warning based on the attempt,
- * even if it doesn't succeed.
- * We would prefer to have the "Trace" message precede the
- * "Duplicate" warning, but we don't think it's worth
- * the effort. When it becomes worthwhile, the way to
- * do it would be to factor out the block that handles
- * normal-tokenization versus "Tokenizer-Escape" mode;
- * condition the "Trace" message on its success-return,
- * show the "Duplicate" warning in any case, then show
- * the error-message and do the cleanup conditioned on
- * a failure-return.
- * That will also obviate the need for a return value from
- * this routine and for the copy-back into statbuf.
- */
- warn_if_duplicate(new_alias);
-
/*
* Here is where we begin trying the create_..._alias()
* routines for the vocabularies.
@@ -4293,7 +4214,7 @@
if ( in_tokz_esc )
{
if ( create_tokz_esc_alias( new_alias, old_name) )
- return(TRUE);
+ return;
/*
* Handle the classes of operatives that are common between
@@ -4306,7 +4227,7 @@
if ( found != NULL )
{
if ( create_core_alias( new_alias, old_name) )
- return(TRUE);
+ return;
}
}
}else{
@@ -4314,7 +4235,7 @@
/* Can create aliases for "Locals", why not? */
if ( create_local_alias( new_alias, old_name) )
- return(TRUE);
+ return;
/*
* All other classes of operatives -- non-fcode forth
@@ -4325,19 +4246,19 @@
*/
if ( create_current_alias( new_alias, old_name) )
- return(TRUE);
+ return;
} /* End of separate handling for normal-tokenization mode
* versus "Tokenizer-Escape" mode
*/
/* It's not a word, a macro or any of that other stuff. */
+ trace_create_failure( new_alias, old_name, 0);
tokenized_word_error(old_name);
free(old_name);
}
free (new_alias);
}
- return(FALSE);
}
@@ -4443,6 +4364,9 @@
unsigned int sav_lineno = lineno; /* For error message */
bool handy_toggle = TRUE ; /* Various uses... */
+ bool handy_toggle_too = TRUE ; /* Various other uses... */
+ char *handy_string = "";
+ int handy_int = 0;
#ifdef DEBUG_SCANNER
printf("%s:%d: debug: tokenizing control word '%s'\n",
@@ -4594,10 +4518,7 @@
break;
case ALIAS:
- if ( create_alias() )
- {
- trace_creation( ALIAS, statbuf);
- }
+ create_alias();
break;
case CONTROL:
@@ -4916,19 +4837,21 @@
break;
case FUNC_NAME:
- if ( test_in_colon( statbuf, TRUE, TKERROR, NULL) )
- {
if ( in_tokz_esc )
{
+ if ( incolon )
+ {
tokenization_error( P_MESSAGE, "Currently" );
- in_last_colon();
}else{
+ tokenization_error( P_MESSAGE, "After" );
+ }
+ in_last_colon( incolon);
+ }else{
emit_token("b(\")");
emit_string( last_colon_defname,
strlen( last_colon_defname) );
/* if ( hdr_flag == FLAG_HEADERLESS ) { WARNING } */
}
- }
break;
case IFILE_NAME:
@@ -5066,19 +4989,56 @@
break;
case RET_STK_FETCH:
- ret_stk_access_rpt();
- emit_token( "r@");
- break;
-
+ /* handy_toggle controls reloading other "handy_"s
+ * handy_toggle_too controls calling ret_stk_access_rpt()
+ * handy_int, if non-zero, passed to bump_ret_stk_depth()
+ */
+ /* First in series doesn't need to check handy_toggle */
+ handy_string = "r@";
+ /* Will call ret_stk_access_rpt() */
+ /* handy_toggle_too is already TRUE */
+ /* Will not call bump_ret_stk_depth() */
+ /* handy_int is already zero */
+ handy_toggle = FALSE;
case RET_STK_FROM:
- ret_stk_access_rpt();
- bump_ret_stk_depth( -1);
- emit_token( "r>");
- break;
-
+ if ( handy_toggle )
+ {
+ handy_string = "r>";
+ /* Will call ret_stk_access_rpt() */
+ /* handy_toggle_too is already TRUE */
+ /* Will call bump_ret_stk_depth( -1) */
+ handy_int = -1;
+ handy_toggle = FALSE;
+ }
case RET_STK_TO:
- bump_ret_stk_depth( 1);
- emit_token( ">r");
+ if ( handy_toggle )
+ {
+ handy_string = ">r";
+ /* Will not call ret_stk_access_rpt() */
+ handy_toggle_too = FALSE;
+ /* Will call bump_ret_stk_depth( 1) */
+ handy_int = 1;
+ /* Last in series doesn't need to reset handy_toggle */
+ }
+
+ /* handy_toggle is now free for other use */
+ handy_toggle = allow_ret_stk_interp;
+ if ( ! handy_toggle )
+ {
+ handy_toggle = test_in_colon(statbuf, TRUE, TKERROR, NULL );
+ }
+ if ( handy_toggle || noerrors )
+ {
+ if ( handy_toggle_too )
+ {
+ ret_stk_access_rpt();
+ }
+ if ( handy_int != 0 )
+ {
+ bump_ret_stk_depth( handy_int);
+ }
+ emit_token( handy_string);
+ }
break;
case PCIHDR:
@@ -5490,6 +5450,10 @@
if ( found != NULL )
{
tic_found = found;
+ if ( found->tracing)
+ {
+ invoking_traced_name( found);
+ }
found->funct( found->pfield);
return ;
}
Modified: fcode-utils/toke/scanner.h
===================================================================
--- fcode-utils/toke/scanner.h 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/scanner.h 2006-10-30 09:48:28 UTC (rev 100)
@@ -61,6 +61,13 @@
extern bool haveend; /* TRUE if the "end" code was read. */
extern int do_loop_depth; /* How deep we are inside DO ... LOOP variants */
+/* State of headered-ness for name-creation */
+typedef enum headeredness_t {
+ FLAG_HEADERLESS ,
+ FLAG_EXTERNAL ,
+ FLAG_HEADERS } headeredness ;
+extern headeredness hdr_flag;
+
/* For special-case error detection or reporting */
extern int lastcolon; /* Loc'n in output stream of latest colon-def'n. */
/* Used for error-checking of IBM-style Locals */
@@ -70,6 +77,10 @@
extern bool report_multiline; /* False to suspend multiline warning */
extern unsigned int last_colon_abs_token_no;
+ /* Shared phrases */
+extern char *in_tkz_esc_mode;
+extern char *wh_defined;
+
/* ************************************************************************** *
*
* Function Prototypes / Functions Exported:
@@ -101,23 +112,27 @@
tic_hdr_t *lookup_word( char *stat_name, char **where_pt1, char **where_pt2 );
bool word_exists( char *stat_name, char **where_pt1, char **where_pt2 );
void warn_if_duplicate ( char *stat_name);
-void trace_creation( fwtoken definer, char *nu_name);
void tokenize_one_word( signed long wlen );
void check_name_length( signed long wlen );
+bool definer_name(fwtoken definer, char **reslt_ptr);
void tokenize( void );
/* **************************************************************************
*
- * Macro Name: FUNC_CPY_BUF_SIZE
- * Size of a temporary buffer to retain a copy of
- * a function name taken from statbuf, when statbuf
- * will be used to return a value, but the function
- * name might still be needed for an error message.
+ * Macros:
+ * FUNC_CPY_BUF_SIZE Recommended size of a temporary buffer to retain
+ * a copy of a function name taken from statbuf,
+ * when statbuf will be used to return a value,
+ * but the function name might still be needed for
+ * an error message.
+ * AS_WHAT_BUF_SIZE Recommended size of the buffer passed to the
+ * as_a_what() routine.
*
**************************************************************************** */
#define FUNC_CPY_BUF_SIZE 40
+#define AS_WHAT_BUF_SIZE 32
#endif /* _TOKE_SCANNER_H */
Modified: fcode-utils/toke/stream.c
===================================================================
--- fcode-utils/toke/stream.c 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/stream.c 2006-10-30 09:48:28 UTC (rev 100)
@@ -55,8 +55,23 @@
*
**************************************************************************** */
+
/* **************************************************************************
*
+ * Still to be done:
+ * Re-arrange routine and variable locations to clarify the
+ * functions of this file and its companion, emit.c
+ * This file should be concerned primarily with management
+ * of the Inputs; emit.c should be primarily concerned
+ * with management of the Outputs.
+ * Hard to justify, pragmatically, but will make for easier
+ * maintainability down the proverbial road...
+ *
+ **************************************************************************** */
+
+
+/* **************************************************************************
+ *
* Global Variables Exported
* start Start of input-source buffer
* end End of input-source buffer
@@ -64,7 +79,6 @@
* iname Current Input File name
* lineno Current Line Number in Input File
* ostart Start of Output Buffer
- * opc FCode Output Buffer Position Counter
* oname Output File name
*
**************************************************************************** */
@@ -86,8 +100,8 @@
/* output pointers */
u8 *ostart;
char *oname = NULL;
-unsigned int opc; /* Output Position Counter */
+
/* We want to limit exposure of this v'ble, so don't put it in .h file */
unsigned int olen; /* Length of Output Buffer */
/* We want to limit exposure of this Imported Function, likewise. */
@@ -1373,7 +1387,6 @@
olen = OUTPUT_SIZE;
ostart=safe_malloc(olen, "initting output buffer");
- opc = 0;
init_emit(); /* Init'l'zns needed by our companion file, emit.c */
printf("Binary output to %s ", oname);
@@ -1494,7 +1507,10 @@
unsigned int rea_len;
olen = olen * 2;
rea_len = olen;
- if ( rea_len == 0 ) rea_len = (unsigned int)-1;
+ if ( rea_len == 0 )
+ {
+ rea_len = (unsigned int)-1;
+ }
tokenization_error( INFO,
"Output Buffer overflow. "
"Relocating and increasing to %d bytes.\n", rea_len);
Modified: fcode-utils/toke/stream.h
===================================================================
--- fcode-utils/toke/stream.h 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/stream.h 2006-10-30 09:48:28 UTC (rev 100)
@@ -52,7 +52,6 @@
/* output pointers */
extern char *oname; /* output file name */
-extern unsigned int opc; /* output buffer position counter */
/* **************************************************************************
*
Modified: fcode-utils/toke/ticvocab.c
===================================================================
--- fcode-utils/toke/ticvocab.c 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/ticvocab.c 2006-10-30 09:48:28 UTC (rev 100)
@@ -102,8 +102,13 @@
#include <stdlib.h>
#include <string.h>
+
#include "ticvocab.h"
#include "errhandler.h"
+#include "tracesyms.h"
+#include "scanner.h"
+#include "devnode.h"
+#include "vocabfuncts.h"
tic_hdr_t *tic_found;
@@ -133,8 +138,10 @@
* precede this one in the voacbulary) gets entered into
* the link-pointer field of the first element of the array.
* For this reason, it is important that all TIC_HDR vocabulary
- * pointers that will be pased to this routine have their
+ * pointers that will be passed to this routine have their
* initial values explicitly declared NULL.
+ * If the user has asked to Trace any built-in name, the support
+ * routine will set its tracing field and dispay a message.
*
**************************************************************************** */
@@ -147,14 +154,16 @@
{
tic_vocab_tbl[indx].next = *tic_vocab_ptr;
*tic_vocab_ptr = &tic_vocab_tbl[indx];
+ trace_builtin( &tic_vocab_tbl[indx]);
}
}
/* **************************************************************************
*
- * Function name: add_tic_entry
- * Synopsis: Add an entry to the given TIC_HDR -type vocabulary
+ * Function name: make_tic_entry
+ * Synopsis: Construct a new entry to a TIC_HDR -type vocab-list
+ * but do not add it to a vocabulary
*
* Inputs:
* Parameters:
@@ -163,13 +172,15 @@
* tparam The "parameter field" value (may be a pointer)
* fw_defr FWord Token of the entry's Definer
* pfldsiz Size of "param field" (if a pointer to alloc'd mem)
+ * is_single TRUE if entry is a single-token FCode
* ign_fnc Pointer to "ignoring" routine for new entry
- * tic_vocab Pointer to ptr to "tail" of T.I.C.-type vocab-list
+ * trace_this TRUE if new entry is to be "Traced"
+ * tic_vocab Address of the variable that holds the latest
+ * pointer to the "tail" of the T.I.C.-type
+ * vocab-list to which we are adding.
*
* Outputs:
- * Returned Value: NONE
- * Supplied Pointers:
- * *tic_vocab Will point to new entry
+ * Returned Value: Pointer to the new entry
* Memory Allocated:
* For the new entry.
* When Freed?
@@ -183,18 +194,27 @@
* newly-allocated memory-space. If the parameter field is
* actually a pointer, it, too, is presumed to already have
* been allocated.
- * Memory will be allocated for the entry itself; its pointers
- * will be entered and the given pointer-to-the-tail-of-the-
- * -vocabulary will be updated to point to the new entry.
+ * Memory will be allocated for the entry itself and the given
+ * data will be placed into its fields.
*
+ * Extraneous Remarks:
+ * This is a retro-fit; it's a factor of the add_tic_entry()
+ * routine, whose functionality has been expanded to include
+ * issuing the Trace-Note and Duplication Warning messages.
+ * Having it separate allows it to be called (internally) by
+ * create_split_alias(), which has special requirements for
+ * its call to trace_creation()
+ *
**************************************************************************** */
-void add_tic_entry( char *tname,
+static tic_hdr_t *make_tic_entry( char *tname,
void (*tfunct)(),
TIC_P_DEFLT_TYPE tparam,
fwtoken fw_defr,
int pfldsiz,
+ bool is_single,
void (*ign_fnc)(),
+ bool trace_this,
tic_hdr_t **tic_vocab )
{
tic_hdr_t *new_entry;
@@ -205,9 +225,89 @@
new_entry->funct = tfunct;
new_entry->pfield.deflt_elem = tparam;
new_entry->fword_defr = fw_defr;
+ new_entry->is_token = is_single;
new_entry->ign_func = ign_fnc;
new_entry->pfld_size = pfldsiz;
+ new_entry->tracing = trace_this;
+ return( new_entry);
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: add_tic_entry
+ * Synopsis: Add an entry to the given TIC_HDR -type vocabulary;
+ * issue the Creation Tracing and Duplicate-Name
+ * messages as applicable.
+ *
+ * Inputs:
+ * Parameters:
+ * tname Pointer to space containing entry's new name
+ * tfunct Pointer to the routine the new entry will call
+ * tparam The "parameter field" value (may be a pointer)
+ * fw_defr FWord Token of the entry's Definer
+ * pfldsiz Size of "param field" (if a ptr to alloc'd mem)
+ * is_single TRUE if entry is a single-token FCode
+ * ign_fnc Pointer to "ignoring" routine for new entry
+ * NOTE: No trace_this param here; it's only in make_tic_entry()
+ * tic_vocab Address of the variable that holds the latest
+ * pointer to the "tail" of the T.I.C.-type
+ * vocab-list to which we are adding.
+ * Global Variables:
+ * scope_is_global TRUE if "global" scope is in effect
+ * (passed to "Trace-Creation" message)
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Supplied Pointers:
+ * *tic_vocab Will point to new entry
+ * Printout:
+ * "Trace-Creation" message
+ *
+ * Error Detection:
+ * Warning on duplicate name (subject to command-line control)
+ *
+ * Process Explanation:
+ * The entry itself will be created by the make_tic_entry() routine.
+ * This routine will test whether the new name is to be Traced,
+ * and will pass that datum to the make_tic_entry() routine.
+ * If the new name is to be Traced, issue a Creation Tracing message.
+ * (We want it to appear first). Use the new entry.
+ * Because this routine will not be called for creating aliases, the
+ * second param to trace_creation() is NULL.
+ * Do the duplicate-name check _before_ linking the new entry in to
+ * the given vocabulary. We don't want the duplicate-name test
+ * to find the name in the new entry, only in pre-existing ones...
+ * Now we're ready to update the given pointer-to-the-tail-of-the-
+ * -vocabulary to point to the new entry.
+ *
+ **************************************************************************** */
+
+void add_tic_entry( char *tname,
+ void (*tfunct)(),
+ TIC_P_DEFLT_TYPE tparam,
+ fwtoken fw_defr,
+ int pfldsiz,
+ bool is_single,
+ void (*ign_fnc)(),
+ tic_hdr_t **tic_vocab )
+{
+ bool trace_this = is_on_trace_list( tname);
+ tic_hdr_t *new_entry = make_tic_entry( tname,
+ tfunct,
+ tparam,
+ fw_defr, pfldsiz,
+ is_single,
+ ign_fnc,
+ trace_this,
+ tic_vocab );
+
+ if ( trace_this )
+ {
+ trace_creation( new_entry, NULL, scope_is_global);
+ }
+ warn_if_duplicate( tname);
*tic_vocab = new_entry;
}
@@ -221,6 +321,7 @@
* Parameters:
* tname The "target" name for which to look
* tic_vocab Pointer to the T. I. C. -type vocabulary
+ * in which to search
*
* Outputs:
* Returned Value: Pointer to the relevant entry, or
@@ -229,8 +330,8 @@
* Extraneous Remarks:
* We don't set the global tic_found here because this routine
* is not always called when the found function is going to
- * be executed; sometimes it is called for error-detection,
- * for instance...
+ * be executed; sometimes it is called for error-detection;
+ * for instance, duplicate-name checking...
*
**************************************************************************** */
@@ -282,9 +383,11 @@
/* **************************************************************************
*
- * Function name: create_tic_alias
- * Synopsis: Create an Alias in a TIC_HDR -type vocabulary
+ * Function name: create_split_alias
+ * Synopsis: Create an Alias in one TIC_HDR -type vocabulary
+ * for a word in (optionally) another vocabulary.
* Return a "success" flag.
+ * This is the work-horse for create_tic_alias()
*
* Associated FORTH word: ALIAS
*
@@ -292,18 +395,25 @@
* Parameters:
* old_name Name of existing entry
* new_name New name for which to create an entry
- * *tic_vocab Pointer to the "tail" of the
- * T. I. C. -type vocab-list
+ * *src_vocab Pointer to the "tail" of the "Source"
+ * TIC_HDR -type vocab-list
+ * *dest_vocab Pointer to the "tail" of the "Destination"
+ * TIC_HDR -type vocab-list
*
* Outputs:
- * Returned Value: TRUE if old_name found in given vocab
+ * Returned Value: TRUE if old_name found in "Source" vocab
* Supplied Pointers:
- * *tic_vocab Will be updated to point to the new entry
+ * *dest_vocab Will be updated to point to the new entry
* Memory Allocated:
* For the new entry, by the support routine.
* When Freed?
- * When reset_tic_vocab() is applied to the same vocab-list.
+ * When reset_tic_vocab() is applied to "Destination" vocab-list.
+ * Printout:
+ * "Trace-Creation" message
*
+ * Error Detection:
+ * Warning on duplicate name (subject to command-line control)
+ *
* Process Explanation:
* Both the "old" and "new" names are presumed to already point to
* stable, freshly allocated memory-spaces.
@@ -314,28 +424,92 @@
* the reference to the old space will work, and the old
* entry's param-field memory space will not be freed with
* the alias-entry but only with the "old" entry.
+ * We will do both the "Creation-Tracing" announcement and the
+ * Duplicate Name Warning here. "Tracing" happens either if
+ * the entry for the old name has its tracing flag set, or
+ * if the new name is on the trace-list. The "source" vocab
+ * and the "dest" vocab can only be different when the "old"
+ * name has defined Global scope. We will pass that along
+ * to the trace_creation() routine.
+ * We're doing the "Tracing" and Duplicate-Name functions because
+ * we're applying the "Tracing" message to the "old" name's
+ * entry. Because of this, we must call make_tic_entry() to
+ * bypass add_tic_entry(), which now does its own "Tracing"
+ * and Duplicate-Name functions on the new entry.
*
**************************************************************************** */
-bool create_tic_alias( char *new_name, char *old_name, tic_hdr_t **tic_vocab )
+bool create_split_alias( char *new_name, char *old_name,
+ tic_hdr_t **src_vocab, tic_hdr_t **dest_vocab )
{
tic_hdr_t *found ;
bool retval = FALSE;
- found = lookup_tic_entry( old_name, *tic_vocab );
+ found = lookup_tic_entry( old_name, *src_vocab );
if ( found != NULL )
{
- add_tic_entry( new_name, found->funct,
+ bool trace_it = found->tracing;
+ if ( ! trace_it )
+ {
+ trace_it = is_on_trace_list( new_name);
+ }
+ if ( trace_it )
+ {
+ bool old_is_global = BOOLVAL( src_vocab != dest_vocab );
+ trace_creation( found, new_name, old_is_global);
+ }
+ warn_if_duplicate( new_name);
+
+ *dest_vocab = make_tic_entry( new_name,
+ found->funct,
found->pfield.deflt_elem,
- found->fword_defr,
- 0, found->ign_func, tic_vocab );
+ found->fword_defr, 0,
+ found->is_token,
+ found->ign_func,
+ trace_it,
+ dest_vocab );
retval = TRUE;
}
return ( retval );
}
+/* **************************************************************************
+ *
+ * Function name: create_tic_alias
+ * Synopsis: Create an Alias in a TIC_HDR -type vocabulary
+ * Return a "success" flag.
+ *
+ * Associated FORTH word: ALIAS
+ *
+ * Inputs:
+ * Parameters:
+ * old_name Name of existing entry
+ * new_name New name for which to create an entry
+ * *tic_vocab Pointer to the "tail" of the
+ * T. I. C. -type vocab-list
+ *
+ * Outputs:
+ * Returned Value: TRUE if old_name found in given vocab
+ * Supplied Pointers:
+ * *tic_vocab Will be updated to point to the new entry
+ * Memory Allocated:
+ * For the new entry, by the support routine.
+ * When Freed?
+ * When reset_tic_vocab() is applied to the same vocab-list.
+ *
+ * Process Explanation:
+ * The given vocabulary is both the "Source" and the "Destination".
+ * Pass them both to create_split_alias.
+ **************************************************************************** */
+
+bool create_tic_alias( char *new_name, char *old_name, tic_hdr_t **tic_vocab )
+{
+ return ( create_split_alias( new_name, old_name, tic_vocab, tic_vocab ) );
+}
+
+
/* **************************************************************************
*
* Function name: handle_tic_vocab
Modified: fcode-utils/toke/ticvocab.h
===================================================================
--- fcode-utils/toke/ticvocab.h 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/ticvocab.h 2006-10-30 09:48:28 UTC (rev 100)
@@ -52,18 +52,24 @@
* The function may re-cast it as needed.
* (5) The "Definer" of the entry; a member of the subset of FWord-
* -tokens that may be Definers.
- * (6) A Pointer to a routine to be run when the word is encountered
+ * (6) A flag indicating whether the item is one for which a
+ * single-token FCode number is assigned.
+ * (7) A Pointer to a routine to be run when the word is encountered
* in a Conditional Compilation section that is being ignored.
* Certain functions still need to be recognized in that state,
* and will require special behaviors; those that can be simply
* ignored will have a NULL pointer in this field. The function
* in this field, also, takes the "parameter field" item as its
* argument and has no return-value.
- * (7) The size of the data pointed to by the "parameter field" item,
+ * (8) The size of the data pointed to by the "parameter field" item,
* if it is a pointer to allocated data; used to allocate space
* for a copy of the p.f. when making an alias, and to indicate
* whether the space needs to be freed. Automatic procedures
* are too often fooled, so we don't leave things to chance...
+ * (9) A flag, set TRUE if the word is on the Trace List, to indicate
+ * that an Invocation Message should be displayed when the word
+ * is invoked.
+ *
* To accommodate C's insistence on strong-typing, we might need
* to define different "parameter field" structure-types; see
* description of "Parameter Field as a union", below.
@@ -176,8 +182,10 @@
void (*funct)(); /* Function for active processing */
tic_param_t pfield;
fwtoken fword_defr; /* FWord Token of entry's Definer */
+ bool is_token; /* Is entry a single-token FCode? */
void (*ign_func)(); /* Function in "Ignored" segment */
int pfld_size;
+ bool tracing; /* TRUE if Invoc'n Msg required */
} tic_hdr_t ;
/* **************************************************************************
@@ -203,8 +211,10 @@
void (*funct)(); /* Function for active processing */
tic_fwt_param_t pfield;
fwtoken fword_defr; /* FWord Token of entry's Definer */
+ bool is_token; /* Is entry a single-token FCode? */
void (*ign_func)(); /* Function in "Ignored" segment */
int pfld_size;
+ bool tracing; /* TRUE if Invoc'n Msg required */
} tic_fwt_hdr_t ;
@@ -237,8 +247,10 @@
void (*funct)();
tic_mac_param_t pfield;
fwtoken fword_defr;
+ bool is_token; /* Is entry a single-token FCode? */
void (*ign_func)();
int pfld_size;
+ bool tracing; /* TRUE if Invoc'n Msg required */
} tic_mac_hdr_t ;
/* **************************************************************************
@@ -265,8 +277,10 @@
void (*funct)();
tic_bool_param_t pfield;
fwtoken fword_defr;
+ bool is_token; /* Is entry a single-token FCode? */
void (*ign_func)();
int pfld_size;
+ bool tracing; /* TRUE if Invoc'n Msg required */
} tic_bool_hdr_t ;
@@ -292,10 +306,12 @@
* Arguments:
* nam (string) Name of the entry as seen in the source
* func (routine-name) Name of internal function to call
+ * The item is not one for which single-token FCode number is assigned.
*
**************************************************************************** */
#define NO_PARAM_TIC(nam, func ) \
- { nam , (tic_hdr_t *)NULL , func , { 0 }, UNSPECIFIED , NULL , 0 }
+ { nam , (tic_hdr_t *)NULL , func , \
+ { 0 }, UNSPECIFIED , FALSE , NULL , 0 , FALSE }
/* **************************************************************************
@@ -307,11 +323,12 @@
* Arguments:
* nam (string) Name of the entry as seen in the source
* func (routine-name) Name of internal function to call for both
+ * The item is not one for which single-token FCode number is assigned.
*
- *
**************************************************************************** */
#define NO_PARAM_IGN(nam, func ) \
- { nam , (tic_hdr_t *)NULL , func , { 0 }, UNSPECIFIED , func , 0 }
+ { nam , (tic_hdr_t *)NULL , func , \
+ { 0 }, UNSPECIFIED , FALSE , func , 0 , FALSE }
/* **************************************************************************
@@ -331,14 +348,15 @@
* func (routine-name) Name of internal function to call
* pval (integer) The "param field" item
* definr (fword_token) "Definer" of the entry
+ * is_tok (bool) Is the "param" item a single-token FCode?
*
* The "param field" item will be recast to the required default type.
*
**************************************************************************** */
-#define VALPARAM_TIC(nam, func, pval, definr ) \
+#define VALPARAM_TIC(nam, func, pval, definr, is_tok ) \
{ nam , (tic_hdr_t *)NULL , func , \
- { (TIC_P_DEFLT_TYPE)(pval) }, definr , NULL , 0 }
+ { (TIC_P_DEFLT_TYPE)(pval) }, definr , is_tok , NULL , 0 , FALSE }
/* **************************************************************************
@@ -357,16 +375,17 @@
* definr (fword_token) "Definer" of the entry
*
* The "param field" item will be recast to the required default type.
+ * The item is not one for which single-token FCode number is assigned.
*
**************************************************************************** */
#define DUALFUNC_TIC(nam, afunc, pval, ifunc, definr ) \
{ nam , (tic_hdr_t *)NULL , afunc , \
- { (TIC_P_DEFLT_TYPE)(pval) }, definr , ifunc , 0 }
+ { (TIC_P_DEFLT_TYPE)(pval) }, definr , FALSE , ifunc , 0 , FALSE }
/* Similar but a tic_fwt_hdr_t type structure */
#define DUFNC_FWT_PARM(nam, afunc, pval, ifunc, definr ) \
{ nam , (tic_fwt_hdr_t *)NULL , afunc , \
- { (TIC_FWT_P_DEFLT_TYPE)(pval) }, definr , ifunc , 0 }
+ { (TIC_FWT_P_DEFLT_TYPE)(pval) }, definr , FALSE , ifunc , 0 , FALSE }
/* **************************************************************************
@@ -381,11 +400,13 @@
* definr (fword_token) "Definer" of the entry
*
* The "param field" item should not need be recast.
+ * The item is not one for which single-token FCode number is assigned.
*
**************************************************************************** */
#define FWORD_TKN_TIC(nam, func, fw_tokval, definr ) \
- { nam , (tic_fwt_hdr_t *)NULL , func , { fw_tokval }, definr , NULL , 0 }
+ { nam , (tic_fwt_hdr_t *)NULL , func , { fw_tokval }, \
+ definr , FALSE , NULL , 0 , FALSE }
/* **************************************************************************
* Macro Name: DUALFUNC_FWT_TIC
@@ -401,10 +422,12 @@
* definr (fword_token) "Definer" of the entry
*
* The "param field" item should not need be recast.
+ * The item is not one for which single-token FCode number is assigned.
*
**************************************************************************** */
#define DUALFUNC_FWT_TIC(nam, afunc, fw_tokval, ifunc, definr ) \
- { nam , (tic_fwt_hdr_t *)NULL , afunc , { fw_tokval }, definr , ifunc , 0 }
+ { nam , (tic_fwt_hdr_t *)NULL , afunc , { fw_tokval }, \
+ definr , FALSE , ifunc , 0 , FALSE }
/* **************************************************************************
* Macro Name: BUILTIN_MAC_TIC
@@ -420,11 +443,13 @@
* The "definer" will be MACRO_DEF
* Builtin Macros do not need to be expanded while Ignoring, so
* the ign_func will be NULL
+ * The item is not one for which single-token FCode number is assigned.
*
**************************************************************************** */
#define BUILTIN_MAC_TIC(nam, func, alias ) \
- { nam , (tic_mac_hdr_t *)NULL , func , { alias }, MACRO_DEF , NULL , 0 }
+ { nam , (tic_mac_hdr_t *)NULL , func , { alias }, \
+ MACRO_DEF , FALSE , NULL , 0 , FALSE }
/* **************************************************************************
@@ -441,12 +466,13 @@
* For all of the Condtionals, the "Ignoring" function is the same
* as the "Active" function.
* The "definer" will be COMMON_FWORD
+ * The item is not one for which single-token FCode number is assigned.
*
**************************************************************************** */
#define BUILTIN_BOOL_TIC(nam, func, bool_vbl ) \
{ nam , (tic_bool_hdr_t *)NULL , func , { &bool_vbl }, \
- COMMON_FWORD , func , 0 }
+ COMMON_FWORD , FALSE , func , 0 , FALSE }
/* **************************************************************************
@@ -465,14 +491,15 @@
TIC_P_DEFLT_TYPE tparam,
fwtoken fw_defr,
int pfldsiz,
+ bool is_single,
void (*ign_fnc)(),
tic_hdr_t **tic_vocab );
tic_hdr_t *lookup_tic_entry( char *tname, tic_hdr_t *tic_vocab );
bool exists_in_tic_vocab( char *tname, tic_hdr_t *tic_vocab );
bool handle_tic_vocab( char *tname, tic_hdr_t *tic_vocab );
-bool create_tic_alias( char *new_name,
- char *old_name,
- tic_hdr_t **tic_vocab );
+bool create_split_alias( char *new_name, char *old_name,
+ tic_hdr_t **src_vocab, tic_hdr_t **dest_vocab );
+bool create_tic_alias( char *new_name, char *old_name, tic_hdr_t **tic_vocab );
void reset_tic_vocab( tic_hdr_t **tic_vocab, tic_hdr_t *reset_position );
#endif /* _TOKE_TICVOCAB_H */
Modified: fcode-utils/toke/toke.c
===================================================================
--- fcode-utils/toke/toke.c 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/toke.c 2006-10-30 09:48:28 UTC (rev 100)
@@ -46,7 +46,8 @@
#include "stack.h"
#include "emit.h"
-#define TOKE_VERSION "1.0.1"
+#define TOKE_VERSION "1.0.2"
+#define TOKE_COPYRIGHT_DATE "2001-2006"
#include "vocabfuncts.h"
#include "scanner.h"
@@ -102,8 +103,8 @@
printf( "Welcome to toke - OpenBIOS tokenizer v" TOKE_VERSION "\n"
CORE_COPYR "\n" IBM_COPYR "\n"
"This program is free software; you may redistribute it "
- "under the terms of\nthe GNU General Public License v2. This "
- "program has absolutely no warranty.\n\n");
+ "under the terms of\nthe GNU General Public License v2. "
+ "This program has absolutely no warranty.\n\n");
#ifdef DEVEL
/* Temporary hack during development... */
printf( "\tTokenizer Compiled " DATE_STAMP "\n" );
@@ -352,6 +353,7 @@
list_cl_flag_settings();
display_include_list();
}
+ show_trace_list();
save_cl_flags();
}
@@ -378,6 +380,8 @@
print_copyright();
get_args( argc, argv );
+ init_error_handler();
+
init_stack();
init_dictionary();
Modified: fcode-utils/toke/tokzesc.c
===================================================================
--- fcode-utils/toke/tokzesc.c 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/tokzesc.c 2006-10-30 09:48:28 UTC (rev 100)
@@ -45,8 +45,9 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
+
+#include "tokzesc.h"
#include "ticvocab.h"
-#include "tokzesc.h"
#include "stack.h"
#include "emit.h"
#include "stream.h"
@@ -54,6 +55,7 @@
#include "errhandler.h"
#include "strsubvocab.h"
#include "nextfcode.h"
+#include "tracesyms.h"
#undef TOKZTEST /* Define for testing only; else undef */
#ifdef TOKZTEST /* For testing only */
@@ -215,7 +217,8 @@
* Inputs:
* Parameters:
* the_num Pointer to where to put the number
- * the_action Phrase to be used in ERROR message
+ * setting_fc TRUE if number is to be set as next fcode,
+ * FALSE if the number is to be emitted
* Data-Stack Items:
* Top: Value to be retrieved
*
@@ -224,21 +227,44 @@
* Supplied Pointers:
* *the_num Value retrieved from the data-stack
*
+ * Process Explanation:
+ * From the value of setting_fc we will deduce both the legal
+ * minimum and the phrase to be used in the ERROR message.
+ * If the number is to be emitted, it can be any legal FCode
+ * token number down to 0x10 but if it is to be set, the
+ * legal minimum is 0x0800.
+ * In either case, 0x0fff is the legal maximum.
+ *
* Error Detection:
* If the number on the stack is larger than 16 bits, truncate
* it, with a WARNING message.
- * If the (possibly truncated) number from the stack is larger
- * than the legal maximum for an FCode (0x0fff), or
- * less than the legal minimum (0x0800), issue an ERROR,
+ * If the (possibly truncated) number taken from the stack is
+ * larger than the legal maximum for an FCode, or if it is
+ * less than the legal minimum, issue an ERROR message,
* leave the_num unchanged and return FALSE.
*
+ * Extraneous Remarks:
+ * If this function is ever used in more than the two ways allowed
+ * by the setting_fc parameter, then the Right Thing would
+ * be to define a local ENUM type for the possible uses, and
+ * use a SWITCH statement to set the internal variables. (But
+ * I really don't see any way that could become necessary...)
+ *
**************************************************************************** */
-static bool get_fcode_from_stack( u16 *the_num, char *the_action)
+static bool get_fcode_from_stack( u16 *the_num, bool setting_fc)
{
bool retval = FALSE;
+ char *the_action = "emit FCode value of";
+ u16 legal_minimum = 0x10;
long num_on_stk = dpop();
u16 test_fcode = (u16)num_on_stk;
+
+ if ( setting_fc )
+ {
+ the_action = "set next fcode to";
+ legal_minimum = 0x800;
+ }
if ( test_fcode != num_on_stk )
{
tokenization_error( WARNING,
@@ -246,7 +272,7 @@
"Truncating to 0x%03x.\n",
strupr(statbuf), num_on_stk, test_fcode);
}
- if ( ( test_fcode >= 0x800 ) && ( test_fcode <= 0xfff ) )
+ if ( ( test_fcode >= legal_minimum ) && ( test_fcode <= 0xfff ) )
{
retval = TRUE;
*the_num = test_fcode;
@@ -279,7 +305,7 @@
{
u16 test_fcode;
- if ( get_fcode_from_stack( &test_fcode, "set next fcode to") )
+ if ( get_fcode_from_stack( &test_fcode, TRUE) )
{
if ( test_fcode == nextfcode )
{
@@ -318,7 +344,7 @@
{
u16 test_fcode;
- if ( get_fcode_from_stack( &test_fcode, "Emit FCode value of") )
+ if ( get_fcode_from_stack( &test_fcode, FALSE) )
{
tokenization_error( INFO,
"Emitting FCode value of 0x%x\n", test_fcode);
@@ -462,8 +488,8 @@
* Error Detection:
* Failure to allocate memory is a Fatal Error.
* Warning on excessively long name
- * Warning on duplicate name
* Name to be defined not in same file, ERROR
+ * Warning on duplicate name handled by support routine
*
* Process Explanation:
* Get the next word, STRDUP it (which implicitly allocates memory).
@@ -493,11 +519,6 @@
* the lines from here to the end of the
* routine should be re-factored...
*/
- trace_creation( CONST, statbuf);
-
- warn_if_duplicate( statbuf );
- check_name_length( wlen );
-
c_name_space = strdup( statbuf );
add_tic_entry(
@@ -505,9 +526,11 @@
do_constant,
(TIC_P_DEFLT_TYPE)valu,
CONST ,
- 0 , NULL,
+ 0 , FALSE , NULL,
&tokz_esc_vocab );
+ check_name_length( wlen );
+
}
/* **************************************************************************
@@ -538,7 +561,7 @@
**************************************************************************** */
#define TKZESC_CONST(nam, pval) \
- VALPARAM_TIC(nam, do_constant, pval, CONST )
+ VALPARAM_TIC(nam, do_constant, pval, CONST, FALSE )
#define TKZ_ESC_FUNC(nam, afunc, pval, ifunc) \
DUALFUNC_TIC(nam, afunc, pval, ifunc, UNSPECIFIED)
@@ -586,6 +609,11 @@
* Synopsis: Initialize the "Tokenizer Escape" Vocabulary
* link-pointers dynamically.
*
+ * Process Explanation:
+ * While this is going on, set in_tokz_esc to TRUE; clear it
+ * when done. This will be used by the trace_builtin
+ * routine...
+ *
**************************************************************************** */
void init_tokz_esc_vocab ( void )
@@ -593,10 +621,12 @@
static const int tokz_esc_vocab_max_indx =
sizeof(tokz_esc_vocab_tbl)/sizeof(tic_hdr_t) ;
+ in_tokz_esc = TRUE;
tokz_esc_vocab = NULL ; /* Belt-and-suspenders... */
init_tic_vocab(tokz_esc_vocab_tbl,
tokz_esc_vocab_max_indx,
&tokz_esc_vocab );
+ in_tokz_esc = FALSE;
}
/* **************************************************************************
Modified: fcode-utils/toke/tracesyms.c
===================================================================
--- fcode-utils/toke/tracesyms.c 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/tracesyms.c 2006-10-30 09:48:28 UTC (rev 100)
@@ -33,31 +33,96 @@
/* **************************************************************************
*
+ * Revision History:
+ * Wed, 04 Oct 2006 by David L. Paktor
+ * Issue a message when a name on the trace list is invoked (as well
+ * as when it is created), but keep a limit on the speed penalty.
+ * (I.e., don't scan the trace-list for every symbol invoked.)
+ * Instead, we are going to install a function that prints the
+ * message; this requires scanning only once at creation time,
+ * which is already a necessity. There are too many permutations
+ * of "action" functions to define a separate set that combine
+ * with the invocation-message, so we will have a separate field
+ * for the invocation-message function, which will be NULL if
+ * the entry is not being traced. (If, however, it is faster
+ * to execute a null function than to first test for a NULL,
+ * then we can define a null function and put _that_ into the
+ * invocation-message-function field...
+ * Wed, 11 Oct 2006 by David L. Paktor
+ * We have reduced the Invocation Message Function to a single common
+ * routine; we will add a field that is a simple flag indicating
+ * if the entry is being traced. At the common point where the
+ * entry's function is called, we will test the flag to decide
+ * whether call the Invocation Message routine.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
* Functions Exported:
* add_to_trace_list Add the given name to the Trace List
- * show_initial_traces Show pre-defined names the user
- * asked to Trace (if any)
* is_on_trace_list Indicate whether the given name is
* on the Trace List
+ * tracing_fcode Show a token's assigned FCode-token
+ * in a consistent format.
+ * trace_creation Display a Trace-Note when a word known
+ * to be on the Trace List is created.
+ * trace_create_failure Display a Trace-Note indicating a failed
+ * attempt to create a word, if it is
+ * on the Trace List.
+ * traced_name_error Display a Trace-Note indicating a failed
+ * attempt to invoke an undefined word,
+ * if it is on the Trace List.
+ * invoking_traced_name Display a Trace-Note when a word known
+ * to be on the Trace List is invoked.
+ * handle_invocation Test whether a word is on the Trace List;
+ * if so, display a Trace-Note.
+ * show_trace_list Display the trace-list (if any) at
+ * the start of the run
+ * trace_builtin Test whether a pre-defined name is on
+ * the Trace List; issue a Trace-Note
+ * and set the entry's tracing flag.
*
**************************************************************************** */
+/* **************************************************************************
+ *
+ * Global Variables Exported
+ * split_alias_message Back-channel way to permit a certain
+ * message about an alias to a Global
+ * definition only having local scope
+ * to become a Trace-Note instead of
+ * an Advisory when one of the names
+ * is being Traced.
+ *
+ **************************************************************************** */
+
+
#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
#include "tracesyms.h"
#include "errhandler.h"
+#include "scanner.h"
+#include "vocabfuncts.h"
+#include "devnode.h"
+#include "toke.h"
+int split_alias_message = INFO;
/* **************************************************************************
*
* Internal Static Variables
- * trace_list Pointer to last entry in the Trace List linked-list
- * data structure
- *
- *
+ * trace_list Pointer to the first entry in the Trace List
+ * linked-list data structure
+ * trace_list_last Pointer to the last entry in the Trace List;
+ * the list will be forward-linked
+ * tracing_symbols TRUE if "Trace-Symbols" is in effect.
*
**************************************************************************** */
+
/* **************************************************************************
*
* Internal (Static) Structures:
@@ -65,35 +130,38 @@
*
* Fields:
* tracee Name of the symbol to be traced
- * prev Pointer to previous entry in the linked-list
+ * next Pointer to next entry in the forward-linked-list
*
**************************************************************************** */
typedef struct trace_entry {
char *tracee;
- struct trace_entry *prev;
+ struct trace_entry *next;
} trace_entry_t;
static trace_entry_t *trace_list = NULL;
+static trace_entry_t *trace_list_last = NULL;
+static bool tracing_symbols = FALSE;
-
/* **************************************************************************
*
* Function name: add_to_trace_list
* Synopsis: Add the given name to the Trace List
*
- *
* Inputs:
* Parameters:
* trace_symb Name of the symbol to be added
* Local Static Variables:
* trace_list Pointer to the Trace List
+ * trace_list_last Pointer to last entry in the Trace List
*
* Outputs:
* Returned Value: NONE
* Local Static Variables:
- * trace_list Points to new entry in Trace List
+ * trace_list Points to first entry in Trace List
+ * trace_list_last Pointer to new entry in the Trace List
+ * tracing_symbols Set to TRUE
* Memory Allocated
* For Trace List entry
* For copy of Symbol Name
@@ -101,6 +169,12 @@
* Never. Well, only on termination of the program. Trace-list
* endures for the entire batch of tokenizations.
*
+ * Process Explanation:
+ * The list will be forward-linked so that the display of the list
+ * can be in the same order as specified by the User. It will
+ * take a little extra effort, but having it come out that way
+ * satisfies the "Rule of Least Astonishment"...
+ *
* Error Detection:
* Memory allocation failure is a FATAL error.
*
@@ -111,9 +185,16 @@
trace_entry_t *new_t_l_entry = safe_malloc( sizeof( trace_entry_t),
"adding to trace-list");
new_t_l_entry->tracee = strdup( trace_symb);
- new_t_l_entry->prev = trace_list;
+ new_t_l_entry->next = NULL;
+ if ( trace_list != NULL )
+ {
+ trace_list_last->next = new_t_l_entry;
+ }else{
trace_list = new_t_l_entry;
+ tracing_symbols = TRUE;
+ }
+ trace_list_last = new_t_l_entry;
}
@@ -126,6 +207,7 @@
* Parameters:
* symb_name Symbol-name to test
* Local Static Variables:
+ * tracing_symbols Skip the search if FALSE
* trace_list Pointer to the Trace List
*
* Outputs:
@@ -136,6 +218,8 @@
bool is_on_trace_list( char *symb_name)
{
bool retval = FALSE;
+ if ( tracing_symbols )
+ {
trace_entry_t *test_entry = trace_list;
while ( test_entry != NULL )
{
@@ -144,7 +228,8 @@
retval = TRUE;
break;
}
- test_entry = test_entry->prev;
+ test_entry = test_entry->next;
+ }
}
return ( retval );
}
@@ -152,21 +237,504 @@
/* **************************************************************************
*
- * Still to be done:
- * Implement a function -- name it show_initial_traces --
- * that will show any pre-defined names the user asked
- * to Trace. That is, if any of the names the user asked
- * to Trace belongs to a pre-defined function, macro or
- * directive, then, at the beginning of the output, issue
- * Advisory Messages identifying the scope of those names.
+ * Function name: tracing_fcode
+ * Synopsis: Fill the given buffer with the string showing the
+ * assigned FCode-token given. Produce a consistent
+ * format for all messages that include this phrase.
+ *
+ * Inputs:
+ * Parameters:
+ * fc_phrase_buff Pointer to buffer for the phrase
+ * fc_token_num Assigned FCode-token number.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Supplied Pointers:
+ * fc_phrase_buff Filled with the phrase.
+ *
+ * Process Explanation:
+ * It is the responsibility of the calling routine to make sure
+ * that the buffer passed as the fc_phrase_buff parameter
+ * is sufficiently large for the phrase.
+ * This routine will test fc_token_num and leave the buffer
+ * unchanged if it is not greater than zero, relieving the
+ * calling routine of that chore.
+ *
+ * Extraneous Remarks:
+ * We will export, in tracesyms.h , a Macro that will give the
+ * recommended length for the buffer passed to this routine.
+ * It will be called TRACING_FCODE_LENGTH
+ *
+ **************************************************************************** */
+
+void tracing_fcode( char *fc_phrase_buff, u16 fc_token_num)
+{
+ if ( fc_token_num > 0 )
+ {
+ sprintf( fc_phrase_buff,
+ " (FCode token = 0x%03x)", fc_token_num);
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: trace_creation
+ * Synopsis: Display the appropriate message when a word, known
+ * to be on the Trace List, is created.
+ *
+ * Inputs:
+ * Parameters:
+ * trace_entry The TIC entry of the name
+ * nu_name If creating an Alias, the "new" name,
+ * otherwise NULL.
+ * is_global TRUE if trace_entry has Global scope.
+ * Global Variables:
+ * in_tokz_esc TRUE if we are in Tokenizer-Escape mode
+ * current_device_node Where the new definition's scope is,
+ * if it's not Global or Tokzr-Escape.
+ * hdr_flag State of name-creation headered-ness
+ * in_tkz_esc_mode String for announcing Tokz-Esc mode
+ * wh_defined String, = ", which is defined as a "
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * split_alias_message Set to TRACER if creating an Alias.
+ * Printout:
+ * Trace-Note Message.
+ * If not an ALIAS, takes the form:
+ * Creating <name> <(if is_single:FCode Token = xxx)>
+ * as a{n External,Headered,Headerless} <Type>
+ * <with scope>
+ * If it is an ALIAS, takes the form:
+ * Creating <new-name> as a{n External,Headered,Headerless}
+ * ALIAS to <old-name> <(if is_single:FCode Token = xxx)>,
+ * which is defined [ as a <Type>] <with scope>
+ * Headered-ness, of course, only applies to words with a
+ * single-token FCode.
+ * The <with scope> phrase is:
+ * If we are in Tokz-Esc mode, "in Tokenizer-Escape mode".
+ * If the TIC entry is a Local, the current colon-definition.
+ * If the TIC entry is Global in scope, "with Global scope"
+ * Otherwise, the identification of the current device-node.
+ *
+ * Process Explanation:
+ * The calling routine will already have verified that the
+ * name is on the trace-list.
+ * The name will already have been entered into a TIC_HDR vocab;
+ *
+ * The order of scope-checking is important:
+ * A Local has no scope beyond the definition in which it occurs.
+ * Tokenizer-Escape mode supercedes "Normal" mode, and renders
+ * moot the differences between Global and Device scope.
+ * Global scope is mutually exclusive with Device scope.
+ * Device scope needs to identify where the Current device-node
+ * began.
+ *
+ **************************************************************************** */
+
+void trace_creation( tic_hdr_t *trace_entry,
+ char *nu_name,
+ bool is_global)
+{
+ char fc_token_display[TRACING_FCODE_LENGTH] = "";
+ char *head_ness = "";
+ char *defr_name = "" ;
+ char *defr_phrase = "" ;
+ char *with_scope = "" ;
+ bool def_is_local = BOOLVAL( trace_entry->fword_defr == LOCAL_VAL);
+ bool creating_alias = BOOLVAL( nu_name != NULL );
+
+ if ( creating_alias )
+ {
+ head_ness = "n";
+ split_alias_message = TRACER;
+ }
+
+ if ( in_tokz_esc )
+ {
+ with_scope = in_tkz_esc_mode;
+ }else{
+ if ( ! def_is_local )
+ {
+ if ( is_global )
+ {
+ with_scope = "with Global scope.\n";
+ }else{
+ with_scope = in_what_node( current_device_node);
+ }
+ }
+
+ if ( trace_entry->is_token )
+ {
+ tracing_fcode( fc_token_display,
+ (u16)trace_entry->pfield.deflt_elem );
+ /* Headered-ness only applies to FCode definitions */
+ /* But not to aliases to FCode definitions */
+ if ( ! creating_alias )
+ {
+ switch ( hdr_flag )
+ {
+ case FLAG_HEADERS:
+ head_ness = " Headered";
+ break;
+
+ case FLAG_EXTERNAL:
+ head_ness = "n External";
+ break;
+
+ default: /* FLAG_HEADERLESS */
+ head_ness = " Headerless";
+ }
+ }
+ }
+
+ }
+
+
+ if ( definer_name(trace_entry->fword_defr, &defr_name) )
+ {
+ defr_phrase = wh_defined;
+ }else{
+ /* Even if we don't have a Type for the "old" word
+ * we still have its scope. If the "new" word's
+ * scope is different, the "split-alias message"
+ * will take care of it.
+ */
+ if ( creating_alias )
+ {
+ defr_phrase = ", which is defined" ;
+ }
+ }
+
+ if ( creating_alias )
+ {
+ /*
+ * Creating <new-name> as a{n External,Headered,Headerless}
+ * ALIAS to <old-name> <(if is_single:FCode Token = xxx)>,
+ * [which is defined as a <Type> <with scope>]
+ */
+ tokenization_error(TRACER,
+ "Creating %s" /* nu_name */
+ " as a%s ALIAS to %s" /* head_ness trace_entry->name */
+ "%s" /* fc_token_display */
+ "%s%s " /* defr_phrase defr_name */
+ "%s", /* with_scope */
+ nu_name, head_ness, trace_entry->name,
+ fc_token_display, defr_phrase, defr_name, with_scope );
+ }else{
+ /*
+ * Creating <name> <(if is_single:FCode Token = xxx)>
+ * as a{n External,Headered,Headerless} <Type>
+ * [ <with scope> ]
+ */
+ tokenization_error(TRACER,
+ "Creating %s" /* trace_entry->name */
+ "%s" /* fc_token_display */
+ " as a%s %s " /* head_ness defr_name */
+ "%s", /* with_scope */
+ trace_entry->name,
+ fc_token_display, head_ness, defr_name, with_scope );
+ }
+ /*
+ * The <with scope> phrase is:
+ * If we are in Tokz-Esc mode, "in Tokenizer-Escape mode".
+ * (Already handled. No more to do here)
+ * If the TIC entry is a Local, the current colon-definition.
+ * If the TIC entry is Global in scope, "with Global scope"
+ * (identified by NULL in_vocab).
+ * Otherwise, the identification of the current device-node.
+ */
+
+
+ if ( ! in_tokz_esc )
+ {
+ if ( def_is_local )
+ {
+ in_last_colon( TRUE);
+ }else{
+ show_node_start();
+ }
+ }
+
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: trace_create_failure
+ * Synopsis: Display a Trace-Note indicating a failed attempt
+ * to create a word, if it is on the Trace List.
*
- * E.g, if the user had -T 3DUP -T SWAP the function would
- * issue Messages like:
- * 3DUP is pre-defined as a Macro with Global scope
- * SWAP is pre-defined with Global scope
- * SWAP is pre-defined in Tokenizer-Escape mode
- *
- * The names would, of course, remain on the Trace List and
- * any re-definitions of them would be reported.
+ * Inputs:
+ * Parameters:
+ * new_name The name of the word you failed to create
+ * old_name If attempted to create an Alias, the
+ * "old" name, otherwise NULL.
+ * fc_tokn FCode-Token that might have been assigned
+ * to the "new" name. Zero if none.
*
+ * Outputs:
+ * Returned Value: NONE
+ * Printout:
+ * Failed to create <new_name> [FCode Token = <xxx>]
+ * [ as an ALIAS to <old_name>]\n"
+ *
**************************************************************************** */
+
+void trace_create_failure( char *new_name, char *old_name, u16 fc_tokn)
+{
+ bool not_alias = BOOLVAL( old_name == NULL );
+ bool do_it = is_on_trace_list( new_name);
+
+ if ( ( ! do_it ) && ( ! not_alias ) )
+ {
+ do_it = is_on_trace_list( old_name);
+ }
+
+ if ( do_it )
+ {
+ char fc_token_display[TRACING_FCODE_LENGTH] = "";
+ char *as_alias = not_alias ? "" : " as an ALIAS to ";
+ char *alias_name = not_alias ? "" : old_name;
+
+ if ( fc_tokn > 0 )
+ {
+ tracing_fcode( fc_token_display, fc_tokn);
+ }
+ tokenization_error(TRACER,
+ "Failed to create %s" /* new_name */
+ "%s" /* fc_token_display */
+ "%s" /* as_alias */
+ "%s\n", /* alias_name */
+ new_name, fc_token_display,
+ as_alias, alias_name);
+ }
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: traced_name_error
+ * Synopsis: Display a Trace-Note indicating a failed attempt
+ * to invoke an undefined word, if it is on the
+ * Trace List.
+ *
+ * Inputs:
+ * Parameters:
+ * trace_name The name being invoked
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout:
+ * A Trace-Note message indicating a attempt to "invoke" the name
+ *
+ * Error Detection:
+ * Error was detected by calling routine
+ *
+ * Process Explanation:
+ * Test if the name is on the trace-list, first.
+ *
+ **************************************************************************** */
+
+void traced_name_error( char *trace_name)
+{
+ if ( is_on_trace_list( trace_name ) )
+ {
+ tokenization_error(TRACER, "Attempt to invoke (undefined) %s.\n",
+ trace_name);
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: invoking_traced_name
+ * Synopsis: Print a message indicating that the given name,
+ * (which is on the trace-list) is being invoked.
+ * If available, show the name's assigned FCode-
+ * -token, definition-type, and scope.
+ *
+ * Inputs:
+ * Parameters:
+ * trace_entry The TIC entry of the name
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout:
+ * A Trace-Note message:
+ * Invoking <name> [FCode Token = <xxx>] [defined as a <Type>]
+ *
+ * Process Explanation:
+ * Although we could test the entry here to see whether it is
+ * being traced, we do not want to incur the speed penalty
+ * of the overhead of unconditionally calling a routine that,
+ * in most cases, will not do anything, every time a token
+ * is processed. We believe it is faster for the calling
+ * routine to conduct that test.
+ * Therefore, this routine will pre-suppose that the "tracing"
+ * field of the entry is TRUE.
+ *
+ **************************************************************************** */
+
+void invoking_traced_name( tic_hdr_t *trace_entry)
+{
+
+ char fc_token_display[TRACING_FCODE_LENGTH] = "";
+ char *defr_name = "" ;
+ char *defr_phrase = "" ;
+ char *defr_space = "" ;
+
+ if ( trace_entry->is_token )
+ {
+ tracing_fcode( fc_token_display,
+ (u16)trace_entry->pfield.deflt_elem );
+ }
+
+ if ( definer_name(trace_entry->fword_defr, &defr_name) )
+ {
+ defr_phrase = " defined as a";
+ defr_space = " " ;
+
+ }
+
+ tokenization_error(TRACER,
+ "Invoking %s" /* <name> */
+ "%s" /* fc_token_display */
+ "%s%s" /* defr_phrase defr_space */
+ "%s.\n", /* defr_name */
+ trace_entry->name,
+ fc_token_display,
+ defr_phrase, defr_space,
+ defr_name);
+
+}
+
+/* **************************************************************************
+ *
+ * Function name: handle_invocation
+ * Synopsis: Test whether the entry is being traced;
+ * if so, print the Trace-Note message.
+ *
+ * Inputs:
+ * Parameters:
+ * trace_entry The TIC entry to be tested.
+ * No harm if NULL
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout:
+ * A Trace-Note message, by invoking_traced_name() if
+ * the entry's tracing field is set.
+ *
+ * Extraneous Remarks:
+ * In cases that do not occur every time a token is processed,
+ * we can trade-off a small price in speed for convenience
+ * of coding. Call this routine judiciously...
+ *
+ **************************************************************************** */
+
+void handle_invocation( tic_hdr_t *trace_entry)
+{
+ if ( trace_entry != NULL )
+ {
+ if ( trace_entry->tracing)
+ {
+ invoking_traced_name( trace_entry);
+ }
+ }
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: show_trace_list
+ * Synopsis: Display the trace-list (if any) at the start of the run
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Local Static Variables:
+ * tracing_symbols Skip the display if FALSE
+ * trace_list Pointer to the Trace List
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout:
+ * List of symbols being traced; nothing if not tracing.
+ *
+ * Error Detection:
+ * Memory allocation failure is a FATAL error.
+ *
+ **************************************************************************** */
+
+void show_trace_list( void)
+{
+ if ( tracing_symbols )
+ {
+ trace_entry_t *test_entry;
+ printf("\nTracing these symbols:");
+ for ( test_entry = trace_list;
+ test_entry != NULL;
+ test_entry = test_entry->next )
+ {
+ printf(" %s", test_entry->tracee);
+
+ }
+ printf("\n");
+ }
+
+}
+
+/* **************************************************************************
+ *
+ * Function name: trace_builtin
+ * Synopsis: If the given built-in token, function, macro or
+ * directive is one the user asked to have Traced,
+ * issue a Trace-Note describing it, and set the
+ * TIC_HDR entry's tracing field to TRUE.
+ * Called while initializing vocab-lists.
+ *
+ * Inputs:
+ * Parameters:
+ * trace_entry The TIC entry of the built-in name
+ * Global Variables:
+ * in_tokz_esc TRUE if initializing the vocab-list
+ * for Tokenizer-Escape mode.
+ * in_tkz_esc_mode String for announcing Tokz-Esc mode
+ * Local Static Variables:
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Supplied Pointers:
+ * trace_entry->tracing Set TRUE, if the entry's name is on
+ * the Trace List.
+ * Printout:
+ * Trace-Note: <name> <(if is_single:FCode Token = xxx)>
+ * is a built-in {word|<Type>} [in Tokz-Esc mode]
+ *
+ **************************************************************************** */
+
+void trace_builtin( tic_hdr_t *trace_entry)
+{
+ if (is_on_trace_list( trace_entry->name ) )
+ {
+ char fc_token_display[TRACING_FCODE_LENGTH] = "";
+ char *defr_name = "word";
+ char *ws_space = in_tokz_esc ? " " : "";
+ char *with_scope = in_tokz_esc ? in_tkz_esc_mode : ".\n";
+ if ( trace_entry->is_token )
+ {
+ tracing_fcode( fc_token_display,
+ (u16)trace_entry->pfield.deflt_elem );
+ }
+ definer_name(trace_entry->fword_defr, &defr_name);
+ trace_entry->tracing = TRUE;
+ tokenization_error(TRACER,
+ "%s" /* <name> */
+ "%s " /* fc_token_display */
+ "is a built-in %s" /* defr_name */
+ "%s%s", /* ws_space with_scope */
+ trace_entry->name,
+ fc_token_display, defr_name, ws_space, with_scope );
+ }
+}
+
Modified: fcode-utils/toke/tracesyms.h
===================================================================
--- fcode-utils/toke/tracesyms.h 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/tracesyms.h 2006-10-30 09:48:28 UTC (rev 100)
@@ -35,14 +35,44 @@
**************************************************************************** */
#include "types.h"
+#include "ticvocab.h"
+#include "devnode.h"
/* ************************************************************************** *
*
+ * Global Variables Exported
+ *
+ **************************************************************************** */
+
+extern int split_alias_message;
+
+/* ************************************************************************** *
+ *
* Function Prototypes / Functions Exported:
*
**************************************************************************** */
void add_to_trace_list( char *trace_symb);
bool is_on_trace_list( char *symb_name);
+void tracing_fcode( char *fc_phrase_buff, u16 fc_token_num);
+void trace_creation( tic_hdr_t *trace_entry,
+ char *nu_name,
+ bool is_global);
+void trace_create_failure( char *new_name, char *old_name, u16 fc_tokn);
+void traced_name_error( char *trace_name);
+void invoking_traced_name( tic_hdr_t *trace_entry);
+void handle_invocation( tic_hdr_t *trace_entry);
+void show_trace_list( void);
+void trace_builtin( tic_hdr_t *trace_entry);
+/* ************************************************************************** *
+ *
+ * Macro:
+ * TRACING_FCODE_LENGTH
+ * Adequate length for the buffer passed to tracing_fcode()
+ *
+ **************************************************************************** */
+
+#define TRACING_FCODE_LENGTH 32
+
#endif /* _TOKE_TRACESYMS_H */
Modified: fcode-utils/toke/vocabfuncts.h
===================================================================
--- fcode-utils/toke/vocabfuncts.h 2006-10-15 20:09:08 UTC (rev 99)
+++ fcode-utils/toke/vocabfuncts.h 2006-10-30 09:48:28 UTC (rev 100)
@@ -47,7 +47,9 @@
**************************************************************************** */
extern bool scope_is_global;
+extern bool define_token;
+
/* ************************************************************************** *
*
* Function Prototypes / Functions Exported:
@@ -66,8 +68,7 @@
tic_hdr_t *lookup_in_dev_node( char *tname);
void add_to_current( char *name,
TIC_P_DEFLT_TYPE fc_token,
- fwtoken definer,
- bool define_token);
+ fwtoken definer);
void hide_last_colon ( void );
void reveal_last_colon ( void );
bool create_current_alias( char *new_name, char *old_name );
1
0
I am writing to announce to the OpenBIOS and FCode Development
communities that Version 1.0.2 of the FCode Utility Suite is
ready and will soon be available.
The most prominent change is that the Tokenizer's Message
format has been expanded to show the current Output Position
and, if applicable, the position relative to the end of the
most recent PCI Header (to keep in sync with Offset numbers
displayed by the DeTokenizer.)
The Symbol-Tracing feature has been changed and expanded:
Its Messages are no longer Advisories, but a class of their
own called Trace-Notes. When a Traced Symbol is created, the
Trace-Note Message gives the new Symbol's assigned FCode Token
(when applicable) in addition to the Data-Type and Scope of
the definition.
A Trace-Note Message is now also issued when a Traced Symbol
is invoked. Symbol-Tracing is not fooled by aliases, and a
failed attempt to create or invoke a Traced Symbol will also
cause a Trace-Note Message to be displayed.
These expansions are based on some questions asked by one of
my colleagues while maintaining a very large and convoluted
body of Legacy code -- questions like: "Where is such-and-so
definition coming from?" "Which version of it is being used
here?" "How can I find where exactly that is in the Binary?"
Another change is based on the recent exchange of letters with
Rolf Schroedter concerning the use of the emit-fcode command.
In the previous version, arguments to the emit-fcode command
were limited to the range of user-defined FCodes, i.e., 0x800
to 0xFFF. The new version permits numbers in the entire range
of valid FCodes, 0x010 to 0xFFF, which includes the sub-ranges
that are reserved for Vendor-Specific FCodes.
There are a few other changes, which are noted in a document
that accompanies the new release.
I sent the new release information to the OpenBIOS Webmaster
a few days ago; it should be up on the site very soon.
Sincerely,
--
David L. Paktor
dlpaktor(a)netscape.net
1
0
detok has an option '--fcodes' adding vendor specific Fcodes from a
list-file.
Is there a similar possibility for the tokenizer ?
Rolf.
--
------------------------------------
Rolf Schroedter
German Aerospace Center
Institute of Planetary Research
D-12489 Berlin, Rutherfordstrasse 2
Tel/Fax: (+49) (30) 67055-416/384
Email: Rolf.Schroedter(a)dlr.de
2
1
Hi,
Sorry, I didn't mean to enable the option by default. Here's an updated
version.
_________________________________________________________________
FREE pop-up blocking with the new MSN Toolbar - get it now!
http://toolbar.msn.click-url.com/go/onm00200415ave/direct/01/
1
0
Hi,
Portions of Linux libc and ld.so for Sparc64 use very advanced, handcrafted
assembly, and some of those instructions (VIS I, II) are not implemented yet
by Qemu. This patch adds an optional statically linked Unix target, which
bypasses the libc. The resulting binary is compiled 100% from OpenBIOS
sources, so I have complete control for optimisation etc. I already found
one small bug in Qemu with this version.
Interestingly, in Qemu openbios-unix-static crashes in docol, when the
rstack overflows. This doesn't happen in native Sparc64. But I don't know
how to debug Forth execution problems, any clue?
I think the code is somewhat portable within Linux, probably not to other
Unixy systems. Though I don't think the patch has much general use.
_________________________________________________________________
Don't just search. Find. Check out the new MSN Search!
http://search.msn.com/
1
0
I'm using the OpenBios Forth interpreter on a Leon-Sparc embedded system.
My question is how to include the FCode evaluator (fcode.fs, feval.fs
table.fs)
into the built-in dictionary.
When I try to add
include fcode.fs
cross-compiling the dictionary fails with a segmentation violation.
What am I missing ?
Thanks & regards,
Rolf.
--
------------------------------------
Rolf Schroedter
German Aerospace Center
Institute of Planetary Research
D-12489 Berlin, Rutherfordstrasse 2
Tel/Fax: (+49) (30) 67055-416/384
Email: Rolf.Schroedter(a)dlr.de
1
0
Hi,
I would like to contribute in this project a as programmer, can some one
guide me how to get started?
Regards,
Pranav
1
0
I noticed that kernel/bootstrap.c fails parsing empty \ comments, e.g.
from "bootstrap.fs":
\ Some comment<lf>
\<lf>
: tuck swap over ;
complaining about "tuck not defined". No problem if the 2nd line has a
space:
\ <lf>
One could say "That's FORTH", but IMHO this behavior is ugly because
the difference between both cases is not visible. In my case I had an
editor
configured to truncate trailing spaces in a line ...
I suggest to resolve this problem by not eating <lf> when parsing
for white spaces(delim=0) in parse(f,line,delim ), something like:
static int parse(FILE * f, char *line, char delim)
{
int cnt = 0, c;
while (!feof(f)) {
c = getc(f);
if (delim && c == delim)
break;
if ((!delim) && (c == ' ' || c == '\n' || c == '\t')) {
>>>>> if (c == '\n') ungetc(c, f);
break;
}
line[cnt++] = c;
}
line[cnt] = 0;
return cnt;
}
A similar change should probably be done at FORTH level in ":
parse-word" and/or ": parse".
Regards, Rolf.
--
------------------------------------
Rolf Schroedter
German Aerospace Center
Institute of Planetary Research
D-12489 Berlin, Rutherfordstrasse 2
Tel/Fax: (+49) (30) 67055-416/384
Email: Rolf.Schroedter(a)dlr.de
1
0
Author: stepan
Date: 2006-10-15 22:09:08 +0200 (Sun, 15 Oct 2006)
New Revision: 99
Modified:
fcode-utils/Makefile
fcode-utils/testsuite/Makefile
Log:
automatic tests 1.
Modified: fcode-utils/Makefile
===================================================================
--- fcode-utils/Makefile 2006-10-15 18:54:09 UTC (rev 98)
+++ fcode-utils/Makefile 2006-10-15 20:09:08 UTC (rev 99)
@@ -49,7 +49,7 @@
cp toke/toke testsuite
cp detok/detok testsuite
cp romheaders/romheaders testsuite
- make -C testsuite all
+ make -C testsuite all CygTestLogs=`pwd`/testsuite/testlogs
.PHONY: all clean distclean toke detok romheaders tests
Modified: fcode-utils/testsuite/Makefile
===================================================================
--- fcode-utils/testsuite/Makefile 2006-10-15 18:54:09 UTC (rev 98)
+++ fcode-utils/testsuite/Makefile 2006-10-15 20:09:08 UTC (rev 99)
@@ -1,7 +1,11 @@
-all:
+all: tests compare
+
+tests:
@echo "starting testsuite"
@csh AutoExec
+compare:
+ CygTestLogs=$(CygTestLogs) csh AutoCompare
clean:
find . -name "*.DeTok" -a ! -name "*.OldTkzr.DeTok" -exec rm -f \{\} \;
@@ -14,3 +18,6 @@
distclean: clean
rm -f toke detok romheaders
+ rm -f AutoComp.Log.*
+ rm -f AutoComp.TKdiffs.*
+
1
0
r98 - in fcode-utils: . detok testsuite testsuite/TokMisc testsuite/TokeCommon toke
by svn＠openbios.org 15 Oct '06
by svn＠openbios.org 15 Oct '06
15 Oct '06
Author: stepan
Date: 2006-10-15 20:54:09 +0200 (Sun, 15 Oct 2006)
New Revision: 98
Removed:
fcode-utils/testsuite/TokMisc/OneBeer.fc
fcode-utils/testsuite/TokeCommon/OneBeer.fl
Modified:
fcode-utils/Makefile
fcode-utils/detok/Makefile
fcode-utils/testsuite/Makefile
fcode-utils/toke/Makefile
Log:
clean up build system
Modified: fcode-utils/Makefile
===================================================================
--- fcode-utils/Makefile 2006-10-15 16:37:02 UTC (rev 97)
+++ fcode-utils/Makefile 2006-10-15 18:54:09 UTC (rev 98)
@@ -42,6 +42,8 @@
make -C detok distclean
make -C romheaders distclean
make -C testsuite distclean
+ find . -name "*.gcda" -exec rm -f \{\} \;
+ find . -name "*.gcno" -exec rm -f \{\} \;
tests: all
cp toke/toke testsuite
Modified: fcode-utils/detok/Makefile
===================================================================
--- fcode-utils/detok/Makefile 2006-10-15 16:37:02 UTC (rev 97)
+++ fcode-utils/detok/Makefile 2006-10-15 18:54:09 UTC (rev 98)
@@ -27,10 +27,19 @@
CC = gcc
STRIP = strip
INCLUDES = -I../shared
-#CFLAGS = -O2 -g -Wall
-CFLAGS = -Os -Wall -Wno-pointer-sign
+
+# Normal Flags:
+CFLAGS = -O2 -Wall -Wno-pointer-sign
LDFLAGS =
+# Coverage:
+#CFLAGS := $(CFLAGS) -fprofile-arcs -ftest-coverage
+#LDFLAGS := $(LDFLAGS) -lgcov
+
+# Debugging:
+#CFLAGS := $(CFLAGS) -g
+
+
OBJS = addfcodes.o decode.o detok.o dictionary.o pcihdr.o printformats.o \
stream.o ../shared/classcodes.o
Modified: fcode-utils/testsuite/Makefile
===================================================================
--- fcode-utils/testsuite/Makefile 2006-10-15 16:37:02 UTC (rev 97)
+++ fcode-utils/testsuite/Makefile 2006-10-15 18:54:09 UTC (rev 98)
@@ -4,9 +4,9 @@
clean:
- find . -name "*.DeTok" -exec rm -f \{\} \;
- find . -name "*.Log" -a ! -name "*..OldTkzr.Log" -exec rm -f \{\} \;
- find . -name "*.fc" -exec rm -f \{\} \;
+ find . -name "*.DeTok" -a ! -name "*.OldTkzr.DeTok" -exec rm -f \{\} \;
+ find . -name "*.Log" -a ! -name "*.OldTkzr.Log" -exec rm -f \{\} \;
+ find . -name "*.fc" -a ! -name "*.OldTkzr.fc" -exec rm -f \{\} \;
find . -name "*.fl" -exec rm -f \{\} \;
find . -name "*.RomHdr" -exec rm -f \{\} \;
find . -name "*.P" -exec rm -f \{\} \;
Deleted: fcode-utils/testsuite/TokMisc/OneBeer.fc
===================================================================
Deleted: fcode-utils/testsuite/TokeCommon/OneBeer.fl
===================================================================
Modified: fcode-utils/toke/Makefile
===================================================================
--- fcode-utils/toke/Makefile 2006-10-15 16:37:02 UTC (rev 97)
+++ fcode-utils/toke/Makefile 2006-10-15 18:54:09 UTC (rev 98)
@@ -28,15 +28,17 @@
STRIP = strip
INCLUDES = -I../shared
-# No coverage:
-#CFLAGS = -O2 -g -Wall
-CFLAGS = -Os -Wall -Wno-pointer-sign -fno-strict-aliasing -DSYS_IS_GNU_Linux
+# Normal flags
+CFLAGS = -O2 -Wall -Wno-pointer-sign -fno-strict-aliasing -DSYS_IS_GNU_Linux
LDFLAGS =
# Coverage:
-#CFLAGS = -O2 -fprofile-arcs -ftest-coverage -Wall -Wno-pointer-sign -DSYS_IS_GNU_Linux
-#LDFLAGS = -lgcov
+#CFLAGS := $(CFLAGS) -fprofile-arcs -ftest-coverage
+#LDFLAGS := $(LDFLAGS) -lgcov
+# Debugging:
+# CFLAGS := $(CFLAGS) -g
+
OBJS = clflags.o conditl.o devnode.o dictionary.o emit.o errhandler.o \
flowcontrol.o macros.o nextfcode.o parselocals.o scanner.o stack.o \
stream.o strsubvocab.o ticvocab.o toke.o tokzesc.o tracesyms.o \
1
0
Author: stepan
Date: 2006-10-15 18:37:02 +0200 (Sun, 15 Oct 2006)
New Revision: 97
Added:
fcode-utils/testsuite/Makefile
Modified:
fcode-utils/Makefile
fcode-utils/toke/Makefile
Log:
add test execution to Makefile
Modified: fcode-utils/Makefile
===================================================================
--- fcode-utils/Makefile 2006-10-14 21:32:13 UTC (rev 96)
+++ fcode-utils/Makefile 2006-10-15 16:37:02 UTC (rev 97)
@@ -35,13 +35,20 @@
make -C toke clean
make -C detok clean
make -C romheaders clean
+ make -C testsuite clean
distclean: clean
make -C toke distclean
make -C detok distclean
make -C romheaders distclean
+ make -C testsuite distclean
+tests: all
+ cp toke/toke testsuite
+ cp detok/detok testsuite
+ cp romheaders/romheaders testsuite
+ make -C testsuite all
-.PHONY: all clean distclean toke detok romheaders
+.PHONY: all clean distclean toke detok romheaders tests
Added: fcode-utils/testsuite/Makefile
===================================================================
--- fcode-utils/testsuite/Makefile (rev 0)
+++ fcode-utils/testsuite/Makefile 2006-10-15 16:37:02 UTC (rev 97)
@@ -0,0 +1,16 @@
+all:
+ @echo "starting testsuite"
+ @csh AutoExec
+
+
+clean:
+ find . -name "*.DeTok" -exec rm -f \{\} \;
+ find . -name "*.Log" -a ! -name "*..OldTkzr.Log" -exec rm -f \{\} \;
+ find . -name "*.fc" -exec rm -f \{\} \;
+ find . -name "*.fl" -exec rm -f \{\} \;
+ find . -name "*.RomHdr" -exec rm -f \{\} \;
+ find . -name "*.P" -exec rm -f \{\} \;
+ find . -name "*.missing" -exec rm -f \{\} \;
+
+distclean: clean
+ rm -f toke detok romheaders
Modified: fcode-utils/toke/Makefile
===================================================================
--- fcode-utils/toke/Makefile 2006-10-14 21:32:13 UTC (rev 96)
+++ fcode-utils/toke/Makefile 2006-10-15 16:37:02 UTC (rev 97)
@@ -30,7 +30,7 @@
# No coverage:
#CFLAGS = -O2 -g -Wall
-CFLAGS = -Os -Wall -Wno-pointer-sign -DSYS_IS_GNU_Linux
+CFLAGS = -Os -Wall -Wno-pointer-sign -fno-strict-aliasing -DSYS_IS_GNU_Linux
LDFLAGS =
# Coverage:
1
0
Author: stepan
Date: 2006-10-14 23:32:13 +0200 (Sat, 14 Oct 2006)
New Revision: 96
Modified:
fcode-utils/detok/addfcodes.c
fcode-utils/detok/addfcodes.h
fcode-utils/detok/decode.c
fcode-utils/detok/detok.c
fcode-utils/detok/detok.h
fcode-utils/detok/dictionary.c
fcode-utils/detok/pcihdr.c
fcode-utils/detok/printformats.c
fcode-utils/detok/stream.c
fcode-utils/detok/stream.h
Log:
fix indentation
Modified: fcode-utils/detok/addfcodes.c
===================================================================
--- fcode-utils/detok/addfcodes.c 2006-10-14 21:07:27 UTC (rev 95)
+++ fcode-utils/detok/addfcodes.c 2006-10-14 21:32:13 UTC (rev 96)
@@ -97,17 +97,15 @@
*
**************************************************************************** */
-static void skip_whitespace( char **string_line_ptr)
+static void skip_whitespace(char **string_line_ptr)
{
- char *cur_char_ptr = *string_line_ptr;
- for ( ; *cur_char_ptr != 0 ; cur_char_ptr++ )
- {
- if ( (*cur_char_ptr != '\t') && (*cur_char_ptr != ' ') )
- {
- *string_line_ptr = cur_char_ptr;
- break;
+ char *cur_char_ptr = *string_line_ptr;
+ for (; *cur_char_ptr != 0; cur_char_ptr++) {
+ if ((*cur_char_ptr != '\t') && (*cur_char_ptr != ' ')) {
+ *string_line_ptr = cur_char_ptr;
+ break;
+ }
}
- }
}
/* **************************************************************************
@@ -134,24 +132,26 @@
*
**************************************************************************** */
-static bool get_next_vfc_line( void )
+static bool get_next_vfc_line(void)
{
- bool retval = FALSE; /* TRUE = not at end yet */
- while ( vfc_remainder < vfc_buf_end )
- {
- current_vfc_line = vfc_remainder;
- vfc_remainder = strchr( current_vfc_line, '\n');
- *vfc_remainder = 0;
- vfc_remainder++;
- vfc_line_no++;
- skip_whitespace( ¤t_vfc_line);
- if ( *current_vfc_line == 0 ) continue; /* Blank line */
- if ( *current_vfc_line == '#' ) continue; /* Comment */
- if ( *current_vfc_line == '\\' ) continue; /* Comment */
- retval = TRUE;
- break; /* Found something */
- }
- return( retval);
+ bool retval = FALSE; /* TRUE = not at end yet */
+ while (vfc_remainder < vfc_buf_end) {
+ current_vfc_line = vfc_remainder;
+ vfc_remainder = strchr(current_vfc_line, '\n');
+ *vfc_remainder = 0;
+ vfc_remainder++;
+ vfc_line_no++;
+ skip_whitespace(¤t_vfc_line);
+ if (*current_vfc_line == 0)
+ continue; /* Blank line */
+ if (*current_vfc_line == '#')
+ continue; /* Comment */
+ if (*current_vfc_line == '\\')
+ continue; /* Comment */
+ retval = TRUE;
+ break; /* Found something */
+ }
+ return (retval);
}
/* **************************************************************************
@@ -176,20 +176,19 @@
*
**************************************************************************** */
static bool did_not_splash = TRUE;
-static void vfc_splash( char *vf_file_name)
+static void vfc_splash(char *vf_file_name)
{
- if ( did_not_splash )
- {
- /* Temporary substring buffer */
- /* Guarantee that the malloc will be big enough. */
- char *strbfr = malloc( strlen( vf_file_name) +65 ) ;
- sprintf( strbfr,
- "Reading additional FCodes from file: %s\n",
- vf_file_name);
- printremark( strbfr);
- free( strbfr);
- did_not_splash = FALSE;
- }
+ if (did_not_splash) {
+ /* Temporary substring buffer */
+ /* Guarantee that the malloc will be big enough. */
+ char *strbfr = malloc(strlen(vf_file_name) + 65);
+ sprintf(strbfr,
+ "Reading additional FCodes from file: %s\n",
+ vf_file_name);
+ printremark(strbfr);
+ free(strbfr);
+ did_not_splash = FALSE;
+ }
}
/* **************************************************************************
@@ -240,104 +239,98 @@
*
**************************************************************************** */
-bool add_fcodes_from_list( char *vf_file_name)
+bool add_fcodes_from_list(char *vf_file_name)
{
- bool retval = FALSE;
- int added_fc_count = 0;
- check_tok_seq = FALSE;
+ bool retval = FALSE;
+ int added_fc_count = 0;
+ check_tok_seq = FALSE;
- if ( verbose ) vfc_splash( vf_file_name);
+ if (verbose)
+ vfc_splash(vf_file_name);
- if ( init_stream( vf_file_name) != 0 )
- {
- char *strbfr = malloc( strlen( vf_file_name) +65 );
- sprintf( strbfr,
- "Could not open Additional FCodes file: %s\n",
- vf_file_name);
- printremark( strbfr);
- free( strbfr);
- exit(1);
- }
- vfc_remainder = indata;
- vfc_buf_end = indata + stream_max -1;
+ if (init_stream(vf_file_name) != 0) {
+ char *strbfr = malloc(strlen(vf_file_name) + 65);
+ sprintf(strbfr,
+ "Could not open Additional FCodes file: %s\n",
+ vf_file_name);
+ printremark(strbfr);
+ free(strbfr);
+ exit(1);
+ }
+ vfc_remainder = indata;
+ vfc_buf_end = indata + stream_max - 1;
- while ( get_next_vfc_line() )
- {
- char vs_fc_name[36];
- int vs_fc_number;
- int scan_result;
- char *lookup_result;
- char *fc_name_cpy;
+ while (get_next_vfc_line()) {
+ char vs_fc_name[36];
+ int vs_fc_number;
+ int scan_result;
+ char *lookup_result;
+ char *fc_name_cpy;
- scan_result = sscanf( current_vfc_line, "0x%x %32s",
- &vs_fc_number, vs_fc_name);
+ scan_result = sscanf(current_vfc_line, "0x%x %32s",
+ &vs_fc_number, vs_fc_name);
- if ( scan_result != 2 ) /* Allow a capital 0X */
- {
- scan_result = sscanf( current_vfc_line, "0X%x %32s",
- &vs_fc_number, vs_fc_name);
- }
- if ( scan_result != 2 ) /* Try it without the 0x */
- {
- scan_result = sscanf( current_vfc_line, "%x %32s",
- &vs_fc_number, vs_fc_name);
- }
+ if (scan_result != 2) { /* Allow a capital 0X */
+ scan_result = sscanf(current_vfc_line, "0X%x %32s",
+ &vs_fc_number, vs_fc_name);
+ }
+ if (scan_result != 2) { /* Try it without the 0x */
+ scan_result = sscanf(current_vfc_line, "%x %32s",
+ &vs_fc_number, vs_fc_name);
+ }
- if ( scan_result != 2 ) /* That's it... */
- {
- char *strbfr = malloc( strlen( current_vfc_line) +65 );
- vfc_splash( vf_file_name);
- sprintf( strbfr,
- "Line #%d, invalid format. Ignoring: %s\n",
- vfc_line_no, current_vfc_line);
- printremark( strbfr);
- free( strbfr);
- continue;
- }
+ if (scan_result != 2) { /* That's it... */
+ char *strbfr =
+ malloc(strlen(current_vfc_line) + 65);
+ vfc_splash(vf_file_name);
+ sprintf(strbfr,
+ "Line #%d, invalid format. Ignoring: %s\n",
+ vfc_line_no, current_vfc_line);
+ printremark(strbfr);
+ free(strbfr);
+ continue;
+ }
- if ( ( vs_fc_number < 0x10 ) || ( vs_fc_number > 0x7ff ) )
- {
- char *strbfr = malloc( 85 );
- vfc_splash( vf_file_name);
- sprintf( strbfr,
- "Line #%d, FCode number out of range: 0x%x Ignoring.\n",
- vfc_line_no, vs_fc_number);
- printremark( strbfr);
- free( strbfr);
- continue;
+ if ((vs_fc_number < 0x10) || (vs_fc_number > 0x7ff)) {
+ char *strbfr = malloc(85);
+ vfc_splash(vf_file_name);
+ sprintf(strbfr,
+ "Line #%d, FCode number out of range: 0x%x Ignoring.\n",
+ vfc_line_no, vs_fc_number);
+ printremark(strbfr);
+ free(strbfr);
+ continue;
+ }
+
+ lookup_result = lookup_token((u16) vs_fc_number);
+ if (strcmp(lookup_result, "ferror") != 0) {
+ char *strbfr = malloc(strlen(lookup_result) + 85);
+ vfc_splash(vf_file_name);
+ sprintf(strbfr,
+ "Line #%d. FCode number 0x%x is already "
+ "defined as %s Ignoring.\n",
+ vfc_line_no, vs_fc_number, lookup_result);
+ printremark(strbfr);
+ free(strbfr);
+ continue;
+ }
+
+ /* We've passed all the tests! */
+ fc_name_cpy = strdup(vs_fc_name);
+ add_token((u16) vs_fc_number, fc_name_cpy);
+ added_fc_count++;
+ retval = TRUE;
}
- lookup_result = lookup_token( (u16)vs_fc_number);
- if ( strcmp( lookup_result, "ferror") != 0 )
- {
- char *strbfr = malloc( strlen( lookup_result) + 85 );
- vfc_splash( vf_file_name);
- sprintf( strbfr,
- "Line #%d. FCode number 0x%x is already "
- "defined as %s Ignoring.\n",
- vfc_line_no, vs_fc_number, lookup_result);
- printremark( strbfr);
- free( strbfr);
- continue;
+ if (verbose) {
+ char *strbfr = malloc(85);
+ sprintf(strbfr,
+ "Added %d FCode numbers\n", added_fc_count);
+ printremark(strbfr);
+ free(strbfr);
}
- /* We've passed all the tests! */
- fc_name_cpy = strdup( vs_fc_name);
- add_token( (u16)vs_fc_number, fc_name_cpy);
- added_fc_count++;
- retval = TRUE;
- }
-
- if ( verbose )
- {
- char *strbfr = malloc( 85 );
- sprintf( strbfr,
- "Added %d FCode numbers\n", added_fc_count);
- printremark( strbfr);
- free( strbfr);
- }
-
- close_stream();
- check_tok_seq = TRUE;
- return( retval);
+ close_stream();
+ check_tok_seq = TRUE;
+ return (retval);
}
Modified: fcode-utils/detok/addfcodes.h
===================================================================
--- fcode-utils/detok/addfcodes.h 2006-10-14 21:07:27 UTC (rev 95)
+++ fcode-utils/detok/addfcodes.h 2006-10-14 21:32:13 UTC (rev 96)
@@ -43,6 +43,6 @@
*
**************************************************************************** */
-bool add_fcodes_from_list( char *vf_file_name);
+bool add_fcodes_from_list(char *vf_file_name);
-#endif /* _DETOK_VSFCODES_H */
+#endif /* _DETOK_VSFCODES_H */
Modified: fcode-utils/detok/decode.c
===================================================================
--- fcode-utils/detok/decode.c 2006-10-14 21:07:27 UTC (rev 95)
+++ fcode-utils/detok/decode.c 2006-10-14 21:32:13 UTC (rev 96)
@@ -39,7 +39,7 @@
#include "detok.h"
#include "stream.h"
-static int indent; /* Current level of indentation */
+static int indent; /* Current level of indentation */
/* **************************************************************************
*
@@ -53,71 +53,71 @@
*
**************************************************************************** */
-static bool ended_okay = TRUE; /* FALSE if finished prematurely */
+static bool ended_okay = TRUE; /* FALSE if finished prematurely */
-bool offs16=TRUE;
+bool offs16 = TRUE;
unsigned int linenum;
-bool end_found=FALSE;
-unsigned int token_streampos; /* Streampos() of currently-gotten token */
+bool end_found = FALSE;
+unsigned int token_streampos; /* Streampos() of currently-gotten token */
u16 last_defined_token = 0;
jmp_buf eof_exception;
static int fclen;
-static const char *unnamed = "(unnamed-fcode)" ;
+static const char *unnamed = "(unnamed-fcode)";
-static void decode_indent(void)
+static void decode_indent(void)
{
int i;
- if (indent<0) {
+ if (indent < 0) {
#ifdef DEBUG_INDENT
printf("detok: error in indentation code.\n");
#endif
- indent=0;
+ indent = 0;
}
- for (i=0; i<indent; i++)
- printf (" ");
+ for (i = 0; i < indent; i++)
+ printf(" ");
}
-
+
/* Print forth string ( [len] char[0] ... char[len] ) */
static void pretty_print_string(void)
{
- u8 len;
- u8 *strptr;
- int indx;
- bool in_parens = FALSE ; /* Are we already inside parentheses? */
+ u8 len;
+ u8 *strptr;
+ int indx;
+ bool in_parens = FALSE; /* Are we already inside parentheses? */
- strptr = get_string( &len );
+ strptr = get_string(&len);
- printf("( len=%s%x", len >= 10 ? "0x":"", len);
- if ( len >= 10 ) printf(" [%d bytes]", len);
- printf(" )\n");
- if (show_linenumbers) printf(" ");
- decode_indent();
+ printf("( len=%s%x", len >= 10 ? "0x" : "", len);
+ if (len >= 10)
+ printf(" [%d bytes]", len);
+ printf(" )\n");
+ if (show_linenumbers)
+ printf(" ");
+ decode_indent();
printf("\" ");
- for ( indx = 0; indx < len; indx++ )
- {
- u8 c = *strptr++;
+ for (indx = 0; indx < len; indx++) {
+ u8 c = *strptr++;
if (isprint(c)) {
- if ( in_parens )
- {
+ if (in_parens) {
printf(" )");
- in_parens = FALSE;
+ in_parens = FALSE;
}
- printf("%c",c);
- /* Quote-mark must escape itself */
- if ( c == '"' ) printf("%c",c);
+ printf("%c", c);
+ /* Quote-mark must escape itself */
+ if (c == '"')
+ printf("%c", c);
} else {
- if ( !in_parens )
- {
+ if (!in_parens) {
printf("\"(");
- in_parens = TRUE;
+ in_parens = TRUE;
}
- printf(" %02x",c);
+ printf(" %02x", c);
}
}
- if ( in_parens )
+ if (in_parens)
printf(" )");
printf("\"");
}
@@ -125,7 +125,8 @@
static void decode_lines(void)
{
if (show_linenumbers) {
- printf("%6d: ",show_offsets ? token_streampos : linenum++);
+ printf("%6d: ",
+ show_offsets ? token_streampos : linenum++);
}
}
@@ -176,29 +177,27 @@
char *tname;
/* Run error detection only if last_defined_token was assigned */
- if ( (fcode > last_defined_token) && (last_defined_token > 0) )
- {
- char temp_buf[80];
- int buf_pos;
- u8 top_byte = fcode >> 8;
- printf ("Invalid token: [0x%03x]\n", fcode);
- sprintf(temp_buf, "Backing up over first byte, which is ");
- buf_pos = strlen(temp_buf);
- if ( top_byte < 10 )
- {
- sprintf(&temp_buf[buf_pos], " %02x", top_byte);
- }else{
- sprintf( &temp_buf[buf_pos], "0x%02x ( =dec %d)",
- top_byte, top_byte);
+ if ((fcode > last_defined_token) && (last_defined_token > 0)) {
+ char temp_buf[80];
+ int buf_pos;
+ u8 top_byte = fcode >> 8;
+ printf("Invalid token: [0x%03x]\n", fcode);
+ sprintf(temp_buf, "Backing up over first byte, which is ");
+ buf_pos = strlen(temp_buf);
+ if (top_byte < 10) {
+ sprintf(&temp_buf[buf_pos], " %02x", top_byte);
+ } else {
+ sprintf(&temp_buf[buf_pos], "0x%02x ( =dec %d)",
+ top_byte, top_byte);
+ }
+ printremark(temp_buf);
+ set_streampos(token_streampos + 1);
+ return;
}
- printremark(temp_buf);
- set_streampos(token_streampos+1);
- return;
-}
-
+
tname = lookup_token(fcode);
- printf ("%s ", tname);
+ printf("%s ", tname);
/* The fcode number is interesting
* if either
@@ -206,18 +205,16 @@
* or
* b) detok is in verbose mode.
*/
- if ( strcmp( tname, unnamed) == 0 )
- {
+ if (strcmp(tname, unnamed) == 0) {
printf("[0x%03x] ", fcode);
- } else {
- if ( verbose )
- {
- /* If the token is named,
- * show its fcode number in
- * the syntax of a FORTH Comment
- */
- printf("( 0x%03x ) ", fcode);
- }
+ } else {
+ if (verbose) {
+ /* If the token is named,
+ * show its fcode number in
+ * the syntax of a FORTH Comment
+ */
+ printf("( 0x%03x ) ", fcode);
+ }
}
}
@@ -290,13 +287,13 @@
static s16 decode_offset(void)
{
- s16 offs;
+ s16 offs;
int dest;
bool invalid_dest;
int streampos = get_streampos();
output_token();
- offs=get_offset();
+ offs = get_offset();
/* The target-destination is the source-byte offset
* at which the FCode-offset is found, plus
@@ -311,34 +308,32 @@
* theoretically possible, so we'll treat it as valid.
* An offset of zero is also, of course, invalid.
*/
- invalid_dest = BOOLVAL ( (dest <= 0)
- || (dest > stream_max)
- || (offs == 0) );
+ invalid_dest = BOOLVAL((dest <= 0)
+ || (dest > stream_max)
+ || (offs == 0));
/* Show the offset in hex and again as a signed decimal number. */
- if ( offs16 )
- {
- printf("0x%04x (", (u16)(offs & 0xffff) );
- }else{
- printf("0x%02x (", (u8)(offs & 0x00ff) );
+ if (offs16) {
+ printf("0x%04x (", (u16) (offs & 0xffff));
+ } else {
+ printf("0x%02x (", (u8) (offs & 0x00ff));
}
- if ( (offs < 0) || (offs > 9) ) printf(" =dec %d", offs);
+ if ((offs < 0) || (offs > 9))
+ printf(" =dec %d", offs);
/* If we're showing source-byte offsets, show targets of offsets */
- if ( show_offsets || invalid_dest )
- {
- printf(" dest = %d ",dest);
+ if (show_offsets || invalid_dest) {
+ printf(" dest = %d ", dest);
}
printf(")\n");
- if ( invalid_dest )
- {
- if (offs == 0)
- {
- printremark("Error: Unresolved offset.");
- }else{
- printremark("Error: Invalid offset. Ignoring...");
- set_streampos( streampos);
- }
+ if (invalid_dest) {
+ if (offs == 0) {
+ printremark("Error: Unresolved offset.");
+ } else {
+ printremark
+ ("Error: Invalid offset. Ignoring...");
+ set_streampos(streampos);
+ }
}
return offs;
}
@@ -346,7 +341,7 @@
static void decode_default(void)
{
output_token();
- printf ("\n");
+ printf("\n");
}
static void new_token(void)
@@ -354,7 +349,7 @@
u16 token;
output_token();
token = next_token();
- printf("0x%03x\n",token);
+ printf("0x%03x\n", token);
add_token(token, strdup(unnamed));
}
@@ -362,14 +357,14 @@
{
u16 token;
u8 len;
- u8* string;
+ u8 *string;
output_token();
/* get forth string ( [len] [char0] ... [charn] ) */
- string=get_name(&len);
+ string = get_name(&len);
token = next_token();
printf("%s 0x%03x\n", string, token);
- add_token(token,string);
+ add_token(token, string);
}
static void bquote(void)
@@ -385,21 +380,21 @@
u32 lit;
output_token();
- lit=get_num32();
- printf("0x%x\n",lit);
+ lit = get_num32();
+ printf("0x%x\n", lit);
}
static void offset16(void)
{
decode_default();
- offs16=TRUE;
+ offs16 = TRUE;
}
static void decode_branch(void)
{
s16 offs;
- offs=decode_offset();
- if (offs>=0)
+ offs = decode_offset();
+ if (offs >= 0)
indent++;
else
indent--;
@@ -412,7 +407,7 @@
output_token();
token = next_token();
output_token_name();
- printf ("\n");
+ printf("\n");
}
/* **************************************************************************
@@ -428,37 +423,36 @@
static void decode_start(void)
{
- u8 fcformat;
- u16 fcchecksum, checksum=0;
+ u8 fcformat;
+ u16 fcchecksum, checksum = 0;
output_token();
- printf(" ( %d-bit offsets)\n", offs16 ? 16 : 8 );
-
- token_streampos = get_streampos();
+ printf(" ( %d-bit offsets)\n", offs16 ? 16 : 8);
+
+ token_streampos = get_streampos();
decode_lines();
- fcformat=get_num8();
+ fcformat = get_num8();
printf(" format: 0x%02x\n", fcformat);
-
-
- /* Check for checksum correctness. */
-
- token_streampos = get_streampos();
+
+
+ /* Check for checksum correctness. */
+
+ token_streampos = get_streampos();
decode_lines();
- fcchecksum=get_num16(); /* Read the stored checksum */
- checksum = calc_checksum(); /* Calculate the actual checksum */
-
- if ( fcchecksum==checksum )
- {
+ fcchecksum = get_num16(); /* Read the stored checksum */
+ checksum = calc_checksum(); /* Calculate the actual checksum */
+
+ if (fcchecksum == checksum) {
printf(" checksum: 0x%04x (Ok)\n", fcchecksum);
} else {
printf(" checksum should be: 0x%04x, but is 0x%04x\n",
- checksum,fcchecksum);
+ checksum, fcchecksum);
}
- token_streampos = get_streampos();
+ token_streampos = get_streampos();
decode_lines();
- fclen=get_num32();
- printf(" len: 0x%04x ( %d bytes)\n", fclen, fclen);
+ fclen = get_num32();
+ printf(" len: 0x%04x ( %d bytes)\n", fclen, fclen);
}
@@ -476,13 +470,13 @@
static void decode_token(u16 token)
{
- bool handy_flag = TRUE;
+ bool handy_flag = TRUE;
switch (token) {
case 0x0b5:
new_token();
break;
- case 0x0b6: /* Named Token */
- case 0x0ca: /* External Token */
+ case 0x0b6: /* Named Token */
+ case 0x0ca: /* External Token */
named_token();
break;
case 0x012:
@@ -494,52 +488,52 @@
case 0x0cc:
offset16();
break;
- case 0x013: /* bbranch */
- case 0x014: /* b?branch */
+ case 0x013: /* bbranch */
+ case 0x014: /* b?branch */
decode_branch();
break;
- case 0x0b7: /* b(:) */
- case 0x0b1: /* b(<mark) */
- case 0x0c4: /* b(case) */
+ case 0x0b7: /* b(:) */
+ case 0x0b1: /* b(<mark) */
+ case 0x0c4: /* b(case) */
decode_default();
indent++;
break;
- case 0x0c2: /* b(;) */
- case 0x0b2: /* b(>resolve) */
- case 0x0c5: /* b(endcase) */
+ case 0x0c2: /* b(;) */
+ case 0x0b2: /* b(>resolve) */
+ case 0x0c5: /* b(endcase) */
indent--;
decode_default();
break;
- case 0x015: /* b(loop) */
- case 0x016: /* b(+loop) */
- case 0x0c6: /* b(endof) */
+ case 0x015: /* b(loop) */
+ case 0x016: /* b(+loop) */
+ case 0x0c6: /* b(endof) */
indent--;
decode_offset();
break;
- case 0x017: /* b(do) */
- case 0x018: /* b/?do) */
- case 0x01c: /* b(of) */
+ case 0x017: /* b(do) */
+ case 0x018: /* b/?do) */
+ case 0x01c: /* b(of) */
decode_offset();
indent++;
break;
- case 0x011: /* b(') */
- case 0x0c3: /* b(to) */
+ case 0x011: /* b(') */
+ case 0x0c3: /* b(to) */
decode_two();
break;
- case 0x0fd: /* version1 */
+ case 0x0fd: /* version1 */
handy_flag = FALSE;
- case 0x0f0: /* start0 */
- case 0x0f1: /* start1 */
- case 0x0f2: /* start2 */
- case 0x0f3: /* start4 */
+ case 0x0f0: /* start0 */
+ case 0x0f1: /* start1 */
+ case 0x0f2: /* start2 */
+ case 0x0f3: /* start4 */
offs16 = handy_flag;
printremark("Unexpected FCode-Block Starter.");
decode_start();
printremark(" Ignoring length field.");
break;
- case 0: /* end0 */
- case 0xff: /* end1 */
- end_found=TRUE;
+ case 0: /* end0 */
+ case 0xff: /* end1 */
+ end_found = TRUE;
decode_default();
break;
default:
@@ -582,39 +576,38 @@
static void decode_fcode_header(void)
{
- long err_pos;
- u16 token;
+ long err_pos;
+ u16 token;
- err_pos = get_streampos();
- indent = 0;
- token = next_token();
- offs16=TRUE;
- switch (token)
- {
- case 0x0fd: /* version1 */
- offs16=FALSE;
- case 0x0f0: /* start0 */
- case 0x0f1: /* start1 */
- case 0x0f2: /* start2 */
- case 0x0f3: /* start4 */
- decode_start();
+ err_pos = get_streampos();
+ indent = 0;
+ token = next_token();
+ offs16 = TRUE;
+ switch (token) {
+ case 0x0fd: /* version1 */
+ offs16 = FALSE;
+ case 0x0f0: /* start0 */
+ case 0x0f1: /* start1 */
+ case 0x0f2: /* start2 */
+ case 0x0f3: /* start4 */
+ decode_start();
break;
default:
- {
- char temp_bufr[128] =
- "Invalid FCode Start Byte. Ignoring FCode header." ;
- set_streampos( err_pos );
- fclen = max - pc;
- printf("\n");
- if (show_linenumbers)
{
- sprintf( &(temp_bufr[strlen(temp_bufr)]),
- " Remaining len = 0x%04x ( %d bytes)", fclen, fclen);
+ char temp_bufr[128] =
+ "Invalid FCode Start Byte. Ignoring FCode header.";
+ set_streampos(err_pos);
+ fclen = max - pc;
+ printf("\n");
+ if (show_linenumbers) {
+ sprintf(&(temp_bufr[strlen(temp_bufr)]),
+ " Remaining len = 0x%04x ( %d bytes)",
+ fclen, fclen);
+ }
+ printremark(temp_bufr);
}
- printremark( temp_bufr );
}
}
-}
/* **************************************************************************
*
@@ -654,45 +647,42 @@
static void decode_fcode_block(void)
{
u16 token;
- unsigned int fc_block_start;
- unsigned int fc_block_end;
-
- end_found = FALSE;
- fc_block_start = get_streampos();
-
- decode_fcode_header();
+ unsigned int fc_block_start;
+ unsigned int fc_block_end;
- fc_block_end = fc_block_start + fclen;
-
- while ( ( !end_found || decode_all )
- && ( get_streampos() < fc_block_end ) )
- {
- token = next_token();
+ end_found = FALSE;
+ fc_block_start = get_streampos();
+
+ decode_fcode_header();
+
+ fc_block_end = fc_block_start + fclen;
+
+ while ((!end_found || decode_all)
+ && (get_streampos() < fc_block_end)) {
+ token = next_token();
decode_token(token);
- }
- if ( !end_found )
- {
- printremark("FCode-ender not found");
- }
- {
- char temp_bufr[80];
- /* Don't use fclen here, in case it got corrupted
- * by an "Unexpected FCode-Block Starter"
- */
- if ( get_streampos() == fc_block_end )
+ }
+ if (!end_found) {
+ printremark("FCode-ender not found");
+ }
{
- sprintf( temp_bufr,
- "Detokenization finished normally after %d bytes.",
- fc_block_end - fc_block_start );
- }else{
- sprintf( temp_bufr,
- "Detokenization finished prematurely after %d of %d bytes.",
- get_streampos() - fc_block_start,
- fc_block_end - fc_block_start );
- ended_okay = FALSE;
+ char temp_bufr[80];
+ /* Don't use fclen here, in case it got corrupted
+ * by an "Unexpected FCode-Block Starter"
+ */
+ if (get_streampos() == fc_block_end) {
+ sprintf(temp_bufr,
+ "Detokenization finished normally after %d bytes.",
+ fc_block_end - fc_block_start);
+ } else {
+ sprintf(temp_bufr,
+ "Detokenization finished prematurely after %d of %d bytes.",
+ get_streampos() - fc_block_start,
+ fc_block_end - fc_block_start);
+ ended_okay = FALSE;
+ }
+ printremark(temp_bufr);
}
- printremark( temp_bufr );
- }
}
/* **************************************************************************
@@ -725,35 +715,35 @@
static bool another_fcode_block(void)
{
- bool retval = FALSE;
- u16 token;
+ bool retval = FALSE;
+ u16 token;
- token = next_token();
- set_streampos( token_streampos );
+ token = next_token();
+ set_streampos(token_streampos);
- switch (token)
- {
- case 0x0fd: /* version1 */
- case 0x0f0: /* start0 */
- case 0x0f1: /* start1 */
- case 0x0f2: /* start2 */
- case 0x0f3: /* start4 */
- retval = TRUE;
- printremark("Subsequent FCode Block detected. Detokenizing.");
- break;
- case 0: /* Start of a zero-fill field */
- /* retval already = FALSE . Nothing else to be done. */
- break;
+ switch (token) {
+ case 0x0fd: /* version1 */
+ case 0x0f0: /* start0 */
+ case 0x0f1: /* start1 */
+ case 0x0f2: /* start2 */
+ case 0x0f3: /* start4 */
+ retval = TRUE;
+ printremark
+ ("Subsequent FCode Block detected. Detokenizing.");
+ break;
+ case 0: /* Start of a zero-fill field */
+ /* retval already = FALSE . Nothing else to be done. */
+ break;
default:
- {
- char temp_bufr[80];
- sprintf( temp_bufr,
- "Unexpected token, 0x%02x, after end of FCode block.",
- token);
- printremark( temp_bufr);
- }
- }
- return ( retval );
+ {
+ char temp_bufr[80];
+ sprintf(temp_bufr,
+ "Unexpected token, 0x%02x, after end of FCode block.",
+ token);
+ printremark(temp_bufr);
+ }
+ }
+ return (retval);
}
/* **************************************************************************
@@ -767,33 +757,29 @@
void detokenize(void)
{
- fclen = stream_max;
+ fclen = stream_max;
- if ( setjmp(eof_exception) == 0 )
- {
- while ( more_to_go() )
- {
- if ( ended_okay )
- {
- init_fcode_block();
- }
- ended_okay = TRUE;
+ if (setjmp(eof_exception) == 0) {
+ while (more_to_go()) {
+ if (ended_okay) {
+ init_fcode_block();
+ }
+ ended_okay = TRUE;
- adjust_for_pci_header();
+ adjust_for_pci_header();
- /* Allow for multiple FCode Blocks within the PCI image.
- * The first one had better be a valid block, but the
- * next may or may not be...
- */
- do
- {
- decode_fcode_block();
- } while ( another_fcode_block() );
+ /* Allow for multiple FCode Blocks within the PCI image.
+ * The first one had better be a valid block, but the
+ * next may or may not be...
+ */
+ do {
+ decode_fcode_block();
+ } while (another_fcode_block());
- adjust_for_pci_filler();
+ adjust_for_pci_filler();
+ }
}
- }
}
Modified: fcode-utils/detok/detok.c
===================================================================
--- fcode-utils/detok/detok.c 2006-10-14 21:07:27 UTC (rev 95)
+++ fcode-utils/detok/detok.c 2006-10-14 21:32:13 UTC (rev 96)
@@ -51,47 +51,47 @@
"(C) Copyright 2006 coresystems GmbH <info(a)coresystems.de>"
#define IBM_COPYR "(C) Copyright 2005 IBM Corporation. All Rights Reserved."
-bool verbose = FALSE ;
-bool decode_all = FALSE ;
-bool show_linenumbers = FALSE ;
-bool show_offsets = FALSE ;
+bool verbose = FALSE;
+bool decode_all = FALSE;
+bool show_linenumbers = FALSE;
+bool show_offsets = FALSE;
/* Param is FALSE when beginning to detokenize,
* TRUE preceding error-exit */
static void print_copyright(bool is_error)
{
- typedef void (*vfunct)(); /* Pointer to function returning void */
- vfunct pfunct ;
+ typedef void (*vfunct) (); /* Pointer to function returning void */
+ vfunct pfunct;
char buffr[512];
- sprintf( buffr,
- "Welcome to detok - OpenBIOS detokenizer v" DETOK_VERSION "\n"
- CORE_COPYR "\n" IBM_COPYR "\n"
- "Written by Stefan Reinauer, <stepan(a)openbios.org>\n"
+ sprintf(buffr,
+ "Welcome to detok - OpenBIOS detokenizer v" DETOK_VERSION "\n"
+ CORE_COPYR "\n" IBM_COPYR "\n"
+ "Written by Stefan Reinauer, <stepan(a)openbios.org>\n"
"This program is free software; you may redistribute it "
"under the terms of\nthe GNU General Public License v2. This "
- "program has absolutely no warranty.\n\n" );
+ "program has absolutely no warranty.\n\n");
- pfunct = ( is_error ? (vfunct)printf : printremark );
+ pfunct = (is_error ? (vfunct) printf : printremark);
- (*pfunct) ( buffr );
+ (*pfunct) (buffr);
}
static void usage(char *name)
{
- printf( "usage: %s [OPTION]... [FCODE-FILE]...\n\n"
- " -v, --verbose print fcode numbers\n"
- " -a, --all don't stop at end0\n"
- " -n, --linenumbers print line numbers\n"
- " -o, --offsets print byte offsets\n"
- " -f, --fcodes add FCodes from list-file\n"
- " -h, --help print this help text\n\n", name);
+ printf("usage: %s [OPTION]... [FCODE-FILE]...\n\n"
+ " -v, --verbose print fcode numbers\n"
+ " -a, --all don't stop at end0\n"
+ " -n, --linenumbers print line numbers\n"
+ " -o, --offsets print byte offsets\n"
+ " -f, --fcodes add FCodes from list-file\n"
+ " -h, --help print this help text\n\n", name);
}
int main(int argc, char **argv)
{
int c;
- const char *optstring="vhanof:?";
+ const char *optstring = "vhanof:?";
int linenumbers = 0;
bool add_vfcodes = FALSE;
char *vfc_filnam = NULL;
@@ -100,36 +100,36 @@
#ifdef __GLIBC__
int option_index = 0;
static struct option long_options[] = {
- { "verbose", 0, 0, 'v' },
- { "help", 0, 0, 'h' },
- { "all", 0, 0, 'a' },
- { "linenumbers", 0, 0, 'n' },
- { "offsets", 0, 0, 'o' },
- { "fcodes", 1, 0, 'f' },
- { 0, 0, 0, 0 }
+ {"verbose", 0, 0, 'v'},
+ {"help", 0, 0, 'h'},
+ {"all", 0, 0, 'a'},
+ {"linenumbers", 0, 0, 'n'},
+ {"offsets", 0, 0, 'o'},
+ {"fcodes", 1, 0, 'f'},
+ {0, 0, 0, 0}
};
- c = getopt_long (argc, argv, optstring,
- long_options, &option_index);
+ c = getopt_long(argc, argv, optstring,
+ long_options, &option_index);
#else
- c = getopt (argc, argv, optstring);
+ c = getopt(argc, argv, optstring);
#endif
if (c == -1)
break;
switch (c) {
case 'v':
- verbose=TRUE;
+ verbose = TRUE;
break;
case 'a':
- decode_all=TRUE;
+ decode_all = TRUE;
break;
case 'n':
- linenumbers|=1;
+ linenumbers |= 1;
show_linenumbers = TRUE;
break;
case 'o':
- linenumbers|=2;
+ linenumbers |= 2;
show_linenumbers = TRUE;
show_offsets = TRUE;
break;
@@ -141,10 +141,10 @@
case '?':
print_copyright(TRUE);
usage(argv[0]);
- return 0;
+ return 0;
default:
print_copyright(TRUE);
- printf ("%s: unknown option.\n",argv[0]);
+ printf("%s: unknown option.\n", argv[0]);
usage(argv[0]);
return 1;
}
@@ -152,44 +152,41 @@
if (verbose)
print_copyright(FALSE);
-
- if (linenumbers>2)
- printremark(
- "Line numbers will be disabled in favour of offsets.\n");
-
+
+ if (linenumbers > 2)
+ printremark
+ ("Line numbers will be disabled in favour of offsets.\n");
+
if (optind >= argc) {
print_copyright(TRUE);
- printf ("%s: filename missing.\n",argv[0]);
+ printf("%s: filename missing.\n", argv[0]);
usage(argv[0]);
return 1;
}
-
+
init_dictionary();
-
- if ( add_vfcodes )
- {
- if ( add_fcodes_from_list( vfc_filnam) )
- {
- freeze_dictionary();
- }
+
+ if (add_vfcodes) {
+ if (add_fcodes_from_list(vfc_filnam)) {
+ freeze_dictionary();
+ }
}
while (optind < argc) {
-
+
if (init_stream(argv[optind])) {
- printf ("Could not open file \"%s\".\n",argv[optind]);
+ printf("Could not open file \"%s\".\n", argv[optind]);
optind++;
continue;
}
detokenize();
close_stream();
-
+
optind++;
reset_dictionary();
}
-
+
printf("\n");
-
+
return 0;
}
-
Modified: fcode-utils/detok/detok.h
===================================================================
--- fcode-utils/detok/detok.h 2006-10-14 21:07:27 UTC (rev 95)
+++ fcode-utils/detok/detok.h 2006-10-14 21:32:13 UTC (rev 96)
@@ -49,8 +49,8 @@
void printremark(char *str);
-int handle_pci_header ( u8 *data_ptr );
-void handle_pci_filler(u8 *filler_ptr);
+int handle_pci_header(u8 * data_ptr);
+void handle_pci_filler(u8 * filler_ptr);
/* External declarations for variables defined in or used by
@@ -72,4 +72,4 @@
extern unsigned int token_streampos;
extern u16 last_defined_token;
-#endif /* _UTILS_DETOK_DETOK_H */
+#endif /* _UTILS_DETOK_DETOK_H */
Modified: fcode-utils/detok/dictionary.c
===================================================================
--- fcode-utils/detok/dictionary.c 2006-10-14 21:07:27 UTC (rev 95)
+++ fcode-utils/detok/dictionary.c 2006-10-14 21:32:13 UTC (rev 96)
@@ -44,16 +44,16 @@
struct token *next;
} token_t;
#define TOKEN_ENTRY(num, name) { name, (u16)num, (token_t *)NULL }
-static token_t *dictionary; /* Initialize dynamically to accommodate AIX */
+static token_t *dictionary; /* Initialize dynamically to accommodate AIX */
-static char *fcerror="ferror";
+static char *fcerror = "ferror";
char *lookup_token(u16 number)
{
token_t *curr;
-
- for (curr=dictionary; curr!=NULL; curr=curr->next)
- if (curr->fcode==number)
+
+ for (curr = dictionary; curr != NULL; curr = curr->next)
+ if (curr->fcode == number)
break;
if (curr)
@@ -110,462 +110,458 @@
{
token_t *curr;
- curr=malloc(sizeof(token_t));
- if(!curr) {
+ curr = malloc(sizeof(token_t));
+ if (!curr) {
printf("Out of memory while adding token.\n");
exit(-ENOMEM);
}
- curr->next=dictionary;
- curr->fcode=number;
- curr->name=name;
+ curr->next = dictionary;
+ curr->fcode = number;
+ curr->name = name;
- dictionary=curr;
+ dictionary = curr;
- if ( check_tok_seq )
- {
- /* Error-check, but not for first time. */
- if ( (number == last_defined_token + 1)
- || (last_defined_token == 0) )
- {
- last_defined_token = number;
- }else{
- if ( number <= last_defined_token )
- {
- printremark("Warning: New token # might overlap "
- "previously assigned token #(s).");
- }else{
- printremark("Warning: New token # out of sequence with "
- "previously assigned token #(s).");
- /* It's increasing; update it. */
- last_defined_token = number;
+ if (check_tok_seq) {
+ /* Error-check, but not for first time. */
+ if ((number == last_defined_token + 1)
+ || (last_defined_token == 0)) {
+ last_defined_token = number;
+ } else {
+ if (number <= last_defined_token) {
+ printremark("Warning: New token # might overlap "
+ "previously assigned token #(s).");
+ } else {
+ printremark("Warning: New token # out of sequence with "
+ "previously assigned token #(s).");
+ /* It's increasing; update it. */
+ last_defined_token = number;
+ }
}
-}
}
}
-token_t detok_table[] = {
+token_t detok_table[] = {
- TOKEN_ENTRY( 0x000, "end0" ),
- TOKEN_ENTRY( 0x010, "b(lit)" ),
- TOKEN_ENTRY( 0x011, "b(')" ),
- TOKEN_ENTRY( 0x012, "b(\")" ),
- TOKEN_ENTRY( 0x013, "bbranch" ),
- TOKEN_ENTRY( 0x014, "b?branch" ),
- TOKEN_ENTRY( 0x015, "b(loop)" ),
- TOKEN_ENTRY( 0x016, "b(+loop)" ),
- TOKEN_ENTRY( 0x017, "b(do)" ),
- TOKEN_ENTRY( 0x018, "b(?do)" ),
- TOKEN_ENTRY( 0x019, "i" ),
- TOKEN_ENTRY( 0x01a, "j" ),
- TOKEN_ENTRY( 0x01b, "b(leave)" ),
- TOKEN_ENTRY( 0x01c, "b(of)" ),
- TOKEN_ENTRY( 0x01d, "execute" ),
- TOKEN_ENTRY( 0x01e, "+" ),
- TOKEN_ENTRY( 0x01f, "-" ),
- TOKEN_ENTRY( 0x020, "*" ),
- TOKEN_ENTRY( 0x021, "/" ),
- TOKEN_ENTRY( 0x022, "mod" ),
- TOKEN_ENTRY( 0x023, "and" ),
- TOKEN_ENTRY( 0x024, "or" ),
- TOKEN_ENTRY( 0x025, "xor" ),
- TOKEN_ENTRY( 0x026, "invert" ),
- TOKEN_ENTRY( 0x027, "lshift" ),
- TOKEN_ENTRY( 0x028, "rshift" ),
- TOKEN_ENTRY( 0x029, ">>a" ),
- TOKEN_ENTRY( 0x02a, "/mod" ),
- TOKEN_ENTRY( 0x02b, "u/mod" ),
- TOKEN_ENTRY( 0x02c, "negate" ),
- TOKEN_ENTRY( 0x02d, "abs" ),
- TOKEN_ENTRY( 0x02e, "min" ),
- TOKEN_ENTRY( 0x02f, "max" ),
- TOKEN_ENTRY( 0x030, ">r" ),
- TOKEN_ENTRY( 0x031, "r>" ),
- TOKEN_ENTRY( 0x032, "r@" ),
- TOKEN_ENTRY( 0x033, "exit" ),
- TOKEN_ENTRY( 0x034, "0=" ),
- TOKEN_ENTRY( 0x035, "0<>" ),
- TOKEN_ENTRY( 0x036, "0<" ),
- TOKEN_ENTRY( 0x037, "0<=" ),
- TOKEN_ENTRY( 0x038, "0>" ),
- TOKEN_ENTRY( 0x039, "0>=" ),
- TOKEN_ENTRY( 0x03a, "<" ),
- TOKEN_ENTRY( 0x03b, ">" ),
- TOKEN_ENTRY( 0x03c, "=" ),
- TOKEN_ENTRY( 0x03d, "<>" ),
- TOKEN_ENTRY( 0x03e, "u>" ),
- TOKEN_ENTRY( 0x03f, "u<=" ),
- TOKEN_ENTRY( 0x040, "u<" ),
- TOKEN_ENTRY( 0x041, "u>=" ),
- TOKEN_ENTRY( 0x042, ">=" ),
- TOKEN_ENTRY( 0x043, "<=" ),
- TOKEN_ENTRY( 0x044, "between" ),
- TOKEN_ENTRY( 0x045, "within" ),
- TOKEN_ENTRY( 0x046, "drop" ),
- TOKEN_ENTRY( 0x047, "dup" ),
- TOKEN_ENTRY( 0x048, "over" ),
- TOKEN_ENTRY( 0x049, "swap" ),
- TOKEN_ENTRY( 0x04A, "rot" ),
- TOKEN_ENTRY( 0x04b, "-rot" ),
- TOKEN_ENTRY( 0x04c, "tuck" ),
- TOKEN_ENTRY( 0x04d, "nip" ),
- TOKEN_ENTRY( 0x04e, "pick" ),
- TOKEN_ENTRY( 0x04f, "roll" ),
- TOKEN_ENTRY( 0x050, "?dup" ),
- TOKEN_ENTRY( 0x051, "depth" ),
- TOKEN_ENTRY( 0x052, "2drop" ),
- TOKEN_ENTRY( 0x053, "2dup" ),
- TOKEN_ENTRY( 0x054, "2over" ),
- TOKEN_ENTRY( 0x055, "2swap" ),
- TOKEN_ENTRY( 0x056, "2rot" ),
- TOKEN_ENTRY( 0x057, "2/" ),
- TOKEN_ENTRY( 0x058, "u2/" ),
- TOKEN_ENTRY( 0x059, "2*" ),
- TOKEN_ENTRY( 0x05a, "/c" ),
- TOKEN_ENTRY( 0x05b, "/w" ),
- TOKEN_ENTRY( 0x05c, "/l" ),
- TOKEN_ENTRY( 0x05d, "/n" ),
- TOKEN_ENTRY( 0x05e, "ca+" ),
- TOKEN_ENTRY( 0x05f, "wa+" ),
- TOKEN_ENTRY( 0x060, "la+" ),
- TOKEN_ENTRY( 0x061, "na+" ),
- TOKEN_ENTRY( 0x062, "char+" ),
- TOKEN_ENTRY( 0x063, "wa1+" ),
- TOKEN_ENTRY( 0x064, "la1+" ),
- TOKEN_ENTRY( 0x065, "cell+" ),
- TOKEN_ENTRY( 0x066, "chars" ),
- TOKEN_ENTRY( 0x067, "/w*" ),
- TOKEN_ENTRY( 0x068, "/l*" ),
- TOKEN_ENTRY( 0x069, "cells" ),
- TOKEN_ENTRY( 0x06a, "on" ),
- TOKEN_ENTRY( 0x06b, "off" ),
- TOKEN_ENTRY( 0x06c, "+!" ),
- TOKEN_ENTRY( 0x06d, "@" ),
- TOKEN_ENTRY( 0x06e, "l@" ),
- TOKEN_ENTRY( 0x06f, "w@" ),
- TOKEN_ENTRY( 0x070, "<w@" ),
- TOKEN_ENTRY( 0x071, "c@" ),
- TOKEN_ENTRY( 0x072, "!" ),
- TOKEN_ENTRY( 0x073, "l!" ),
- TOKEN_ENTRY( 0x074, "w!" ),
- TOKEN_ENTRY( 0x075, "c!" ),
- TOKEN_ENTRY( 0x076, "2@" ),
- TOKEN_ENTRY( 0x077, "2!" ),
- TOKEN_ENTRY( 0x078, "move" ),
- TOKEN_ENTRY( 0x079, "fill" ),
- TOKEN_ENTRY( 0x07a, "comp" ),
- TOKEN_ENTRY( 0x07b, "noop" ),
- TOKEN_ENTRY( 0x07c, "lwsplit" ),
- TOKEN_ENTRY( 0x07d, "wljoin" ),
- TOKEN_ENTRY( 0x07e, "lbsplit" ),
- TOKEN_ENTRY( 0x07f, "bljoin" ),
- TOKEN_ENTRY( 0x080, "wbflip" ),
- TOKEN_ENTRY( 0x081, "upc" ),
- TOKEN_ENTRY( 0x082, "lcc" ),
- TOKEN_ENTRY( 0x083, "pack" ),
- TOKEN_ENTRY( 0x084, "count" ),
- TOKEN_ENTRY( 0x085, "body>" ),
- TOKEN_ENTRY( 0x086, ">body" ),
- TOKEN_ENTRY( 0x087, "fcode-revision" ),
- TOKEN_ENTRY( 0x088, "span" ),
- TOKEN_ENTRY( 0x089, "unloop" ),
- TOKEN_ENTRY( 0x08a, "expect" ),
- TOKEN_ENTRY( 0x08b, "alloc-mem" ),
- TOKEN_ENTRY( 0x08c, "free-mem" ),
- TOKEN_ENTRY( 0x08d, "key?" ),
- TOKEN_ENTRY( 0x08e, "key" ),
- TOKEN_ENTRY( 0x08f, "emit" ),
- TOKEN_ENTRY( 0x090, "type" ),
- TOKEN_ENTRY( 0x091, "(cr" ),
- TOKEN_ENTRY( 0x092, "cr" ),
- TOKEN_ENTRY( 0x093, "#out" ),
- TOKEN_ENTRY( 0x094, "#line" ),
- TOKEN_ENTRY( 0x095, "hold" ),
- TOKEN_ENTRY( 0x096, "<#" ),
- TOKEN_ENTRY( 0x097, "u#>" ),
- TOKEN_ENTRY( 0x098, "sign" ),
- TOKEN_ENTRY( 0x099, "u#" ),
- TOKEN_ENTRY( 0x09a, "u#s" ),
- TOKEN_ENTRY( 0x09b, "u." ),
- TOKEN_ENTRY( 0x09c, "u.r" ),
- TOKEN_ENTRY( 0x09d, "." ),
- TOKEN_ENTRY( 0x09e, ".r" ),
- TOKEN_ENTRY( 0x09f, ".s" ),
- TOKEN_ENTRY( 0x0a0, "base" ),
- TOKEN_ENTRY( 0x0a1, "convert" ),
- TOKEN_ENTRY( 0x0a2, "$number" ),
- TOKEN_ENTRY( 0x0a3, "digit" ),
- TOKEN_ENTRY( 0x0a4, "-1" ),
- TOKEN_ENTRY( 0x0a5, "0" ),
- TOKEN_ENTRY( 0x0a6, "1" ),
- TOKEN_ENTRY( 0x0a7, "2" ),
- TOKEN_ENTRY( 0x0a8, "3" ),
- TOKEN_ENTRY( 0x0a9, "bl" ),
- TOKEN_ENTRY( 0x0aa, "bs" ),
- TOKEN_ENTRY( 0x0ab, "bell" ),
- TOKEN_ENTRY( 0x0ac, "bounds" ),
- TOKEN_ENTRY( 0x0ad, "here" ),
- TOKEN_ENTRY( 0x0ae, "aligned" ),
- TOKEN_ENTRY( 0x0af, "wbsplit" ),
- TOKEN_ENTRY( 0x0b0, "bwjoin" ),
- TOKEN_ENTRY( 0x0b1, "b(<mark)" ),
- TOKEN_ENTRY( 0x0b2, "b(>resolve)" ),
- TOKEN_ENTRY( 0x0b3, "set-token-table" ),
- TOKEN_ENTRY( 0x0b4, "set-table" ),
- TOKEN_ENTRY( 0x0b5, "new-token" ),
- TOKEN_ENTRY( 0x0b6, "named-token" ),
- TOKEN_ENTRY( 0x0b7, "b(:)" ),
- TOKEN_ENTRY( 0x0b8, "b(value)" ),
- TOKEN_ENTRY( 0x0b9, "b(variable)" ),
- TOKEN_ENTRY( 0x0ba, "b(constant)" ),
- TOKEN_ENTRY( 0x0bb, "b(create)" ),
- TOKEN_ENTRY( 0x0bc, "b(defer)" ),
- TOKEN_ENTRY( 0x0bd, "b(buffer:)" ),
- TOKEN_ENTRY( 0x0be, "b(field)" ),
- TOKEN_ENTRY( 0x0bf, "b(code)" ),
- TOKEN_ENTRY( 0x0c0, "instance" ),
- TOKEN_ENTRY( 0x0c2, "b(;)" ),
- TOKEN_ENTRY( 0x0c3, "b(to)" ),
- TOKEN_ENTRY( 0x0c4, "b(case)" ),
- TOKEN_ENTRY( 0x0c5, "b(endcase)" ),
- TOKEN_ENTRY( 0x0c6, "b(endof)" ),
- TOKEN_ENTRY( 0x0c7, "#" ),
- TOKEN_ENTRY( 0x0c8, "#s" ),
- TOKEN_ENTRY( 0x0c9, "#>" ),
- TOKEN_ENTRY( 0x0ca, "external-token" ),
- TOKEN_ENTRY( 0x0cb, "$find" ),
- TOKEN_ENTRY( 0x0cc, "offset16" ),
- TOKEN_ENTRY( 0x0cd, "evaluate" ),
- TOKEN_ENTRY( 0x0d0, "c," ),
- TOKEN_ENTRY( 0x0d1, "w," ),
- TOKEN_ENTRY( 0x0d2, "l," ),
- TOKEN_ENTRY( 0x0d3, "," ),
- TOKEN_ENTRY( 0x0d4, "um*" ),
- TOKEN_ENTRY( 0x0d5, "um/mod" ),
- TOKEN_ENTRY( 0x0d8, "d+" ),
- TOKEN_ENTRY( 0x0d9, "d-" ),
- TOKEN_ENTRY( 0x0da, "get-token" ),
- TOKEN_ENTRY( 0x0db, "set-token" ),
- TOKEN_ENTRY( 0x0dc, "state" ),
- TOKEN_ENTRY( 0x0dd, "compile" ),
- TOKEN_ENTRY( 0x0de, "behavior" ),
- TOKEN_ENTRY( 0x0f0, "start0" ),
- TOKEN_ENTRY( 0x0f1, "start1" ),
- TOKEN_ENTRY( 0x0f2, "start2" ),
- TOKEN_ENTRY( 0x0f3, "start4" ),
- TOKEN_ENTRY( 0x0fc, "ferror" ),
- TOKEN_ENTRY( 0x0fd, "version1" ),
- TOKEN_ENTRY( 0x0fe, "4-byte-id" ),
- TOKEN_ENTRY( 0x0ff, "end1" ),
- TOKEN_ENTRY( 0x101, "dma-alloc" ),
- TOKEN_ENTRY( 0x102, "my-address" ),
- TOKEN_ENTRY( 0x103, "my-space" ),
- TOKEN_ENTRY( 0x104, "memmap" ),
- TOKEN_ENTRY( 0x105, "free-virtual" ),
- TOKEN_ENTRY( 0x106, ">physical" ),
- TOKEN_ENTRY( 0x10f, "my-params" ),
- TOKEN_ENTRY( 0x110, "property" ),
- TOKEN_ENTRY( 0x111, "encode-int" ),
- TOKEN_ENTRY( 0x112, "encode+" ),
- TOKEN_ENTRY( 0x113, "encode-phys" ),
- TOKEN_ENTRY( 0x114, "encode-string" ),
- TOKEN_ENTRY( 0x115, "encode-bytes" ),
- TOKEN_ENTRY( 0x116, "reg" ),
- TOKEN_ENTRY( 0x117, "intr" ),
- TOKEN_ENTRY( 0x118, "driver" ),
- TOKEN_ENTRY( 0x119, "model" ),
- TOKEN_ENTRY( 0x11a, "device-type" ),
- TOKEN_ENTRY( 0x11b, "parse-2int" ),
- TOKEN_ENTRY( 0x11c, "is-install" ),
- TOKEN_ENTRY( 0x11d, "is-remove" ),
- TOKEN_ENTRY( 0x11e, "is-selftest" ),
- TOKEN_ENTRY( 0x11f, "new-device" ),
- TOKEN_ENTRY( 0x120, "diagnostic-mode?" ),
- TOKEN_ENTRY( 0x121, "display-status" ),
- TOKEN_ENTRY( 0x122, "memory-test-issue" ),
- TOKEN_ENTRY( 0x123, "group-code" ),
- TOKEN_ENTRY( 0x124, "mask" ),
- TOKEN_ENTRY( 0x125, "get-msecs" ),
- TOKEN_ENTRY( 0x126, "ms" ),
- TOKEN_ENTRY( 0x127, "finish-device" ),
- TOKEN_ENTRY( 0x128, "decode-phys" ),
- TOKEN_ENTRY( 0x12b, "interpose" ),
- TOKEN_ENTRY( 0x130, "map-low" ),
- TOKEN_ENTRY( 0x131, "sbus-intr>cpu" ),
- TOKEN_ENTRY( 0x150, "#lines" ),
- TOKEN_ENTRY( 0x151, "#columns" ),
- TOKEN_ENTRY( 0x152, "line#" ),
- TOKEN_ENTRY( 0x153, "column#" ),
- TOKEN_ENTRY( 0x154, "inverse?" ),
- TOKEN_ENTRY( 0x155, "inverse-screen?" ),
- TOKEN_ENTRY( 0x156, "frame-buffer-busy?" ),
- TOKEN_ENTRY( 0x157, "draw-character" ),
- TOKEN_ENTRY( 0x158, "reset-screen" ),
- TOKEN_ENTRY( 0x159, "toggle-cursor" ),
- TOKEN_ENTRY( 0x15a, "erase-screen" ),
- TOKEN_ENTRY( 0x15b, "blink-screen" ),
- TOKEN_ENTRY( 0x15c, "invert-screen" ),
- TOKEN_ENTRY( 0x15d, "insert-characters" ),
- TOKEN_ENTRY( 0x15e, "delete-characters" ),
- TOKEN_ENTRY( 0x15f, "insert-lines" ),
- TOKEN_ENTRY( 0x160, "delete-lines" ),
- TOKEN_ENTRY( 0x161, "draw-logo" ),
- TOKEN_ENTRY( 0x162, "frame-buffer-adr" ),
- TOKEN_ENTRY( 0x163, "screen-height" ),
- TOKEN_ENTRY( 0x164, "screen-width" ),
- TOKEN_ENTRY( 0x165, "window-top" ),
- TOKEN_ENTRY( 0x166, "window-left" ),
- TOKEN_ENTRY( 0x16a, "default-font" ),
- TOKEN_ENTRY( 0x16b, "set-font" ),
- TOKEN_ENTRY( 0x16c, "char-height" ),
- TOKEN_ENTRY( 0x16d, "char-width" ),
- TOKEN_ENTRY( 0x16e, ">font" ),
- TOKEN_ENTRY( 0x16f, "fontbytes" ),
- TOKEN_ENTRY( 0x170, "fb1-draw-character" ),
- TOKEN_ENTRY( 0x171, "fb1-reset-screen" ),
- TOKEN_ENTRY( 0x172, "fb1-toggle-cursor" ),
- TOKEN_ENTRY( 0x173, "fb1-erase-screen" ),
- TOKEN_ENTRY( 0x174, "fb1-blink-screen" ),
- TOKEN_ENTRY( 0x175, "fb1-invert-screen" ),
- TOKEN_ENTRY( 0x176, "fb1-insert-characters" ),
- TOKEN_ENTRY( 0x177, "fb1-delete-characters" ),
- TOKEN_ENTRY( 0x178, "fb1-insert-lines" ),
- TOKEN_ENTRY( 0x179, "fb1-delete-lines" ),
- TOKEN_ENTRY( 0x17a, "fb1-draw-logo" ),
- TOKEN_ENTRY( 0x17b, "fb1-install" ),
- TOKEN_ENTRY( 0x17c, "fb1-slide-up" ),
- TOKEN_ENTRY( 0x180, "fb8-draw-character" ),
- TOKEN_ENTRY( 0x181, "fb8-reset-screen" ),
- TOKEN_ENTRY( 0x182, "fb8-toggle-cursor" ),
- TOKEN_ENTRY( 0x183, "fb8-erase-screen" ),
- TOKEN_ENTRY( 0x184, "fb8-blink-screen" ),
- TOKEN_ENTRY( 0x185, "fb8-invert-screen" ),
- TOKEN_ENTRY( 0x186, "fb8-insert-characters" ),
- TOKEN_ENTRY( 0x187, "fb8-delete-characters" ),
- TOKEN_ENTRY( 0x188, "fb8-insert-lines" ),
- TOKEN_ENTRY( 0x189, "fb8-delete-lines" ),
- TOKEN_ENTRY( 0x18a, "fb8-draw-logo" ),
- TOKEN_ENTRY( 0x18b, "fb8-install" ),
- TOKEN_ENTRY( 0x1a0, "return-buffer" ),
- TOKEN_ENTRY( 0x1a1, "xmit-packet" ),
- TOKEN_ENTRY( 0x1a2, "poll-packet" ),
- TOKEN_ENTRY( 0x1a4, "mac-address" ),
- TOKEN_ENTRY( 0x201, "device-name" ),
- TOKEN_ENTRY( 0x202, "my-args" ),
- TOKEN_ENTRY( 0x203, "my-self" ),
- TOKEN_ENTRY( 0x204, "find-package" ),
- TOKEN_ENTRY( 0x205, "open-package" ),
- TOKEN_ENTRY( 0x206, "close-package" ),
- TOKEN_ENTRY( 0x207, "find-method" ),
- TOKEN_ENTRY( 0x208, "call-package" ),
- TOKEN_ENTRY( 0x209, "$call-parent" ),
- TOKEN_ENTRY( 0x20a, "my-parent" ),
- TOKEN_ENTRY( 0x20b, "ihandle>phandle" ),
- TOKEN_ENTRY( 0x20d, "my-unit" ),
- TOKEN_ENTRY( 0x20e, "$call-method" ),
- TOKEN_ENTRY( 0x20f, "$open-package" ),
- TOKEN_ENTRY( 0x210, "processor-type" ),
- TOKEN_ENTRY( 0x211, "firmware-version" ),
- TOKEN_ENTRY( 0x212, "fcode-version" ),
- TOKEN_ENTRY( 0x213, "alarm" ),
- TOKEN_ENTRY( 0x214, "(is-user-word)" ),
- TOKEN_ENTRY( 0x215, "suspend-fcode" ),
- TOKEN_ENTRY( 0x216, "abort" ),
- TOKEN_ENTRY( 0x217, "catch" ),
- TOKEN_ENTRY( 0x218, "throw" ),
- TOKEN_ENTRY( 0x219, "user-abort" ),
- TOKEN_ENTRY( 0x21a, "get-my-property" ),
- TOKEN_ENTRY( 0x21b, "decode-int" ),
- TOKEN_ENTRY( 0x21c, "decode-string" ),
- TOKEN_ENTRY( 0x21d, "get-inherited-property" ),
- TOKEN_ENTRY( 0x21e, "delete-property" ),
- TOKEN_ENTRY( 0x21f, "get-package-property" ),
- TOKEN_ENTRY( 0x220, "cpeek" ),
- TOKEN_ENTRY( 0x221, "wpeek" ),
- TOKEN_ENTRY( 0x222, "lpeek" ),
- TOKEN_ENTRY( 0x223, "cpoke" ),
- TOKEN_ENTRY( 0x224, "wpoke" ),
- TOKEN_ENTRY( 0x225, "lpoke" ),
- TOKEN_ENTRY( 0x226, "lwflip" ),
- TOKEN_ENTRY( 0x227, "lbflip" ),
- TOKEN_ENTRY( 0x228, "lbflips" ),
- TOKEN_ENTRY( 0x229, "adr-mask" ),
- TOKEN_ENTRY( 0x230, "rb@" ),
- TOKEN_ENTRY( 0x231, "rb!" ),
- TOKEN_ENTRY( 0x232, "rw@" ),
- TOKEN_ENTRY( 0x233, "rw!" ),
- TOKEN_ENTRY( 0x234, "rl@" ),
- TOKEN_ENTRY( 0x235, "rl!" ),
- TOKEN_ENTRY( 0x236, "wbflips" ),
- TOKEN_ENTRY( 0x237, "lwflips" ),
- TOKEN_ENTRY( 0x238, "probe" ),
- TOKEN_ENTRY( 0x239, "probe-virtual" ),
- TOKEN_ENTRY( 0x23b, "child" ),
- TOKEN_ENTRY( 0x23c, "peer" ),
- TOKEN_ENTRY( 0x23d, "next-property" ),
- TOKEN_ENTRY( 0x23e, "byte-load" ),
- TOKEN_ENTRY( 0x23f, "set-args" ),
- TOKEN_ENTRY( 0x240, "left-parse-string" ),
+ TOKEN_ENTRY(0x000, "end0"),
+ TOKEN_ENTRY(0x010, "b(lit)"),
+ TOKEN_ENTRY(0x011, "b(')"),
+ TOKEN_ENTRY(0x012, "b(\")"),
+ TOKEN_ENTRY(0x013, "bbranch"),
+ TOKEN_ENTRY(0x014, "b?branch"),
+ TOKEN_ENTRY(0x015, "b(loop)"),
+ TOKEN_ENTRY(0x016, "b(+loop)"),
+ TOKEN_ENTRY(0x017, "b(do)"),
+ TOKEN_ENTRY(0x018, "b(?do)"),
+ TOKEN_ENTRY(0x019, "i"),
+ TOKEN_ENTRY(0x01a, "j"),
+ TOKEN_ENTRY(0x01b, "b(leave)"),
+ TOKEN_ENTRY(0x01c, "b(of)"),
+ TOKEN_ENTRY(0x01d, "execute"),
+ TOKEN_ENTRY(0x01e, "+"),
+ TOKEN_ENTRY(0x01f, "-"),
+ TOKEN_ENTRY(0x020, "*"),
+ TOKEN_ENTRY(0x021, "/"),
+ TOKEN_ENTRY(0x022, "mod"),
+ TOKEN_ENTRY(0x023, "and"),
+ TOKEN_ENTRY(0x024, "or"),
+ TOKEN_ENTRY(0x025, "xor"),
+ TOKEN_ENTRY(0x026, "invert"),
+ TOKEN_ENTRY(0x027, "lshift"),
+ TOKEN_ENTRY(0x028, "rshift"),
+ TOKEN_ENTRY(0x029, ">>a"),
+ TOKEN_ENTRY(0x02a, "/mod"),
+ TOKEN_ENTRY(0x02b, "u/mod"),
+ TOKEN_ENTRY(0x02c, "negate"),
+ TOKEN_ENTRY(0x02d, "abs"),
+ TOKEN_ENTRY(0x02e, "min"),
+ TOKEN_ENTRY(0x02f, "max"),
+ TOKEN_ENTRY(0x030, ">r"),
+ TOKEN_ENTRY(0x031, "r>"),
+ TOKEN_ENTRY(0x032, "r@"),
+ TOKEN_ENTRY(0x033, "exit"),
+ TOKEN_ENTRY(0x034, "0="),
+ TOKEN_ENTRY(0x035, "0<>"),
+ TOKEN_ENTRY(0x036, "0<"),
+ TOKEN_ENTRY(0x037, "0<="),
+ TOKEN_ENTRY(0x038, "0>"),
+ TOKEN_ENTRY(0x039, "0>="),
+ TOKEN_ENTRY(0x03a, "<"),
+ TOKEN_ENTRY(0x03b, ">"),
+ TOKEN_ENTRY(0x03c, "="),
+ TOKEN_ENTRY(0x03d, "<>"),
+ TOKEN_ENTRY(0x03e, "u>"),
+ TOKEN_ENTRY(0x03f, "u<="),
+ TOKEN_ENTRY(0x040, "u<"),
+ TOKEN_ENTRY(0x041, "u>="),
+ TOKEN_ENTRY(0x042, ">="),
+ TOKEN_ENTRY(0x043, "<="),
+ TOKEN_ENTRY(0x044, "between"),
+ TOKEN_ENTRY(0x045, "within"),
+ TOKEN_ENTRY(0x046, "drop"),
+ TOKEN_ENTRY(0x047, "dup"),
+ TOKEN_ENTRY(0x048, "over"),
+ TOKEN_ENTRY(0x049, "swap"),
+ TOKEN_ENTRY(0x04A, "rot"),
+ TOKEN_ENTRY(0x04b, "-rot"),
+ TOKEN_ENTRY(0x04c, "tuck"),
+ TOKEN_ENTRY(0x04d, "nip"),
+ TOKEN_ENTRY(0x04e, "pick"),
+ TOKEN_ENTRY(0x04f, "roll"),
+ TOKEN_ENTRY(0x050, "?dup"),
+ TOKEN_ENTRY(0x051, "depth"),
+ TOKEN_ENTRY(0x052, "2drop"),
+ TOKEN_ENTRY(0x053, "2dup"),
+ TOKEN_ENTRY(0x054, "2over"),
+ TOKEN_ENTRY(0x055, "2swap"),
+ TOKEN_ENTRY(0x056, "2rot"),
+ TOKEN_ENTRY(0x057, "2/"),
+ TOKEN_ENTRY(0x058, "u2/"),
+ TOKEN_ENTRY(0x059, "2*"),
+ TOKEN_ENTRY(0x05a, "/c"),
+ TOKEN_ENTRY(0x05b, "/w"),
+ TOKEN_ENTRY(0x05c, "/l"),
+ TOKEN_ENTRY(0x05d, "/n"),
+ TOKEN_ENTRY(0x05e, "ca+"),
+ TOKEN_ENTRY(0x05f, "wa+"),
+ TOKEN_ENTRY(0x060, "la+"),
+ TOKEN_ENTRY(0x061, "na+"),
+ TOKEN_ENTRY(0x062, "char+"),
+ TOKEN_ENTRY(0x063, "wa1+"),
+ TOKEN_ENTRY(0x064, "la1+"),
+ TOKEN_ENTRY(0x065, "cell+"),
+ TOKEN_ENTRY(0x066, "chars"),
+ TOKEN_ENTRY(0x067, "/w*"),
+ TOKEN_ENTRY(0x068, "/l*"),
+ TOKEN_ENTRY(0x069, "cells"),
+ TOKEN_ENTRY(0x06a, "on"),
+ TOKEN_ENTRY(0x06b, "off"),
+ TOKEN_ENTRY(0x06c, "+!"),
+ TOKEN_ENTRY(0x06d, "@"),
+ TOKEN_ENTRY(0x06e, "l@"),
+ TOKEN_ENTRY(0x06f, "w@"),
+ TOKEN_ENTRY(0x070, "<w@"),
+ TOKEN_ENTRY(0x071, "c@"),
+ TOKEN_ENTRY(0x072, "!"),
+ TOKEN_ENTRY(0x073, "l!"),
+ TOKEN_ENTRY(0x074, "w!"),
+ TOKEN_ENTRY(0x075, "c!"),
+ TOKEN_ENTRY(0x076, "2@"),
+ TOKEN_ENTRY(0x077, "2!"),
+ TOKEN_ENTRY(0x078, "move"),
+ TOKEN_ENTRY(0x079, "fill"),
+ TOKEN_ENTRY(0x07a, "comp"),
+ TOKEN_ENTRY(0x07b, "noop"),
+ TOKEN_ENTRY(0x07c, "lwsplit"),
+ TOKEN_ENTRY(0x07d, "wljoin"),
+ TOKEN_ENTRY(0x07e, "lbsplit"),
+ TOKEN_ENTRY(0x07f, "bljoin"),
+ TOKEN_ENTRY(0x080, "wbflip"),
+ TOKEN_ENTRY(0x081, "upc"),
+ TOKEN_ENTRY(0x082, "lcc"),
+ TOKEN_ENTRY(0x083, "pack"),
+ TOKEN_ENTRY(0x084, "count"),
+ TOKEN_ENTRY(0x085, "body>"),
+ TOKEN_ENTRY(0x086, ">body"),
+ TOKEN_ENTRY(0x087, "fcode-revision"),
+ TOKEN_ENTRY(0x088, "span"),
+ TOKEN_ENTRY(0x089, "unloop"),
+ TOKEN_ENTRY(0x08a, "expect"),
+ TOKEN_ENTRY(0x08b, "alloc-mem"),
+ TOKEN_ENTRY(0x08c, "free-mem"),
+ TOKEN_ENTRY(0x08d, "key?"),
+ TOKEN_ENTRY(0x08e, "key"),
+ TOKEN_ENTRY(0x08f, "emit"),
+ TOKEN_ENTRY(0x090, "type"),
+ TOKEN_ENTRY(0x091, "(cr"),
+ TOKEN_ENTRY(0x092, "cr"),
+ TOKEN_ENTRY(0x093, "#out"),
+ TOKEN_ENTRY(0x094, "#line"),
+ TOKEN_ENTRY(0x095, "hold"),
+ TOKEN_ENTRY(0x096, "<#"),
+ TOKEN_ENTRY(0x097, "u#>"),
+ TOKEN_ENTRY(0x098, "sign"),
+ TOKEN_ENTRY(0x099, "u#"),
+ TOKEN_ENTRY(0x09a, "u#s"),
+ TOKEN_ENTRY(0x09b, "u."),
+ TOKEN_ENTRY(0x09c, "u.r"),
+ TOKEN_ENTRY(0x09d, "."),
+ TOKEN_ENTRY(0x09e, ".r"),
+ TOKEN_ENTRY(0x09f, ".s"),
+ TOKEN_ENTRY(0x0a0, "base"),
+ TOKEN_ENTRY(0x0a1, "convert"),
+ TOKEN_ENTRY(0x0a2, "$number"),
+ TOKEN_ENTRY(0x0a3, "digit"),
+ TOKEN_ENTRY(0x0a4, "-1"),
+ TOKEN_ENTRY(0x0a5, "0"),
+ TOKEN_ENTRY(0x0a6, "1"),
+ TOKEN_ENTRY(0x0a7, "2"),
+ TOKEN_ENTRY(0x0a8, "3"),
+ TOKEN_ENTRY(0x0a9, "bl"),
+ TOKEN_ENTRY(0x0aa, "bs"),
+ TOKEN_ENTRY(0x0ab, "bell"),
+ TOKEN_ENTRY(0x0ac, "bounds"),
+ TOKEN_ENTRY(0x0ad, "here"),
+ TOKEN_ENTRY(0x0ae, "aligned"),
+ TOKEN_ENTRY(0x0af, "wbsplit"),
+ TOKEN_ENTRY(0x0b0, "bwjoin"),
+ TOKEN_ENTRY(0x0b1, "b(<mark)"),
+ TOKEN_ENTRY(0x0b2, "b(>resolve)"),
+ TOKEN_ENTRY(0x0b3, "set-token-table"),
+ TOKEN_ENTRY(0x0b4, "set-table"),
+ TOKEN_ENTRY(0x0b5, "new-token"),
+ TOKEN_ENTRY(0x0b6, "named-token"),
+ TOKEN_ENTRY(0x0b7, "b(:)"),
+ TOKEN_ENTRY(0x0b8, "b(value)"),
+ TOKEN_ENTRY(0x0b9, "b(variable)"),
+ TOKEN_ENTRY(0x0ba, "b(constant)"),
+ TOKEN_ENTRY(0x0bb, "b(create)"),
+ TOKEN_ENTRY(0x0bc, "b(defer)"),
+ TOKEN_ENTRY(0x0bd, "b(buffer:)"),
+ TOKEN_ENTRY(0x0be, "b(field)"),
+ TOKEN_ENTRY(0x0bf, "b(code)"),
+ TOKEN_ENTRY(0x0c0, "instance"),
+ TOKEN_ENTRY(0x0c2, "b(;)"),
+ TOKEN_ENTRY(0x0c3, "b(to)"),
+ TOKEN_ENTRY(0x0c4, "b(case)"),
+ TOKEN_ENTRY(0x0c5, "b(endcase)"),
+ TOKEN_ENTRY(0x0c6, "b(endof)"),
+ TOKEN_ENTRY(0x0c7, "#"),
+ TOKEN_ENTRY(0x0c8, "#s"),
+ TOKEN_ENTRY(0x0c9, "#>"),
+ TOKEN_ENTRY(0x0ca, "external-token"),
+ TOKEN_ENTRY(0x0cb, "$find"),
+ TOKEN_ENTRY(0x0cc, "offset16"),
+ TOKEN_ENTRY(0x0cd, "evaluate"),
+ TOKEN_ENTRY(0x0d0, "c,"),
+ TOKEN_ENTRY(0x0d1, "w,"),
+ TOKEN_ENTRY(0x0d2, "l,"),
+ TOKEN_ENTRY(0x0d3, ","),
+ TOKEN_ENTRY(0x0d4, "um*"),
+ TOKEN_ENTRY(0x0d5, "um/mod"),
+ TOKEN_ENTRY(0x0d8, "d+"),
+ TOKEN_ENTRY(0x0d9, "d-"),
+ TOKEN_ENTRY(0x0da, "get-token"),
+ TOKEN_ENTRY(0x0db, "set-token"),
+ TOKEN_ENTRY(0x0dc, "state"),
+ TOKEN_ENTRY(0x0dd, "compile"),
+ TOKEN_ENTRY(0x0de, "behavior"),
+ TOKEN_ENTRY(0x0f0, "start0"),
+ TOKEN_ENTRY(0x0f1, "start1"),
+ TOKEN_ENTRY(0x0f2, "start2"),
+ TOKEN_ENTRY(0x0f3, "start4"),
+ TOKEN_ENTRY(0x0fc, "ferror"),
+ TOKEN_ENTRY(0x0fd, "version1"),
+ TOKEN_ENTRY(0x0fe, "4-byte-id"),
+ TOKEN_ENTRY(0x0ff, "end1"),
+ TOKEN_ENTRY(0x101, "dma-alloc"),
+ TOKEN_ENTRY(0x102, "my-address"),
+ TOKEN_ENTRY(0x103, "my-space"),
+ TOKEN_ENTRY(0x104, "memmap"),
+ TOKEN_ENTRY(0x105, "free-virtual"),
+ TOKEN_ENTRY(0x106, ">physical"),
+ TOKEN_ENTRY(0x10f, "my-params"),
+ TOKEN_ENTRY(0x110, "property"),
+ TOKEN_ENTRY(0x111, "encode-int"),
+ TOKEN_ENTRY(0x112, "encode+"),
+ TOKEN_ENTRY(0x113, "encode-phys"),
+ TOKEN_ENTRY(0x114, "encode-string"),
+ TOKEN_ENTRY(0x115, "encode-bytes"),
+ TOKEN_ENTRY(0x116, "reg"),
+ TOKEN_ENTRY(0x117, "intr"),
+ TOKEN_ENTRY(0x118, "driver"),
+ TOKEN_ENTRY(0x119, "model"),
+ TOKEN_ENTRY(0x11a, "device-type"),
+ TOKEN_ENTRY(0x11b, "parse-2int"),
+ TOKEN_ENTRY(0x11c, "is-install"),
+ TOKEN_ENTRY(0x11d, "is-remove"),
+ TOKEN_ENTRY(0x11e, "is-selftest"),
+ TOKEN_ENTRY(0x11f, "new-device"),
+ TOKEN_ENTRY(0x120, "diagnostic-mode?"),
+ TOKEN_ENTRY(0x121, "display-status"),
+ TOKEN_ENTRY(0x122, "memory-test-issue"),
+ TOKEN_ENTRY(0x123, "group-code"),
+ TOKEN_ENTRY(0x124, "mask"),
+ TOKEN_ENTRY(0x125, "get-msecs"),
+ TOKEN_ENTRY(0x126, "ms"),
+ TOKEN_ENTRY(0x127, "finish-device"),
+ TOKEN_ENTRY(0x128, "decode-phys"),
+ TOKEN_ENTRY(0x12b, "interpose"),
+ TOKEN_ENTRY(0x130, "map-low"),
+ TOKEN_ENTRY(0x131, "sbus-intr>cpu"),
+ TOKEN_ENTRY(0x150, "#lines"),
+ TOKEN_ENTRY(0x151, "#columns"),
+ TOKEN_ENTRY(0x152, "line#"),
+ TOKEN_ENTRY(0x153, "column#"),
+ TOKEN_ENTRY(0x154, "inverse?"),
+ TOKEN_ENTRY(0x155, "inverse-screen?"),
+ TOKEN_ENTRY(0x156, "frame-buffer-busy?"),
+ TOKEN_ENTRY(0x157, "draw-character"),
+ TOKEN_ENTRY(0x158, "reset-screen"),
+ TOKEN_ENTRY(0x159, "toggle-cursor"),
+ TOKEN_ENTRY(0x15a, "erase-screen"),
+ TOKEN_ENTRY(0x15b, "blink-screen"),
+ TOKEN_ENTRY(0x15c, "invert-screen"),
+ TOKEN_ENTRY(0x15d, "insert-characters"),
+ TOKEN_ENTRY(0x15e, "delete-characters"),
+ TOKEN_ENTRY(0x15f, "insert-lines"),
+ TOKEN_ENTRY(0x160, "delete-lines"),
+ TOKEN_ENTRY(0x161, "draw-logo"),
+ TOKEN_ENTRY(0x162, "frame-buffer-adr"),
+ TOKEN_ENTRY(0x163, "screen-height"),
+ TOKEN_ENTRY(0x164, "screen-width"),
+ TOKEN_ENTRY(0x165, "window-top"),
+ TOKEN_ENTRY(0x166, "window-left"),
+ TOKEN_ENTRY(0x16a, "default-font"),
+ TOKEN_ENTRY(0x16b, "set-font"),
+ TOKEN_ENTRY(0x16c, "char-height"),
+ TOKEN_ENTRY(0x16d, "char-width"),
+ TOKEN_ENTRY(0x16e, ">font"),
+ TOKEN_ENTRY(0x16f, "fontbytes"),
+ TOKEN_ENTRY(0x170, "fb1-draw-character"),
+ TOKEN_ENTRY(0x171, "fb1-reset-screen"),
+ TOKEN_ENTRY(0x172, "fb1-toggle-cursor"),
+ TOKEN_ENTRY(0x173, "fb1-erase-screen"),
+ TOKEN_ENTRY(0x174, "fb1-blink-screen"),
+ TOKEN_ENTRY(0x175, "fb1-invert-screen"),
+ TOKEN_ENTRY(0x176, "fb1-insert-characters"),
+ TOKEN_ENTRY(0x177, "fb1-delete-characters"),
+ TOKEN_ENTRY(0x178, "fb1-insert-lines"),
+ TOKEN_ENTRY(0x179, "fb1-delete-lines"),
+ TOKEN_ENTRY(0x17a, "fb1-draw-logo"),
+ TOKEN_ENTRY(0x17b, "fb1-install"),
+ TOKEN_ENTRY(0x17c, "fb1-slide-up"),
+ TOKEN_ENTRY(0x180, "fb8-draw-character"),
+ TOKEN_ENTRY(0x181, "fb8-reset-screen"),
+ TOKEN_ENTRY(0x182, "fb8-toggle-cursor"),
+ TOKEN_ENTRY(0x183, "fb8-erase-screen"),
+ TOKEN_ENTRY(0x184, "fb8-blink-screen"),
+ TOKEN_ENTRY(0x185, "fb8-invert-screen"),
+ TOKEN_ENTRY(0x186, "fb8-insert-characters"),
+ TOKEN_ENTRY(0x187, "fb8-delete-characters"),
+ TOKEN_ENTRY(0x188, "fb8-insert-lines"),
+ TOKEN_ENTRY(0x189, "fb8-delete-lines"),
+ TOKEN_ENTRY(0x18a, "fb8-draw-logo"),
+ TOKEN_ENTRY(0x18b, "fb8-install"),
+ TOKEN_ENTRY(0x1a0, "return-buffer"),
+ TOKEN_ENTRY(0x1a1, "xmit-packet"),
+ TOKEN_ENTRY(0x1a2, "poll-packet"),
+ TOKEN_ENTRY(0x1a4, "mac-address"),
+ TOKEN_ENTRY(0x201, "device-name"),
+ TOKEN_ENTRY(0x202, "my-args"),
+ TOKEN_ENTRY(0x203, "my-self"),
+ TOKEN_ENTRY(0x204, "find-package"),
+ TOKEN_ENTRY(0x205, "open-package"),
+ TOKEN_ENTRY(0x206, "close-package"),
+ TOKEN_ENTRY(0x207, "find-method"),
+ TOKEN_ENTRY(0x208, "call-package"),
+ TOKEN_ENTRY(0x209, "$call-parent"),
+ TOKEN_ENTRY(0x20a, "my-parent"),
+ TOKEN_ENTRY(0x20b, "ihandle>phandle"),
+ TOKEN_ENTRY(0x20d, "my-unit"),
+ TOKEN_ENTRY(0x20e, "$call-method"),
+ TOKEN_ENTRY(0x20f, "$open-package"),
+ TOKEN_ENTRY(0x210, "processor-type"),
+ TOKEN_ENTRY(0x211, "firmware-version"),
+ TOKEN_ENTRY(0x212, "fcode-version"),
+ TOKEN_ENTRY(0x213, "alarm"),
+ TOKEN_ENTRY(0x214, "(is-user-word)"),
+ TOKEN_ENTRY(0x215, "suspend-fcode"),
+ TOKEN_ENTRY(0x216, "abort"),
+ TOKEN_ENTRY(0x217, "catch"),
+ TOKEN_ENTRY(0x218, "throw"),
+ TOKEN_ENTRY(0x219, "user-abort"),
+ TOKEN_ENTRY(0x21a, "get-my-property"),
+ TOKEN_ENTRY(0x21b, "decode-int"),
+ TOKEN_ENTRY(0x21c, "decode-string"),
+ TOKEN_ENTRY(0x21d, "get-inherited-property"),
+ TOKEN_ENTRY(0x21e, "delete-property"),
+ TOKEN_ENTRY(0x21f, "get-package-property"),
+ TOKEN_ENTRY(0x220, "cpeek"),
+ TOKEN_ENTRY(0x221, "wpeek"),
+ TOKEN_ENTRY(0x222, "lpeek"),
+ TOKEN_ENTRY(0x223, "cpoke"),
+ TOKEN_ENTRY(0x224, "wpoke"),
+ TOKEN_ENTRY(0x225, "lpoke"),
+ TOKEN_ENTRY(0x226, "lwflip"),
+ TOKEN_ENTRY(0x227, "lbflip"),
+ TOKEN_ENTRY(0x228, "lbflips"),
+ TOKEN_ENTRY(0x229, "adr-mask"),
+ TOKEN_ENTRY(0x230, "rb@"),
+ TOKEN_ENTRY(0x231, "rb!"),
+ TOKEN_ENTRY(0x232, "rw@"),
+ TOKEN_ENTRY(0x233, "rw!"),
+ TOKEN_ENTRY(0x234, "rl@"),
+ TOKEN_ENTRY(0x235, "rl!"),
+ TOKEN_ENTRY(0x236, "wbflips"),
+ TOKEN_ENTRY(0x237, "lwflips"),
+ TOKEN_ENTRY(0x238, "probe"),
+ TOKEN_ENTRY(0x239, "probe-virtual"),
+ TOKEN_ENTRY(0x23b, "child"),
+ TOKEN_ENTRY(0x23c, "peer"),
+ TOKEN_ENTRY(0x23d, "next-property"),
+ TOKEN_ENTRY(0x23e, "byte-load"),
+ TOKEN_ENTRY(0x23f, "set-args"),
+ TOKEN_ENTRY(0x240, "left-parse-string"),
/* FCodes from 64bit extension addendum */
- TOKEN_ENTRY( 0x22e, "rx@" ),
- TOKEN_ENTRY( 0x22f, "rx!" ),
- TOKEN_ENTRY( 0x241, "bxjoin" ),
- TOKEN_ENTRY( 0x242, "<l@" ),
- TOKEN_ENTRY( 0x243, "lxjoin" ),
- TOKEN_ENTRY( 0x244, "wxjoin" ),
- TOKEN_ENTRY( 0x245, "x," ),
- TOKEN_ENTRY( 0x246, "x@" ),
- TOKEN_ENTRY( 0x247, "x!" ),
- TOKEN_ENTRY( 0x248, "/x" ),
- TOKEN_ENTRY( 0x249, "/x*" ),
- TOKEN_ENTRY( 0x24a, "xa+" ),
- TOKEN_ENTRY( 0x24b, "xa1+" ),
- TOKEN_ENTRY( 0x24c, "xbflip" ),
- TOKEN_ENTRY( 0x24d, "xbflips" ),
- TOKEN_ENTRY( 0x24e, "xbsplit" ),
- TOKEN_ENTRY( 0x24f, "xlflip" ),
- TOKEN_ENTRY( 0x250, "xlflips" ),
- TOKEN_ENTRY( 0x251, "xlsplit" ),
- TOKEN_ENTRY( 0x252, "xwflip" ),
- TOKEN_ENTRY( 0x253, "xwflips" ),
- TOKEN_ENTRY( 0x254, "xwsplit" ),
+ TOKEN_ENTRY(0x22e, "rx@"),
+ TOKEN_ENTRY(0x22f, "rx!"),
+ TOKEN_ENTRY(0x241, "bxjoin"),
+ TOKEN_ENTRY(0x242, "<l@"),
+ TOKEN_ENTRY(0x243, "lxjoin"),
+ TOKEN_ENTRY(0x244, "wxjoin"),
+ TOKEN_ENTRY(0x245, "x,"),
+ TOKEN_ENTRY(0x246, "x@"),
+ TOKEN_ENTRY(0x247, "x!"),
+ TOKEN_ENTRY(0x248, "/x"),
+ TOKEN_ENTRY(0x249, "/x*"),
+ TOKEN_ENTRY(0x24a, "xa+"),
+ TOKEN_ENTRY(0x24b, "xa1+"),
+ TOKEN_ENTRY(0x24c, "xbflip"),
+ TOKEN_ENTRY(0x24d, "xbflips"),
+ TOKEN_ENTRY(0x24e, "xbsplit"),
+ TOKEN_ENTRY(0x24f, "xlflip"),
+ TOKEN_ENTRY(0x250, "xlflips"),
+ TOKEN_ENTRY(0x251, "xlsplit"),
+ TOKEN_ENTRY(0x252, "xwflip"),
+ TOKEN_ENTRY(0x253, "xwflips"),
+ TOKEN_ENTRY(0x254, "xwsplit"),
};
-static const int dictionary_indx_max = (sizeof(detok_table)/sizeof(token_t)) ;
+static const int dictionary_indx_max =
+ (sizeof(detok_table) / sizeof(token_t));
static token_t *dictionary_reset_position;
-void init_dictionary(void)
+void init_dictionary(void)
{
- int indx;
+ int indx;
- dictionary = &detok_table[dictionary_indx_max-1];
- dictionary_reset_position = dictionary;
+ dictionary = &detok_table[dictionary_indx_max - 1];
+ dictionary_reset_position = dictionary;
- for (indx = 1; indx < dictionary_indx_max ; indx++ )
- {
- detok_table[indx].next = &detok_table[indx-1];
- }
+ for (indx = 1; indx < dictionary_indx_max; indx++) {
+ detok_table[indx].next = &detok_table[indx - 1];
+ }
}
-void reset_dictionary(void)
+void reset_dictionary(void)
{
- token_t *next_t;
+ token_t *next_t;
- next_t = dictionary;
- while ( next_t != dictionary_reset_position )
- {
- next_t = dictionary->next ;
- free( dictionary->name );
- free( dictionary );
- dictionary = next_t ;
- }
+ next_t = dictionary;
+ while (next_t != dictionary_reset_position) {
+ next_t = dictionary->next;
+ free(dictionary->name);
+ free(dictionary);
+ dictionary = next_t;
+ }
}
/* If FCodes have been added by User, we need to update reset-position */
void freeze_dictionary(void)
{
- dictionary_reset_position = dictionary;
+ dictionary_reset_position = dictionary;
}
Modified: fcode-utils/detok/pcihdr.c
===================================================================
--- fcode-utils/detok/pcihdr.c 2006-10-14 21:07:27 UTC (rev 95)
+++ fcode-utils/detok/pcihdr.c 2006-10-14 21:32:13 UTC (rev 96)
@@ -136,18 +136,17 @@
*
**************************************************************************** */
-static int is_pci_header ( rom_header_t *pci_rom_hdr )
+static int is_pci_header(rom_header_t * pci_rom_hdr)
{
- const u16 pci_header_signature = 0x55aa;
- int retval ;
+ const u16 pci_header_signature = 0x55aa;
+ int retval;
- retval = 0;
+ retval = 0;
- if ( BIG_ENDIAN_WORD_FETCH(pci_rom_hdr->signature) == pci_header_signature )
- {
- retval = LITTLE_ENDIAN_WORD_FETCH(pci_rom_hdr->data_ptr);
- }
- return(retval);
+ if (BIG_ENDIAN_WORD_FETCH(pci_rom_hdr->signature) == pci_header_signature) {
+ retval = LITTLE_ENDIAN_WORD_FETCH(pci_rom_hdr->data_ptr);
+ }
+ return (retval);
}
/* **************************************************************************
@@ -196,20 +195,19 @@
*
**************************************************************************** */
-static int is_pci_data_struct ( pci_data_t *pci_data_ptr )
+static int is_pci_data_struct(pci_data_t * pci_data_ptr)
{
- int retval ;
+ int retval;
- retval = 0;
+ retval = 0;
- if (BIG_ENDIAN_LONG_FETCH(pci_data_ptr->signature) == PCI_DATA_HDR)
- {
- retval = LITTLE_ENDIAN_WORD_FETCH(pci_data_ptr->dlen);
- }
- return(retval);
+ if (BIG_ENDIAN_LONG_FETCH(pci_data_ptr->signature) == PCI_DATA_HDR) {
+ retval = LITTLE_ENDIAN_WORD_FETCH(pci_data_ptr->dlen);
+ }
+ return (retval);
}
-
+
/* **************************************************************************
*
* Function name: announce_pci_hdr ( rom_header_t *pci_rom_hdr )
@@ -226,16 +224,16 @@
*
**************************************************************************** */
-static void announce_pci_hdr ( rom_header_t *pci_rom_hdr )
+static void announce_pci_hdr(rom_header_t * pci_rom_hdr)
{
- char temp_buf[80];
- u32 temp;
+ char temp_buf[80];
+ u32 temp;
- printremark ( "PCI Header identified");
- temp=(u32)LITTLE_ENDIAN_WORD_FETCH(pci_rom_hdr->data_ptr);
- sprintf(temp_buf, " Offset to Data Structure = 0x%04x (%d)\n",
- temp, temp);
- printremark ( temp_buf );
+ printremark("PCI Header identified");
+ temp = (u32) LITTLE_ENDIAN_WORD_FETCH(pci_rom_hdr->data_ptr);
+ sprintf(temp_buf, " Offset to Data Structure = 0x%04x (%d)\n",
+ temp, temp);
+ printremark(temp_buf);
}
/* **************************************************************************
@@ -266,57 +264,56 @@
*
**************************************************************************** */
-static void announce_pci_data_struct ( pci_data_t *pci_data_ptr )
+static void announce_pci_data_struct(pci_data_t * pci_data_ptr)
{
- char temp_buf[80];
- u32 temp;
+ char temp_buf[80];
+ u32 temp;
- printremark ( "PCI Data Structure identified");
+ printremark("PCI Data Structure identified");
- temp=(u32)LITTLE_ENDIAN_WORD_FETCH(pci_data_ptr->dlen);
- sprintf(temp_buf, " Data Structure Length = 0x%04x (%d)\n", temp, temp);
- printremark ( temp_buf );
+ temp = (u32) LITTLE_ENDIAN_WORD_FETCH(pci_data_ptr->dlen);
+ sprintf(temp_buf, " Data Structure Length = 0x%04x (%d)\n", temp, temp);
+ printremark(temp_buf);
- sprintf(temp_buf, " Vendor ID: 0x%04x\n",
- LITTLE_ENDIAN_WORD_FETCH(pci_data_ptr->vendor));
- printremark ( temp_buf );
+ sprintf(temp_buf, " Vendor ID: 0x%04x\n",
+ LITTLE_ENDIAN_WORD_FETCH(pci_data_ptr->vendor));
+ printremark(temp_buf);
- sprintf(temp_buf, " Device ID: 0x%04x\n",
- LITTLE_ENDIAN_WORD_FETCH(pci_data_ptr->device));
- printremark ( temp_buf );
+ sprintf(temp_buf, " Device ID: 0x%04x\n",
+ LITTLE_ENDIAN_WORD_FETCH(pci_data_ptr->device));
+ printremark(temp_buf);
- temp=(u32)CLASS_CODE_FETCH(pci_data_ptr->class_code);
- sprintf(temp_buf, " Class Code: 0x%06x (%s)",
- temp, pci_device_class_name(temp));
- printremark ( temp_buf );
+ temp = (u32) CLASS_CODE_FETCH(pci_data_ptr->class_code);
+ sprintf(temp_buf, " Class Code: 0x%06x (%s)",
+ temp, pci_device_class_name(temp));
+ printremark(temp_buf);
- temp=(u32)LITTLE_ENDIAN_WORD_FETCH(pci_data_ptr->vpd);
- if ( temp != 0 )
- {
- sprintf(temp_buf, " Vital Prod Data: 0x%02x\n", temp);
- printremark ( temp_buf );
- }
+ temp = (u32) LITTLE_ENDIAN_WORD_FETCH(pci_data_ptr->vpd);
+ if (temp != 0) {
+ sprintf(temp_buf, " Vital Prod Data: 0x%02x\n", temp);
+ printremark(temp_buf);
+ }
- temp=(u32)LITTLE_ENDIAN_WORD_FETCH(pci_data_ptr->irevision);
- if ( temp != 0 )
- {
- sprintf(temp_buf, " Image Revision: 0x%02x\n", temp);
- printremark ( temp_buf );
- }
+ temp = (u32) LITTLE_ENDIAN_WORD_FETCH(pci_data_ptr->irevision);
+ if (temp != 0) {
+ sprintf(temp_buf, " Image Revision: 0x%02x\n", temp);
+ printremark(temp_buf);
+ }
- sprintf(temp_buf, " Code Type: 0x%02x (%s)\n", pci_data_ptr->code_type,
- pci_code_type_name(pci_data_ptr->code_type) );
- printremark ( temp_buf );
+ sprintf(temp_buf, " Code Type: 0x%02x (%s)\n",
+ pci_data_ptr->code_type,
+ pci_code_type_name(pci_data_ptr->code_type));
+ printremark(temp_buf);
- temp=(u32)LITTLE_ENDIAN_WORD_FETCH(pci_data_ptr->ilen);
- pci_image_len = temp*512;
- sprintf(temp_buf, " Image Length: 0x%04x blocks (%d bytes)\n",
- temp, pci_image_len);
- printremark ( temp_buf );
+ temp = (u32) LITTLE_ENDIAN_WORD_FETCH(pci_data_ptr->ilen);
+ pci_image_len = temp * 512;
+ sprintf(temp_buf, " Image Length: 0x%04x blocks (%d bytes)\n",
+ temp, pci_image_len);
+ printremark(temp_buf);
- sprintf(temp_buf, " %sast PCI Image.\n",
- pci_data_ptr->last_image_flag&&0x80 != 0 ? "L" : "Not l");
- printremark ( temp_buf );
+ sprintf(temp_buf, " %sast PCI Image.\n",
+ pci_data_ptr->last_image_flag && 0x80 != 0 ? "L" : "Not l");
+ printremark(temp_buf);
}
@@ -369,46 +366,42 @@
*
**************************************************************************** */
-int handle_pci_header ( u8 *data_ptr )
+int handle_pci_header(u8 * data_ptr)
{
- int hdrlen;
- int data_struc_len;
- /* int retval; */ /* Not needed until we handle error cases... */
+ int hdrlen;
+ int data_struc_len;
+ /* int retval; *//* Not needed until we handle error cases... */
- data_struc_len = 0;
+ data_struc_len = 0;
- hdrlen = is_pci_header( (rom_header_t *)data_ptr );
- /* retval = hdrlen; */ /* Not needed yet... */
- if ( hdrlen < 0 )
- {
- /* Handle error case... */
- /* Leave null for now... */
- /* It might need to do a premature EXIT here... */
- } else {
- /* if hdrlen == 0 then we don't need to check a Data Structure */
- if ( hdrlen > 0 )
- {
- announce_pci_hdr ( (rom_header_t *)data_ptr );
- data_struc_len = is_pci_data_struct(
- (pci_data_t *) &data_ptr[hdrlen] );
- /*
- * A Data Structure Length of Zero would be an error
- * that could be detected by is_pci_data_struct()
- */
- if ( data_struc_len <= 0 )
- {
- /* Handle error case... */
- /* Leave null for now... */
- /* It might need to do a premature EXIT here... */
- /* retval = -1; */ /* Not needed yet... */
- } else {
- announce_pci_data_struct ( (pci_data_t *) &data_ptr[hdrlen] );
- pci_image_end = data_ptr + pci_image_len;
- /* retval = hdrlen+data_struc_len; */ /* Not needed yet... */
- }
- }
- }
- return (hdrlen+data_struc_len);
+ hdrlen = is_pci_header((rom_header_t *) data_ptr);
+ /* retval = hdrlen; *//* Not needed yet... */
+ if (hdrlen < 0) {
+ /* Handle error case... */
+ /* Leave null for now... */
+ /* It might need to do a premature EXIT here... */
+ } else {
+ /* if hdrlen == 0 then we don't need to check a Data Structure */
+ if (hdrlen > 0) {
+ announce_pci_hdr((rom_header_t *) data_ptr);
+ data_struc_len = is_pci_data_struct((pci_data_t *) & data_ptr[hdrlen]);
+ /*
+ * A Data Structure Length of Zero would be an error
+ * that could be detected by is_pci_data_struct()
+ */
+ if (data_struc_len <= 0) {
+ /* Handle error case... */
+ /* Leave null for now... */
+ /* It might need to do a premature EXIT here... */
+ /* retval = -1; *//* Not needed yet... */
+ } else {
+ announce_pci_data_struct((pci_data_t *) & data_ptr[hdrlen]);
+ pci_image_end = data_ptr + pci_image_len;
+ /* retval = hdrlen+data_struc_len; *//* Not needed yet... */
+ }
+ }
+ }
+ return (hdrlen + data_struc_len);
}
@@ -445,34 +438,30 @@
*
**************************************************************************** */
-void handle_pci_filler(u8 *filler_ptr)
+void handle_pci_filler(u8 * filler_ptr)
{
- u8 *scan_ptr;
- int filler_len;
- char temp_buf[80];
- bool all_zero = TRUE;
- u8 filler_byte = *filler_ptr;
+ u8 *scan_ptr;
+ int filler_len;
+ char temp_buf[80];
+ bool all_zero = TRUE;
+ u8 filler_byte = *filler_ptr;
- filler_len = pci_image_end - filler_ptr;
+ filler_len = pci_image_end - filler_ptr;
- for ( scan_ptr = filler_ptr;
- scan_ptr < pci_image_end;
- filler_byte = *(++scan_ptr) )
- {
- if ( filler_byte != 0 )
- {
- all_zero = FALSE;
- break;
- }
- }
-
- if ( all_zero )
- {
- sprintf(temp_buf, "PCI Image padded with %d bytes of zero", filler_len);
- }else{
- sprintf(temp_buf, "PCI Image padding-field of %d bytes "
- "had first non-zero byte at offset %ld",
- filler_len, scan_ptr - filler_ptr );
- }
- printremark ( temp_buf );
+ for (scan_ptr = filler_ptr;
+ scan_ptr < pci_image_end; filler_byte = *(++scan_ptr)) {
+ if (filler_byte != 0) {
+ all_zero = FALSE;
+ break;
+ }
+ }
+
+ if (all_zero) {
+ sprintf(temp_buf, "PCI Image padded with %d bytes of zero", filler_len);
+ } else {
+ sprintf(temp_buf, "PCI Image padding-field of %d bytes "
+ "had first non-zero byte at offset %ld",
+ filler_len, scan_ptr - filler_ptr);
+ }
+ printremark(temp_buf);
}
Modified: fcode-utils/detok/printformats.c
===================================================================
--- fcode-utils/detok/printformats.c 2006-10-14 21:07:27 UTC (rev 95)
+++ fcode-utils/detok/printformats.c 2006-10-14 21:32:13 UTC (rev 96)
@@ -84,57 +84,54 @@
*
**************************************************************************** */
-void printremark ( char *str)
+void printremark(char *str)
{
- char *strtmp ; /* Temporary pointer to current substring */
- int substrlen ; /* Length of current substring */
- char *substrend ; /* Pointer to end of current substring */
- char *strend ; /* Pointer to end of given string */
+ char *strtmp; /* Temporary pointer to current substring */
+ int substrlen; /* Length of current substring */
+ char *substrend; /* Pointer to end of current substring */
+ char *strend; /* Pointer to end of given string */
- char *strbfr ; /* Temporary substring buffer */
+ char *strbfr; /* Temporary substring buffer */
- /* Guarantee that the malloc will be big enough. */
- strbfr = (char *)malloc(strlen((char *)str)+1);
- if ( !strbfr )
- {
- printf ("No memory.\n");
- exit(-1);
- }
+ /* Guarantee that the malloc will be big enough. */
+ strbfr = (char *) malloc(strlen((char *) str) + 1);
+ if (!strbfr) {
+ printf("No memory.\n");
+ exit(-1);
+ }
- strtmp = str;
- strend = &str[strlen(str)];
+ strtmp = str;
+ strend = &str[strlen(str)];
- /* ******************************************************************
- *
- * Isolate the current substring; allow that the given
- * string might not be terminated with a new-line.
- *
- * The strend pointer provides a convenient means to
- * test for when we've reached the end.
- *
- ******************************************************************** */
+ /* ******************************************************************
+ *
+ * Isolate the current substring; allow that the given
+ * string might not be terminated with a new-line.
+ *
+ * The strend pointer provides a convenient means to
+ * test for when we've reached the end.
+ *
+ ******************************************************************** */
- while ( strtmp < strend )
- {
- substrend = strchr(strtmp , '\n');
- substrlen = ( substrend ? (substrend-strtmp) : strlen(strtmp) );
+ while (strtmp < strend) {
+ substrend = strchr(strtmp, '\n');
+ substrlen = (substrend ? (substrend - strtmp) : strlen(strtmp));
- strncpy (strbfr, strtmp, substrlen);
- /* **********************************************************
- *
- * strncpy() does not append a terminating null character,
- * so we have to.
- *
- ************************************************************ */
- strbfr[substrlen] = (char)0;
+ strncpy(strbfr, strtmp, substrlen);
+ /* **********************************************************
+ *
+ * strncpy() does not append a terminating null character,
+ * so we have to.
+ *
+ ************************************************************ */
+ strbfr[substrlen] = (char) 0;
- printf("\\ %s\n",strbfr);
+ printf("\\ %s\n", strbfr);
- strtmp = &strtmp[ substrlen + ( substrend ? 1 : 0 ) ] ;
+ strtmp = &strtmp[substrlen + (substrend ? 1 : 0)];
- }
+ }
- free(strbfr) ;
+ free(strbfr);
}
-
Modified: fcode-utils/detok/stream.c
===================================================================
--- fcode-utils/detok/stream.c 2006-10-14 21:07:27 UTC (rev 95)
+++ fcode-utils/detok/stream.c 2006-10-14 21:32:13 UTC (rev 96)
@@ -82,31 +82,31 @@
{
FILE *infile;
struct stat finfo;
-
- if (stat(name,&finfo))
+
+ if (stat(name, &finfo))
return -1;
-
- indata=malloc(finfo.st_size);
+
+ indata = malloc(finfo.st_size);
if (!indata)
return -1;
- infile=fopen(name,"r");
- if (!infile)
- return -1;
+ infile = fopen(name, "r");
+ if (!infile)
+ return -1;
- if (fread(indata, finfo.st_size, 1, infile)!=1) {
+ if (fread(indata, finfo.st_size, 1, infile) != 1) {
free(indata);
return -1;
}
fclose(infile);
-
- pc=indata;
+
+ pc = indata;
fc_start = indata;
- max=pc+finfo.st_size;
-
+ max = pc + finfo.st_size;
+
stream_max = finfo.st_size;
-
+
return 0;
}
@@ -121,7 +121,7 @@
void init_fcode_block(void)
{
fc_start = pc;
- linenum = 1 ;
+ linenum = 1;
}
@@ -133,7 +133,7 @@
int get_streampos(void)
{
- return (int)( pc - fc_start );
+ return (int) (pc - fc_start);
}
void set_streampos(int pos)
@@ -170,23 +170,21 @@
static void throw_eof(bool premature)
{
- char yoo = 'U';
- char eee = 'E';
- if ( premature)
- {
- printf("Premature ");
- yoo = 'u';
- eee = 'e';
- }
- if ( ! end_found )
- {
- printf("%cnexpected ",yoo);
- eee = 'e';
- }
- printf("%cnd of file.\n",eee);
- longjmp(eof_exception, -1);
+ char yoo = 'U';
+ char eee = 'E';
+ if (premature) {
+ printf("Premature ");
+ yoo = 'u';
+ eee = 'e';
+ }
+ if (!end_found) {
+ printf("%cnexpected ", yoo);
+ eee = 'e';
+ }
+ printf("%cnd of file.\n", eee);
+ longjmp(eof_exception, -1);
}
-
+
/* **************************************************************************
*
* Function name: get_bytes
@@ -230,18 +228,16 @@
static u8 *get_bytes(int nbytes)
{
- u8 *retval = pc;
- if ( pc == max )
- {
- throw_eof(FALSE);
- }
- if ( pc + nbytes > max )
- {
- throw_eof(TRUE);
- }
- pc += nbytes;
- return( retval);
- }
+ u8 *retval = pc;
+ if (pc == max) {
+ throw_eof(FALSE);
+ }
+ if (pc + nbytes > max) {
+ throw_eof(TRUE);
+ }
+ pc += nbytes;
+ return (retval);
+}
/* **************************************************************************
@@ -254,12 +250,12 @@
bool more_to_go(void)
{
- bool retval;
- retval = INVERSE( pc == max );
- return( retval);
+ bool retval;
+ retval = INVERSE(pc == max);
+ return (retval);
}
-
+
/* **************************************************************************
*
* Function name: next_token
@@ -275,64 +271,62 @@
* token_streampos Streampos() of token just gotten
*
**************************************************************************** */
-
+
u16 next_token(void)
{
- u16 tok;
- token_streampos = get_streampos();
- tok = *(get_bytes(1));
- if ( tok != 0x00 && tok < 0x10)
- {
- tok<<=8;
- tok |= *(get_bytes(1));
- }
- fcode=tok;
- return(tok);
+ u16 tok;
+ token_streampos = get_streampos();
+ tok = *(get_bytes(1));
+ if (tok != 0x00 && tok < 0x10) {
+ tok <<= 8;
+ tok |= *(get_bytes(1));
+ }
+ fcode = tok;
+ return (tok);
}
u32 get_num32(void)
{
- u32 retval;
+ u32 retval;
u8 *num_str;
-
+
num_str = get_bytes(4);
retval = BIG_ENDIAN_LONG_FETCH(num_str);
-
- return ( retval);
+
+ return (retval);
}
u16 get_num16(void)
{
- u16 retval;
+ u16 retval;
u8 *num_str;
-
- num_str = get_bytes(2);
+
+ num_str = get_bytes(2);
retval = BIG_ENDIAN_WORD_FETCH(num_str);
-
- return ( retval);
+
+ return (retval);
}
-
+
u8 get_num8(void)
{
- u8 inbyte;
+ u8 inbyte;
inbyte = *(get_bytes(1));
- return(inbyte);
+ return (inbyte);
}
s16 get_offset(void)
{
- s16 retval;
- if (offs16)
- {
- retval = (s16)get_num16();
- }else{
- retval = (s16)get_num8();
- /* Make sure it's sign-extended */
- retval |= ( retval & 0x80 ) ? 0xff00 : 0 ;
+ s16 retval;
+ if (offs16) {
+ retval = (s16) get_num16();
+ } else {
+ retval = (s16) get_num8();
+ /* Make sure it's sign-extended */
+ retval |= (retval & 0x80) ? 0xff00 : 0;
}
-
- return (retval);
+
+ return (retval);
}
/* **************************************************************************
@@ -360,14 +354,14 @@
*
**************************************************************************** */
-u8 *get_string(u8 *len)
+u8 *get_string(u8 * len)
{
- char *retval;
+ char *retval;
- *len = get_num8();
- retval = get_bytes((int)*len);
-
- return (retval);
+ *len = get_num8();
+ retval = get_bytes((int) *len);
+
+ return (retval);
}
@@ -405,23 +399,23 @@
*
**************************************************************************** */
-char *get_name(u8 *len)
+char *get_name(u8 * len)
{
- char *str_start;
- char *retval;
- u8 sav_byt;
-
- str_start = get_string( len );
+ char *str_start;
+ char *retval;
+ u8 sav_byt;
- sav_byt = *pc;
- *pc = 0;
+ str_start = get_string(len);
- retval = strdup(str_start);
- *pc = sav_byt;
-
- return (retval);
- }
-
+ sav_byt = *pc;
+ *pc = 0;
+
+ retval = strdup(str_start);
+ *pc = sav_byt;
+
+ return (retval);
+}
+
/* **************************************************************************
*
* Function name: calc_checksum
@@ -452,27 +446,26 @@
u16 calc_checksum(void)
{
- u16 retval = 0;
- u8 *cksmptr;
- u8 *save_pc;
- u32 fc_blk_len;
- int indx;
+ u16 retval = 0;
+ u8 *cksmptr;
+ u8 *save_pc;
+ u32 fc_blk_len;
+ int indx;
- save_pc = pc;
+ save_pc = pc;
- fc_blk_len = get_num32(); /* Read len */
- cksmptr = get_bytes(fc_blk_len-8); /* Make sure we have all our data */
+ fc_blk_len = get_num32(); /* Read len */
+ cksmptr = get_bytes(fc_blk_len - 8); /* Make sure we have all our data */
- for ( indx = 8; indx < fc_blk_len; indx++)
- {
- retval += *cksmptr++;
+ for (indx = 8; indx < fc_blk_len; indx++) {
+ retval += *cksmptr++;
+ }
+
+ pc = save_pc;
+ return (retval);
}
- pc = save_pc;
- return( retval);
-}
-
/* **************************************************************************
*
* Function name: adjust_for_pci_header
@@ -510,7 +503,7 @@
void adjust_for_pci_header(void)
{
int pci_header_size;
-
+
pci_header_size = handle_pci_header(pc);
pci_image_found = pci_header_size > 0 ? TRUE : FALSE;
pc += pci_header_size;
@@ -543,14 +536,13 @@
void adjust_for_pci_filler(void)
{
- if ( pci_image_found )
- {
- int pci_filler_len;
- u8 *pci_filler_ptr;
+ if (pci_image_found) {
+ int pci_filler_len;
+ u8 *pci_filler_ptr;
- pci_filler_len = pci_image_end - pc;
- pci_filler_ptr = get_bytes(pci_filler_len);
- handle_pci_filler( pci_filler_ptr );
- pci_image_found = FALSE;
- }
+ pci_filler_len = pci_image_end - pc;
+ pci_filler_ptr = get_bytes(pci_filler_len);
+ handle_pci_filler(pci_filler_ptr);
+ pci_image_found = FALSE;
+ }
}
Modified: fcode-utils/detok/stream.h
===================================================================
--- fcode-utils/detok/stream.h 2006-10-14 21:07:27 UTC (rev 95)
+++ fcode-utils/detok/stream.h 2006-10-14 21:32:13 UTC (rev 96)
@@ -46,16 +46,16 @@
void adjust_for_pci_filler(void);
void init_fcode_block(void);
-int get_streampos(void);
+int get_streampos(void);
void set_streampos(int pos);
u16 next_token(void);
-u8 get_num8(void);
+u8 get_num8(void);
u16 get_num16(void);
u32 get_num32(void);
s16 get_offset(void);
-u8 *get_string(u8 *len);
-char *get_name(u8 *len);
+u8 *get_string(u8 * len);
+char *get_name(u8 * len);
u16 calc_checksum(void);
/* External declarations for variables defined in stream.c */
@@ -65,4 +65,4 @@
extern u8 *pc;
extern u8 *max;
-#endif /* _UTILS_DETOK_STREAM_H */
+#endif /* _UTILS_DETOK_STREAM_H */
1
0
Hi all,
SUN has released (under BSD license I believe), the source
code for their OpenBoot (OPB). This includes the forth programs
for many of their sun machines.
This is available only starting from version 1.3 of OpenSPARC.
http://opensparc-t1.sunsource.net/download_hw.html
I guess that it could be a good boost on the functionality/code
available at OpenBios.
--
Copy from one, it is plagiarism; copy from two, it is research.
- Wilson Mizner
5
5
Author: stepan
Date: 2006-10-14 23:07:27 +0200 (Sat, 14 Oct 2006)
New Revision: 95
Added:
fcode-utils/testsuite/TokMisc/AllBiFCTypes.fth
fcode-utils/testsuite/TokeErrs/TooManyPushes.fth
fcode-utils/testsuite/TokeErrs/UntermDefn.fth
fcode-utils/testsuite/TokeErrs/UntermLocalAssgmnt.fth
fcode-utils/testsuite/TokeErrs/UntermLocalDecl.fth
Modified:
fcode-utils/testsuite/TokCondl/CondMacAlias_01.fth
fcode-utils/testsuite/TokMisc/TestArgs
fcode-utils/testsuite/TokeErrs/DupNams.fth
fcode-utils/testsuite/TokeErrs/GlobScopErrTst.fth
fcode-utils/testsuite/TokeErrs/LocalTest.fth
fcode-utils/testsuite/TokeErrs/MiscFeatErrs.fth
fcode-utils/testsuite/TokeErrs/MulPCI_LapFC.fth
fcode-utils/testsuite/TokeErrs/PCIhdrErrs.fth
fcode-utils/testsuite/TokeErrs/TestArgs
fcode-utils/testsuite/TokeErrs/TooLargeBranch_off08.fth
fcode-utils/testsuite/TokeErrs/TooLargeBranch_off16_body.fth
fcode-utils/testsuite/TokeErrs/TooLargePMessage.fth
fcode-utils/testsuite/TokeErrs/TooLargePQuote.fth
fcode-utils/testsuite/TokeErrs/TooLargeParen.fth
fcode-utils/testsuite/TokeErrs/TooLargeQAbort.fth
fcode-utils/testsuite/TokeErrs/TooLargeQMessage.fth
fcode-utils/testsuite/TokeErrs/TooLargeQNoAbort.fth
fcode-utils/testsuite/TokeErrs/TooLargeSQuote.fth
fcode-utils/testsuite/TokeErrs/TooManyFCodes.fth
Log:
update test suite to v1.0.1
Modified: fcode-utils/testsuite/TokCondl/CondMacAlias_01.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/CondMacAlias_01.fth 2006-10-14 20:42:30 UTC (rev 94)
+++ fcode-utils/testsuite/TokCondl/CondMacAlias_01.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -77,7 +77,7 @@
: [else] ." Don't do it" ; [message] Fake [else] got through
create [else] [message] Fake [else] got through
h# defeca8e constant [else] [message] Fake [else] got through
- h# beeffece value [else] [message] Fake [else] got through
+ h# -41100132 value [else] [message] Fake [else] got through
d# 64 buffer: [else] [message] Fake [else] got through
struct
/l field [else] [message] Fake [else] got through
@@ -85,7 +85,7 @@
defer [else] [message] Fake [else] got through
['] [else] [message] Fake [else] got through
to [else] [message] Fake [else] got through
- ['] [else]
+ ['] [else] alias moomoo [else]
is [else] [message] Fake [else] got through
: say-what ( tony vinnie looie --
-- marie )
Added: fcode-utils/testsuite/TokMisc/AllBiFCTypes.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/AllBiFCTypes.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/AllBiFCTypes.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -0,0 +1,64 @@
+\ Test all the known Built-In FCode tokens
+\ that have specific definition Types
+
+\ Updated Wed, 16 Aug 2006 at 14:30 PDT by David L. Paktor
+
+\ Applying "TO" to them ought to generate errors
+\ except for the ones that legitimately take "TO",
+\ namely the DEFER and VALUE definitions
+
+fcode-version2
+
+
+[message] Constants. Should generate errors
+d# 10 to -1 ( CONST )
+d# 10 to -1 ( CONST )
+d# 10 to 0 ( CONST )
+d# 10 to 0 ( CONST )
+d# 10 to 0 ( CONST )
+d# 10 to 1 ( CONST )
+d# 10 to 2 ( CONST )
+d# 10 to 3 ( CONST )
+d# 10 to bell ( CONST )
+d# 10 to bl ( CONST )
+d# 10 to bs ( CONST )
+
+[message] Defer Words. Should generate no errors
+['] noop to blink-screen ( DEFER )
+['] noop to delete-characters ( DEFER )
+['] noop to delete-lines ( DEFER )
+['] noop to draw-character ( DEFER )
+['] noop to draw-logo ( DEFER )
+['] noop to erase-screen ( DEFER )
+['] noop to insert-characters ( DEFER )
+['] noop to insert-lines ( DEFER )
+['] noop to invert-screen ( DEFER )
+['] noop to reset-screen ( DEFER )
+['] noop to toggle-cursor ( DEFER )
+
+[message] Value Words. Should generate no errors
+h# 32 to #columns ( VALUE )
+h# 32 to #lines ( VALUE )
+h# 32 to char-height ( VALUE )
+h# 32 to char-width ( VALUE )
+h# 32 to column# ( VALUE )
+h# 32 to fontbytes ( VALUE )
+h# 32 to frame-buffer-adr ( VALUE )
+h# 32 to inverse-screen? ( VALUE )
+h# 32 to inverse? ( VALUE )
+h# 32 to line# ( VALUE )
+h# 32 to my-self ( VALUE )
+h# 32 to screen-height ( VALUE )
+h# 32 to screen-width ( VALUE )
+h# 32 to window-left ( VALUE )
+h# 32 to window-top ( VALUE )
+
+[message] Variables. Should generate errors
+h# 12 to #line ( VRBLE )
+h# 12 to #out ( VRBLE )
+h# 12 to base ( VRBLE )
+h# 12 to mask ( VRBLE )
+h# 12 to span ( VRBLE )
+h# 12 to state ( VRBLE )
+
+fcode-end
Modified: fcode-utils/testsuite/TokMisc/TestArgs
===================================================================
--- fcode-utils/testsuite/TokMisc/TestArgs 2006-10-14 20:42:30 UTC (rev 94)
+++ fcode-utils/testsuite/TokMisc/TestArgs 2006-10-14 21:07:27 UTC (rev 95)
@@ -8,7 +8,7 @@
# Lines that have no label, no switches, and no script
# do not need any commas.
-# Updated Thu, 06 Jul 2006 at 13:16 PDT by David L. Paktor
+# Updated Thu, 07 Sep 2006 at 11:49 PDT by David L. Paktor
MiscFeatures , , -i
MiscFeatures , applabq , -i -f NOSUN-ABORT-Quote
@@ -46,7 +46,9 @@
HeadrSettings , alwyshdr , -f always-heADERs
HeadrSettings , alwyextl , -f alwaYS-External
HeadrSettings , alwaysboth , -f always-headers -f always-external
-FlagsHelp , , -f HELP
+FlagsHelp , Hlp , -f HELP
+FlagsHelp , , -o FlagsHelp.fc FlagsHelp.fth
+FlagsHelp , UnkOpt , -Z
FlagsHelp , Chg , -f noHex-remark-ESCAPE -f Always-Headers -f help
FlagsHelp , noChg , -f noLocal-Values -f help
FlagsHelp , chgNoHlp , -f noHex-remark-escape -f Always-Headers -f noHelp
@@ -55,6 +57,7 @@
FlgReset FlgReset_1 FlgReset_2
FlgReset FlgReset_1 FlgReset_2 , AlwExt , -f Always-External
AllMacros , , , ExamAllMacs.scr
+AllBiFCTypes
# A little more set-up for Batch Test
UserMacros , , , cp UserMacros.fth UserMacros_cpy1.fth
Modified: fcode-utils/testsuite/TokeErrs/DupNams.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/DupNams.fth 2006-10-14 20:42:30 UTC (rev 94)
+++ fcode-utils/testsuite/TokeErrs/DupNams.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -33,7 +33,7 @@
: noop ." Op? No!" ;
[macro] zoop noop message" I Care."
-: poop h# defeca8e ;
+: poop h# -21013572 ;
new-device
: zoop ." Nothing like the other zoop" croop ;
@@ -74,8 +74,18 @@
finish-device
finish-device
+start4 \ Let's just stick in an extra, and another error besides...
+fcode-end
+\ And a few false-starts and ends...
fcode-end
-\ Let's just stick in an extra...
-fcode-end
+start0
+ ." What does this button do?"
+end1
+
+start2
+ ." Oh, was I not supposed to touch that?"
+end0
+
+save-image poop.fc \ Not gonna happen anyway...
Modified: fcode-utils/testsuite/TokeErrs/GlobScopErrTst.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/GlobScopErrTst.fth 2006-10-14 20:42:30 UTC (rev 94)
+++ fcode-utils/testsuite/TokeErrs/GlobScopErrTst.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -73,7 +73,7 @@
garbanzo
;
-h# deadc0de instance value quaack [message] Instance should be legit here.
+h# DEADc0de instance value quaack [message] Instance should be legit here.
global-definitions
Modified: fcode-utils/testsuite/TokeErrs/LocalTest.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/LocalTest.fth 2006-10-14 20:42:30 UTC (rev 94)
+++ fcode-utils/testsuite/TokeErrs/LocalTest.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -1,5 +1,5 @@
\ LocalTest.fth
-\ Updated Wed, 25 Jan 2006 at 14:33 PST by David L. Paktor
+\ Updated Thu, 31 Aug 2006 at 15:33 PDT by David L. Paktor
fcode-version2
@@ -9,7 +9,7 @@
fload LocalValuesSupport.fth
[endif]
-h# deaf constant dean
+h# Deaf constant dean
: faber ( n3 n2 n1 -- alloc-addr size $addr,len )
{ _otter _weasel _skunk ; _muskrat _mole }
@@ -58,6 +58,31 @@
: ordinary ( -- )
123 456 789 miracle
;
+
+ { _don't _allow _this ; _ever }
+ F[
+ { _nor _this ; _either }
+ ]F
+
+\ And the "unterminated" tests
+
+: ahnold ( the unterminator )
+ fload UntermLocalDecl.fth
+ } \ Does this conclude it okay? (No, it's extraneous...)
+ _green _goose + dup
+ -> _souvenirs
+ fload UntermLocalAssgmnt.fth
+ _souvenirs
+;
+
+\ Once more, out of context:
+fload UntermLocalDecl.fth
+fload UntermLocalAssgmnt.fth _souvenirs
+
+\ And another couple of corner-cases:
+ fload UntermDefn.fth moopoop
+F[ fload UntermDefn.fth poop-de-moo ]F
+
fcode-end
Modified: fcode-utils/testsuite/TokeErrs/MiscFeatErrs.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/MiscFeatErrs.fth 2006-10-14 20:42:30 UTC (rev 94)
+++ fcode-utils/testsuite/TokeErrs/MiscFeatErrs.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -3,10 +3,10 @@
[flag] Local-Values
f[ ." This is a test" ]f
-fcode-version2
+fcode-version1
fload LocalValuesSupport.fth
-
+noop noop noop
headers
[char] G emit
@@ -32,8 +32,8 @@
[macro] swell bell
device-definitions
[macro] yell bell
-
-bell
+offset16
+bell offset16
: factl ( n -- n! )
?dup 0= if 1 factl
control G to bell
Modified: fcode-utils/testsuite/TokeErrs/MulPCI_LapFC.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/MulPCI_LapFC.fth 2006-10-14 20:42:30 UTC (rev 94)
+++ fcode-utils/testsuite/TokeErrs/MulPCI_LapFC.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -1,12 +1,12 @@
\ Combine Multiple PCI headers with overlapping FCodes.
-\ Updated Wed, 14 Jun 2006 at 12:04 PDT by David L. Paktor
+\ Updated Fri, 01 Sep 2006 at 12:55 PDT by David L. Paktor
\ We already have a source with overlapping FCodes in two FCode blocks
\ We just have to wrap it in multiple PCI headers.
\ Also, we have to make sure to define NoCrash as a command-line symbol
\ While we're at it, let's also create another switchable behavior:
\ If the command-line symbol RangeTwo is defined, it should have
-\ a value in the form of a hex number (We'll tace care of the "hex")
+\ a value in the form of a hex number (We'll take care of the "hex")
\ which will, in a roundabout way, become the starting FCode for
\ the second loading of the common Source.
\ We'll save the symbol in a roundabout manner that will test whether
@@ -37,11 +37,11 @@
fload TooManyFCodes.fth
-[ifdef] RangeTwo
+\ Generate an error or two if RangeTwo is not DEFINED. It's harmless
f[
[DEFINED] RangeTwo constant SecondRangeFCode
]f
-[endif]
+\ because all the other references to SecondRangeFCode are conditioned...
\ Try it once before and once after...
[ifndef] NoReset fcode-reset [else] #message" Not resetting..." [endif]
Modified: fcode-utils/testsuite/TokeErrs/PCIhdrErrs.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/PCIhdrErrs.fth 2006-10-14 20:42:30 UTC (rev 94)
+++ fcode-utils/testsuite/TokeErrs/PCIhdrErrs.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -1,6 +1,6 @@
\ Basic PCI-Headers Errors test.
-\ Updated Wed, 25 May 2005 at 17:30 by David L. Paktor
+\ Updated Thu, 31 Aug 2006 at 13:27 PDT by David L. Paktor
hex
@@ -26,3 +26,6 @@
pci-header-end
+\ This is another...
+
+pci-header-end
Modified: fcode-utils/testsuite/TokeErrs/TestArgs
===================================================================
--- fcode-utils/testsuite/TokeErrs/TestArgs 2006-10-14 20:42:30 UTC (rev 94)
+++ fcode-utils/testsuite/TokeErrs/TestArgs 2006-10-14 21:07:27 UTC (rev 95)
@@ -13,11 +13,11 @@
# Most files in this category need the -i switch
# Some may have additional variants.
-# Updated Thu, 27 Jul 2006 at 17:55 PDT by David L. Paktor
+# Updated Thu, 07 Sep 2006 at 11:49 PDT by David L. Paktor
MiscFeatErrs , , -i -I. -I..
-LocalTest , NoLvSupp , -i -I. -I.. -f Local-Values
-LocalTest , , -i -f Local-Values -d dont_omit_support -I. -I..
+LocalTest , NoLvSupp , -i -f Local-Values -I. -I..
+LocalTest , , -i -f Local-Values -I. -I.. -f Always-Headers -d dont_omit_support
LocalTest1 , , -f Local-Values -f noLV-Legacy-Message -I. -I..
ControlMismatch , , -i
SuppLocErrTest4 , , -i -f Local-Values -l -I. -I..
@@ -40,6 +40,7 @@
TooLargeBranch_off16 , V179 , -i -l -d "fld_cmd=fload TooLargeBranch_V179_body.fth"
TooLargeBranch_off16 , V180 , -i -l -d "fld_cmd=fload TooLargeBranch_V180_body.fth"
TooLargeBranch_off08 , , -i -l
+TooLargeBranch_off08 , V180 , -i -l -d "fld_cmd=fload TooLargeBranch_V180_body.fth"
TooLargeBranch_off08_to_16 , , -i -l
TooTooLargeBuffer , , -i -l
UserMacroErrors , , -i
@@ -52,13 +53,13 @@
GlobScopErrTst_01 , , -i -f Local-Values -I. -I..
GlobScopErrTst_02 , , -i -f Local-Values -I. -I..
GlobScopErrTst_03 , , -i -f Local-Values -I. -I..
-# The script-fields below prepare for the ExpPath and InclLst tests
-Frinstnce , , -i , touch ExpPath.NoV.f{c,l{,.missing}}
-Frinstnce , NoI , , chmod a-rw ../TokeCommon/{MyBeerAndYouCannotHaveIt.fth,NoRead.bin} ExpPath.NoV.f{c,l{,.missing}}
+# The script-fields below prepare for the ExpPath InclLst and DePList tests
+Frinstnce , , -i , touch ExpPath.NoV.{P,f{c,l{,.missing}}}
+Frinstnce , NoI , , chmod a-rw ../TokeCommon/{MyBeerAndYouCannotHaveIt.fth,NoRead.bin} ExpPath.NoV.{P,f{c,l{,.missing}}}
-# We're now ready for the ExpPath and InclLst tests
+# We're now ready for the ExpPath InclLst and DePList tests
-ExpPath , NoV , -i -l , +V rm -f ExpPath.NoV.f{c,l{,.missing}}
+ExpPath , NoV , -i -l -P , +V rm -f ExpPath.NoV.{P,f{c,l{,.missing}}}
InclLst , , -i -l -P -I .. -I ../TokBrack -I ../TokMisc -I ../TokeCommon -I ../TokoLoco -I ../TokCondl -I ../TokProdCpy -I ../TokeErrs -I /home/dlpaktor/HeyVern/DoYuhThink/ThisIsA/LongEnuffPathName/To/Make/The/Line/Really/Overflow -I . -I /home/dlpaktor/Hey/Vern/This/Path/Just/Fills/Up/TheLine/KnowWhudI/Mean -I ../TokeCommon -f noAbort-quote
@@ -68,29 +69,32 @@
# Done with the ExpPath and InclLst tests
ToAtEnd , , -i
+ToAtEnd , WLocSup , -i -I . -I ..
ObsoFCodes , , -i
ObsoFCodes , NoWarn , -f NoObsolete-FCode-Warning
TooLargePMessage
TooLargePQuote , , -i
TooLargeQMessage
-TooLargeSQuote
+TooLargeSQuote , , -i
TooLargeParen , , -i
TooLargeQAbort
-TooLargeQNoAbort
+TooLargeQNoAbort , , -f Local-Values
AbrtWQuotStr , , -i
# The new "Trace" feature, and handling of duplicate and mis-scoped names...
DupNams , , -f Local-Values -T croop -T drop -T _harpo -T dup -T noop -T zoop -T foop
-TooManyFCodes , , -i
+TooManyFCodes , , -l -o TooManyFCodes.fl
+TooManyFCodes , Reg , -i
TooManyFCodes , NoCrash , -i -d NoCrash
MulPCI_LapFC , , -i -d NoCrash
-MulPCI_LapFC , RngTwo , -i -d NoCrash -d RangeTwo=0ace
+MulPCI_LapFC , RngTwo , -i -d NoCrash=DupDefn -d NoCrash -d OIBeenToTheOasis=Twice -d RangeTwo=0941 -d NoCrash -d RangeTwo=0ace
MulPCI_LapFC , RTwoNoRst , -i -d NoCrash -d RangeTwo=0ace -d NoReset
MulPCI_LapFC , NoRst , -i -d NoCrash -d NoReset
+MulPCI_LapFC , NoRTwoVal , -i -d NoCrash -d NoReset -d RangeTwo
RetStkDep , , -i
CondlDefn , , -i
Modified: fcode-utils/testsuite/TokeErrs/TooLargeBranch_off08.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeBranch_off08.fth 2006-10-14 20:42:30 UTC (rev 94)
+++ fcode-utils/testsuite/TokeErrs/TooLargeBranch_off08.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -1,6 +1,11 @@
-\ Test case of a branch going over too large a range
+\ Test case of a branch going over too large a range for eight-bit offsets
\ Body generated by the "Verbal Bottles of Beer" script,
-\ (Argument of 1 is enough to do it.)
+\ (Verbal argument of 1 is enough to do it.)
+\ Also a branch that goes over too large a range even for sixteen-bit offsets.
+\ (Verbal argument of 179 is just enough to do that.)
+\ (Verbal argument of N >= 180 exceeds all the branch ranges.)
+\ Command-line definition of 'fld_cmd' can be used to load variable-sized bodies
+\ and should be of the form 'fload <filename>' .
fcode-version1 \ Eight-bit offsets.
@@ -69,4 +74,36 @@
." Here we go!" cr
;
+\ Here's the do-loop that can overflow even sixteen-bit offsets.
+
+: too-large-case ( n -- )
+
+ ." Let's give it a large back-reference too."
+ begin ." We've just begun"
+ ." 1 0 do " cr 1 0 do
+ dup ." if " cr
+ if
+ dup ." case"
+ case
+ 0 of ." Just a short case" cr endof
+ ." Not my default! A Big One!" cr
+
+[ifndef] fld_cmd
+ fload TooLargeBranch_off16_body.fth
+[else]
+ [defined] fld_cmd
+[endif]
+
+ endcase
+ ." then"
+ then
+ ." Loop back and forward" cr loop
+
+ ." And here we are!"
+ exit
+ ." Well, we needed some way out!"
+
+ again ." Back to the fuchsia."
+;
+
fcode-end
Modified: fcode-utils/testsuite/TokeErrs/TooLargeBranch_off16_body.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeBranch_off16_body.fth 2006-10-14 20:42:30 UTC (rev 94)
+++ fcode-utils/testsuite/TokeErrs/TooLargeBranch_off16_body.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -118,45 +118,45 @@
." Oh, one hundred and fifty Bottles of Beer on the wall," cr
." one hundred and fifty Bottles of Beer!," cr
." Take one down and pass it around," cr
-." one hundred and fourty-nine Bottles of Beer on the wall." cr
-." Oh, one hundred and fourty-nine Bottles of Beer on the wall," cr
-." one hundred and fourty-nine Bottles of Beer!," cr
+." one hundred and forty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-nine Bottles of Beer on the wall," cr
+." one hundred and forty-nine Bottles of Beer!," cr
." Take one down and pass it around," cr
-." one hundred and fourty-eight Bottles of Beer on the wall." cr
-." Oh, one hundred and fourty-eight Bottles of Beer on the wall," cr
-." one hundred and fourty-eight Bottles of Beer!," cr
+." one hundred and forty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-eight Bottles of Beer on the wall," cr
+." one hundred and forty-eight Bottles of Beer!," cr
." Take one down and pass it around," cr
-." one hundred and fourty-seven Bottles of Beer on the wall." cr
-." Oh, one hundred and fourty-seven Bottles of Beer on the wall," cr
-." one hundred and fourty-seven Bottles of Beer!," cr
+." one hundred and forty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-seven Bottles of Beer on the wall," cr
+." one hundred and forty-seven Bottles of Beer!," cr
." Take one down and pass it around," cr
-." one hundred and fourty-six Bottles of Beer on the wall." cr
-." Oh, one hundred and fourty-six Bottles of Beer on the wall," cr
-." one hundred and fourty-six Bottles of Beer!," cr
+." one hundred and forty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-six Bottles of Beer on the wall," cr
+." one hundred and forty-six Bottles of Beer!," cr
." Take one down and pass it around," cr
-." one hundred and fourty-five Bottles of Beer on the wall." cr
-." Oh, one hundred and fourty-five Bottles of Beer on the wall," cr
-." one hundred and fourty-five Bottles of Beer!," cr
+." one hundred and forty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-five Bottles of Beer on the wall," cr
+." one hundred and forty-five Bottles of Beer!," cr
." Take one down and pass it around," cr
-." one hundred and fourty-four Bottles of Beer on the wall." cr
-." Oh, one hundred and fourty-four Bottles of Beer on the wall," cr
-." one hundred and fourty-four Bottles of Beer!," cr
+." one hundred and forty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-four Bottles of Beer on the wall," cr
+." one hundred and forty-four Bottles of Beer!," cr
." Take one down and pass it around," cr
-." one hundred and fourty-three Bottles of Beer on the wall." cr
-." Oh, one hundred and fourty-three Bottles of Beer on the wall," cr
-." one hundred and fourty-three Bottles of Beer!," cr
+." one hundred and forty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-three Bottles of Beer on the wall," cr
+." one hundred and forty-three Bottles of Beer!," cr
." Take one down and pass it around," cr
-." one hundred and fourty-two Bottles of Beer on the wall." cr
-." Oh, one hundred and fourty-two Bottles of Beer on the wall," cr
-." one hundred and fourty-two Bottles of Beer!," cr
+." one hundred and forty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-two Bottles of Beer on the wall," cr
+." one hundred and forty-two Bottles of Beer!," cr
." Take one down and pass it around," cr
-." one hundred and fourty-one Bottles of Beer on the wall." cr
-." Oh, one hundred and fourty-one Bottles of Beer on the wall," cr
-." one hundred and fourty-one Bottles of Beer!," cr
+." one hundred and forty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-one Bottles of Beer on the wall," cr
+." one hundred and forty-one Bottles of Beer!," cr
." Take one down and pass it around," cr
-." one hundred and fourty Bottles of Beer on the wall." cr
-." Oh, one hundred and fourty Bottles of Beer on the wall," cr
-." one hundred and fourty Bottles of Beer!," cr
+." one hundred and forty Bottles of Beer on the wall." cr
+." Oh, one hundred and forty Bottles of Beer on the wall," cr
+." one hundred and forty Bottles of Beer!," cr
." Take one down and pass it around," cr
." one hundred and thirty-nine Bottles of Beer on the wall." cr
." Oh, one hundred and thirty-nine Bottles of Beer on the wall," cr
@@ -518,45 +518,45 @@
." Oh, fifty Bottles of Beer on the wall," cr
." fifty Bottles of Beer!," cr
." Take one down and pass it around," cr
-." fourty-nine Bottles of Beer on the wall." cr
-." Oh, fourty-nine Bottles of Beer on the wall," cr
-." fourty-nine Bottles of Beer!," cr
+." forty-nine Bottles of Beer on the wall." cr
+." Oh, forty-nine Bottles of Beer on the wall," cr
+." forty-nine Bottles of Beer!," cr
." Take one down and pass it around," cr
-." fourty-eight Bottles of Beer on the wall." cr
-." Oh, fourty-eight Bottles of Beer on the wall," cr
-." fourty-eight Bottles of Beer!," cr
+." forty-eight Bottles of Beer on the wall." cr
+." Oh, forty-eight Bottles of Beer on the wall," cr
+." forty-eight Bottles of Beer!," cr
." Take one down and pass it around," cr
-." fourty-seven Bottles of Beer on the wall." cr
-." Oh, fourty-seven Bottles of Beer on the wall," cr
-." fourty-seven Bottles of Beer!," cr
+." forty-seven Bottles of Beer on the wall." cr
+." Oh, forty-seven Bottles of Beer on the wall," cr
+." forty-seven Bottles of Beer!," cr
." Take one down and pass it around," cr
-." fourty-six Bottles of Beer on the wall." cr
-." Oh, fourty-six Bottles of Beer on the wall," cr
-." fourty-six Bottles of Beer!," cr
+." forty-six Bottles of Beer on the wall." cr
+." Oh, forty-six Bottles of Beer on the wall," cr
+." forty-six Bottles of Beer!," cr
." Take one down and pass it around," cr
-." fourty-five Bottles of Beer on the wall." cr
-." Oh, fourty-five Bottles of Beer on the wall," cr
-." fourty-five Bottles of Beer!," cr
+." forty-five Bottles of Beer on the wall." cr
+." Oh, forty-five Bottles of Beer on the wall," cr
+." forty-five Bottles of Beer!," cr
." Take one down and pass it around," cr
-." fourty-four Bottles of Beer on the wall." cr
-." Oh, fourty-four Bottles of Beer on the wall," cr
-." fourty-four Bottles of Beer!," cr
+." forty-four Bottles of Beer on the wall." cr
+." Oh, forty-four Bottles of Beer on the wall," cr
+." forty-four Bottles of Beer!," cr
." Take one down and pass it around," cr
-." fourty-three Bottles of Beer on the wall." cr
-." Oh, fourty-three Bottles of Beer on the wall," cr
-." fourty-three Bottles of Beer!," cr
+." forty-three Bottles of Beer on the wall." cr
+." Oh, forty-three Bottles of Beer on the wall," cr
+." forty-three Bottles of Beer!," cr
." Take one down and pass it around," cr
-." fourty-two Bottles of Beer on the wall." cr
-." Oh, fourty-two Bottles of Beer on the wall," cr
-." fourty-two Bottles of Beer!," cr
+." forty-two Bottles of Beer on the wall." cr
+." Oh, forty-two Bottles of Beer on the wall," cr
+." forty-two Bottles of Beer!," cr
." Take one down and pass it around," cr
-." fourty-one Bottles of Beer on the wall." cr
-." Oh, fourty-one Bottles of Beer on the wall," cr
-." fourty-one Bottles of Beer!," cr
+." forty-one Bottles of Beer on the wall." cr
+." Oh, forty-one Bottles of Beer on the wall," cr
+." forty-one Bottles of Beer!," cr
." Take one down and pass it around," cr
-." fourty Bottles of Beer on the wall." cr
-." Oh, fourty Bottles of Beer on the wall," cr
-." fourty Bottles of Beer!," cr
+." forty Bottles of Beer on the wall." cr
+." Oh, forty Bottles of Beer on the wall," cr
+." forty Bottles of Beer!," cr
." Take one down and pass it around," cr
." thirty-nine Bottles of Beer on the wall." cr
." Oh, thirty-nine Bottles of Beer on the wall," cr
Modified: fcode-utils/testsuite/TokeErrs/TooLargePMessage.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargePMessage.fth 2006-10-14 20:42:30 UTC (rev 94)
+++ fcode-utils/testsuite/TokeErrs/TooLargePMessage.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -1,5 +1,5 @@
-\ Test a Paren-Message that is not terminated at all and the number
-\ of characters until the end of file exceeds the buffer.
+\ Test a Paren-Message that is not terminated at all and whose
+\ number of characters until the end of file exceeds the buffer.
\ A Paren-Message does not have the string-escape sequences.
\ Enter Tokenizer-escape mode
\ then define the required test-token as alias to .(
Modified: fcode-utils/testsuite/TokeErrs/TooLargePQuote.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargePQuote.fth 2006-10-14 20:42:30 UTC (rev 94)
+++ fcode-utils/testsuite/TokeErrs/TooLargePQuote.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -1,4 +1,4 @@
-\ Test a P-Quote that is not terminated at all and the number
+\ Test a P-Quote that is not terminated at all and whose number
\ of characters until the end of file exceeds the buffer.
\ A P-Quote has the string-escape sequences.
\ Define the required test-token as alias to ."
Modified: fcode-utils/testsuite/TokeErrs/TooLargeParen.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeParen.fth 2006-10-14 20:42:30 UTC (rev 94)
+++ fcode-utils/testsuite/TokeErrs/TooLargeParen.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -1,15 +1,15 @@
-\ Test a Parenthesis-Comment that is not terminated at all and the number
-\ of characters until the end of file exceeds the buffer.
+\ Test a Parenthesis-Comment that is not terminated at all and whose
+\ number of characters until the end of file exceeds the buffer.
\ Define the required test-token as alias to (
\ then FLOAD the test-body file.
-\ Updated Wed, 10 May 2006 at 10:43 PDT by David L. Paktor
+\ Updated Fri, 01 Sep 2006 at 09:39 PDT by David L. Paktor
global-definitions
alias test-token (
-fcode-version2
+start4
headers
Modified: fcode-utils/testsuite/TokeErrs/TooLargeQAbort.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeQAbort.fth 2006-10-14 20:42:30 UTC (rev 94)
+++ fcode-utils/testsuite/TokeErrs/TooLargeQAbort.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -1,5 +1,5 @@
-\ Test an Abort-Quote whose body is not terminated at all and the number
-\ of characters until the end of file exceeds the buffer.
+\ Test an Abort-Quote whose body is not terminated at all and whose
+\ number of characters until the end of file exceeds the buffer.
\ Abort-Quote may be dis-allowed. This test allows it.
\ Define the required test-token as alias to abort"
\ then FLOAD the test-body file.
Modified: fcode-utils/testsuite/TokeErrs/TooLargeQMessage.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeQMessage.fth 2006-10-14 20:42:30 UTC (rev 94)
+++ fcode-utils/testsuite/TokeErrs/TooLargeQMessage.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -1,5 +1,5 @@
-\ Test a Quote-Message that is not terminated at all and the number
-\ of characters until the end of file exceeds the buffer.
+\ Test a Quote-Message that is not terminated at all and whose
+\ number of characters until the end of file exceeds the buffer.
\ A Quote-Message has the string-escape sequences.
\ Define the required test-token as alias to #message"
\ then FLOAD the test-body file.
Modified: fcode-utils/testsuite/TokeErrs/TooLargeQNoAbort.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeQNoAbort.fth 2006-10-14 20:42:30 UTC (rev 94)
+++ fcode-utils/testsuite/TokeErrs/TooLargeQNoAbort.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -1,5 +1,5 @@
-\ Test an Abort-Quote whose body is not terminated at all and the number
-\ of characters until the end of file exceeds the buffer.
+\ Test an Abort-Quote whose body is not terminated at all and whose
+\ number of characters until the end of file exceeds the buffer.
\ Abort-Quote may be dis-allowed. It is dis-allowed in this test.
\ Define the required test-token as alias to abort"
\ then FLOAD the test-body file.
Modified: fcode-utils/testsuite/TokeErrs/TooLargeSQuote.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeSQuote.fth 2006-10-14 20:42:30 UTC (rev 94)
+++ fcode-utils/testsuite/TokeErrs/TooLargeSQuote.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -1,4 +1,4 @@
-\ Test an Ess-Quote that is not terminated at all and the number
+\ Test an Ess-Quote that is not terminated at all and whose number
\ of characters until the end of file exceeds the buffer.
\ An Ess-Quote does not have the string-escape sequences.
\ Define the required test-token as alias to S"
Modified: fcode-utils/testsuite/TokeErrs/TooManyFCodes.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooManyFCodes.fth 2006-10-14 20:42:30 UTC (rev 94)
+++ fcode-utils/testsuite/TokeErrs/TooManyFCodes.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -1,6 +1,6 @@
\ Test overlapping FCode # error checking, and reaching the max allowable.
-\ Updated Wed, 14 Jun 2006 at 12:54 PDT by David L. Paktor
+\ Updated Wed, 06 Sep 2006 at 18:23 PDT by David L. Paktor
\ A macro to force showing the current nextfcode
global-definitions
@@ -18,11 +18,11 @@
0 constant my_zero
fload OneTwoFive.fth
- fcode-push
+ fcode-push f[ f['] eleven next-fcode ]f fcode-pop fcode-push
#message" one_twenty-six" 126 constant one_hundred_and_twenty-six
#message" one_twenty-seven" 127 constant one_hundred_and_twenty-seven
#message" one_twenty-eight" 128 constant one_hundred_and_twenty-eight
-
+ f[ f['] eleven emit-fcode ]f
show-next-fcode
new-device
@@ -33,7 +33,7 @@
#message" one_twenty-seven" 127 constant one_hundred_and_twenty-seven
#message" one_twenty-eight" 128 constant one_hundred_and_twenty-eight
- show-next-fcode
+ f[ fcode-push f['] eleven next-fcode ]f fcode-pop
finish-device
new-device
@@ -50,7 +50,7 @@
new-device
fcode-pop
0 constant my_zero
- fload OneTwoFive.fth
+ fload OneTwoFive.fth f[ fcode-push f['] eleven next-fcode fcode-pop ]f
f[ fcode-push constant dev-2-lap ]f
#message" one_twenty-six" 126 constant one_hundred_and_twenty-six
#message" one_twenty-seven" 127 constant one_hundred_and_twenty-seven
@@ -136,10 +136,13 @@
\ This next one pushes the FCode # over the limit and causes a crash.
\ Let's leave ourselves a way around that, so we can use this in other ways
-\ Allow a command-line symbol called nocrash to prevent this.
+\ Allow a command-line symbol called NoCrash to prevent this.
[ifndef] NoCrash
#message" one_twenty-eight" 128 constant one_hundred_and_twenty-eight
show-next-fcode
+[else] \ Otherwise, let's do this test:
+ #message" Overflow the data-stack."
+ f[ decimal fload TooManyPushes.fth f]
[endif]
fcode-end
Added: fcode-utils/testsuite/TokeErrs/TooManyPushes.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooManyPushes.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooManyPushes.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -0,0 +1,1027 @@
+1027
+1026
+1025
+1024
+1023
+1022
+1021
+1020
+1019
+1018
+1017
+1016
+1015
+1014
+1013
+1012
+1011
+1010
+1009
+1008
+1007
+1006
+1005
+1004
+1003
+1002
+1001
+1000
+999
+998
+997
+996
+995
+994
+993
+992
+991
+990
+989
+988
+987
+986
+985
+984
+983
+982
+981
+980
+979
+978
+977
+976
+975
+974
+973
+972
+971
+970
+969
+968
+967
+966
+965
+964
+963
+962
+961
+960
+959
+958
+957
+956
+955
+954
+953
+952
+951
+950
+949
+948
+947
+946
+945
+944
+943
+942
+941
+940
+939
+938
+937
+936
+935
+934
+933
+932
+931
+930
+929
+928
+927
+926
+925
+924
+923
+922
+921
+920
+919
+918
+917
+916
+915
+914
+913
+912
+911
+910
+909
+908
+907
+906
+905
+904
+903
+902
+901
+900
+899
+898
+897
+896
+895
+894
+893
+892
+891
+890
+889
+888
+887
+886
+885
+884
+883
+882
+881
+880
+879
+878
+877
+876
+875
+874
+873
+872
+871
+870
+869
+868
+867
+866
+865
+864
+863
+862
+861
+860
+859
+858
+857
+856
+855
+854
+853
+852
+851
+850
+849
+848
+847
+846
+845
+844
+843
+842
+841
+840
+839
+838
+837
+836
+835
+834
+833
+832
+831
+830
+829
+828
+827
+826
+825
+824
+823
+822
+821
+820
+819
+818
+817
+816
+815
+814
+813
+812
+811
+810
+809
+808
+807
+806
+805
+804
+803
+802
+801
+800
+799
+798
+797
+796
+795
+794
+793
+792
+791
+790
+789
+788
+787
+786
+785
+784
+783
+782
+781
+780
+779
+778
+777
+776
+775
+774
+773
+772
+771
+770
+769
+768
+767
+766
+765
+764
+763
+762
+761
+760
+759
+758
+757
+756
+755
+754
+753
+752
+751
+750
+749
+748
+747
+746
+745
+744
+743
+742
+741
+740
+739
+738
+737
+736
+735
+734
+733
+732
+731
+730
+729
+728
+727
+726
+725
+724
+723
+722
+721
+720
+719
+718
+717
+716
+715
+714
+713
+712
+711
+710
+709
+708
+707
+706
+705
+704
+703
+702
+701
+700
+699
+698
+697
+696
+695
+694
+693
+692
+691
+690
+689
+688
+687
+686
+685
+684
+683
+682
+681
+680
+679
+678
+677
+676
+675
+674
+673
+672
+671
+670
+669
+668
+667
+666
+665
+664
+663
+662
+661
+660
+659
+658
+657
+656
+655
+654
+653
+652
+651
+650
+649
+648
+647
+646
+645
+644
+643
+642
+641
+640
+639
+638
+637
+636
+635
+634
+633
+632
+631
+630
+629
+628
+627
+626
+625
+624
+623
+622
+621
+620
+619
+618
+617
+616
+615
+614
+613
+612
+611
+610
+609
+608
+607
+606
+605
+604
+603
+602
+601
+600
+599
+598
+597
+596
+595
+594
+593
+592
+591
+590
+589
+588
+587
+586
+585
+584
+583
+582
+581
+580
+579
+578
+577
+576
+575
+574
+573
+572
+571
+570
+569
+568
+567
+566
+565
+564
+563
+562
+561
+560
+559
+558
+557
+556
+555
+554
+553
+552
+551
+550
+549
+548
+547
+546
+545
+544
+543
+542
+541
+540
+539
+538
+537
+536
+535
+534
+533
+532
+531
+530
+529
+528
+527
+526
+525
+524
+523
+522
+521
+520
+519
+518
+517
+516
+515
+514
+513
+512
+511
+510
+509
+508
+507
+506
+505
+504
+503
+502
+501
+500
+499
+498
+497
+496
+495
+494
+493
+492
+491
+490
+489
+488
+487
+486
+485
+484
+483
+482
+481
+480
+479
+478
+477
+476
+475
+474
+473
+472
+471
+470
+469
+468
+467
+466
+465
+464
+463
+462
+461
+460
+459
+458
+457
+456
+455
+454
+453
+452
+451
+450
+449
+448
+447
+446
+445
+444
+443
+442
+441
+440
+439
+438
+437
+436
+435
+434
+433
+432
+431
+430
+429
+428
+427
+426
+425
+424
+423
+422
+421
+420
+419
+418
+417
+416
+415
+414
+413
+412
+411
+410
+409
+408
+407
+406
+405
+404
+403
+402
+401
+400
+399
+398
+397
+396
+395
+394
+393
+392
+391
+390
+389
+388
+387
+386
+385
+384
+383
+382
+381
+380
+379
+378
+377
+376
+375
+374
+373
+372
+371
+370
+369
+368
+367
+366
+365
+364
+363
+362
+361
+360
+359
+358
+357
+356
+355
+354
+353
+352
+351
+350
+349
+348
+347
+346
+345
+344
+343
+342
+341
+340
+339
+338
+337
+336
+335
+334
+333
+332
+331
+330
+329
+328
+327
+326
+325
+324
+323
+322
+321
+320
+319
+318
+317
+316
+315
+314
+313
+312
+311
+310
+309
+308
+307
+306
+305
+304
+303
+302
+301
+300
+299
+298
+297
+296
+295
+294
+293
+292
+291
+290
+289
+288
+287
+286
+285
+284
+283
+282
+281
+280
+279
+278
+277
+276
+275
+274
+273
+272
+271
+270
+269
+268
+267
+266
+265
+264
+263
+262
+261
+260
+259
+258
+257
+256
+255
+254
+253
+252
+251
+250
+249
+248
+247
+246
+245
+244
+243
+242
+241
+240
+239
+238
+237
+236
+235
+234
+233
+232
+231
+230
+229
+228
+227
+226
+225
+224
+223
+222
+221
+220
+219
+218
+217
+216
+215
+214
+213
+212
+211
+210
+209
+208
+207
+206
+205
+204
+203
+202
+201
+200
+199
+198
+197
+196
+195
+194
+193
+192
+191
+190
+189
+188
+187
+186
+185
+184
+183
+182
+181
+180
+179
+178
+177
+176
+175
+174
+173
+172
+171
+170
+169
+168
+167
+166
+165
+164
+163
+162
+161
+160
+159
+158
+157
+156
+155
+154
+153
+152
+151
+150
+149
+148
+147
+146
+145
+144
+143
+142
+141
+140
+139
+138
+137
+136
+135
+134
+133
+132
+131
+130
+129
+128
+127
+126
+125
+124
+123
+122
+121
+120
+119
+118
+117
+116
+115
+114
+113
+112
+111
+110
+109
+108
+107
+106
+105
+104
+103
+102
+101
+100
+99
+98
+97
+96
+95
+94
+93
+92
+91
+90
+89
+88
+87
+86
+85
+84
+83
+82
+81
+80
+79
+78
+77
+76
+75
+74
+73
+72
+71
+70
+69
+68
+67
+66
+65
+64
+63
+62
+61
+60
+59
+58
+57
+56
+55
+54
+53
+52
+51
+50
+49
+48
+47
+46
+45
+44
+43
+42
+41
+40
+39
+38
+37
+36
+35
+34
+33
+32
+31
+30
+29
+28
+27
+26
+25
+24
+23
+22
+21
+20
+19
+18
+17
+16
+15
+14
+13
+12
+11
+10
+9
+8
+7
+6
+5
+4
+3
+2
+1
Added: fcode-utils/testsuite/TokeErrs/UntermDefn.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/UntermDefn.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/UntermDefn.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -0,0 +1,7 @@
+\ Another unusual error....
+\ Not even a newbie would make this one, right?
+\ Yeah, right...
+\ Updated Thu, 31 Aug 2006 at 17:39 PDT by David L. Paktor
+
+
+h# -41100132 constant
Added: fcode-utils/testsuite/TokeErrs/UntermLocalAssgmnt.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/UntermLocalAssgmnt.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/UntermLocalAssgmnt.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -0,0 +1,6 @@
+\ Another corner-case error.
+\ Create an unterminated simple local-values assignment
+\ to be FLoaded into various contexts...
+\ Updated Thu, 31 Aug 2006 at 17:09 PDT by David L. Paktor
+
+ ->
Added: fcode-utils/testsuite/TokeErrs/UntermLocalDecl.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/UntermLocalDecl.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/UntermLocalDecl.fth 2006-10-14 21:07:27 UTC (rev 95)
@@ -0,0 +1,7 @@
+\ Another corner-case error.
+\ Create an unterminated simple local-values declaration
+\ to be FLoaded into various contexts...
+\ Updated Thu, 31 Aug 2006 at 15:47 PDT by David L. Paktor
+
+
+ { _green _goose | _souvenirs
1
0
Author: stepan
Date: 2006-10-14 22:42:30 +0200 (Sat, 14 Oct 2006)
New Revision: 94
Modified:
fcode-utils/detok/detok.c
fcode-utils/toke/toke.c
Log:
fix license printing
Modified: fcode-utils/detok/detok.c
===================================================================
--- fcode-utils/detok/detok.c 2006-10-14 20:36:03 UTC (rev 93)
+++ fcode-utils/detok/detok.c 2006-10-14 20:42:30 UTC (rev 94)
@@ -7,7 +7,8 @@
* This program is part of a free implementation of the IEEE 1275-1994
* Standard for Boot (Initialization Configuration) Firmware.
*
- * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ * Copyright (C) 2001-2006 Stefan Reinauer, <stepan(a)openbios.org>
+ * Copyright (C) 2006 coresystems GmbH <info(a)coresystems.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -44,8 +45,10 @@
#include "stream.h"
#include "addfcodes.h"
-#define DETOK_VERSION "0.6.1"
+#define DETOK_VERSION "1.0.0"
+#define CORE_COPYR "(C) Copyright 2001-2006 Stefan Reinauer.\n" \
+ "(C) Copyright 2006 coresystems GmbH <info(a)coresystems.de>"
#define IBM_COPYR "(C) Copyright 2005 IBM Corporation. All Rights Reserved."
bool verbose = FALSE ;
@@ -62,18 +65,16 @@
char buffr[512];
sprintf( buffr,
- "Welcome to the OpenBIOS detokenizer v%s\ndetok Copyright"
- "(c) 2001-2005 by Stefan Reinauer.\nWritten by Stefan "
- "Reinauer, <stepan(a)openbios.org>\n" "This program is "
- "free software; you may redistribute it under the terms of\n"
- "the GNU General Public License. This program has absolutely"
- " no warranty.\n\n" ,DETOK_VERSION);
+ "Welcome to detok - OpenBIOS detokenizer v" DETOK_VERSION "\n"
+ CORE_COPYR "\n" IBM_COPYR "\n"
+ "Written by Stefan Reinauer, <stepan(a)openbios.org>\n"
+ "This program is free software; you may redistribute it "
+ "under the terms of\nthe GNU General Public License v2. This "
+ "program has absolutely no warranty.\n\n" );
pfunct = ( is_error ? (vfunct)printf : printremark );
(*pfunct) ( buffr );
-
- (*pfunct) ( IBM_COPYR "\n" );
}
static void usage(char *name)
Modified: fcode-utils/toke/toke.c
===================================================================
--- fcode-utils/toke/toke.c 2006-10-14 20:36:03 UTC (rev 93)
+++ fcode-utils/toke/toke.c 2006-10-14 20:42:30 UTC (rev 94)
@@ -102,7 +102,7 @@
printf( "Welcome to toke - OpenBIOS tokenizer v" TOKE_VERSION "\n"
CORE_COPYR "\n" IBM_COPYR "\n"
"This program is free software; you may redistribute it "
- "under the terms of\nthe GNU General Public License. This "
+ "under the terms of\nthe GNU General Public License v2. This "
"program has absolutely no warranty.\n\n");
#ifdef DEVEL
/* Temporary hack during development... */
1
0
Author: stepan
Date: 2006-10-14 22:36:03 +0200 (Sat, 14 Oct 2006)
New Revision: 93
Modified:
fcode-utils/testsuite/AutoExec
Log:
small fix for test executor
Modified: fcode-utils/testsuite/AutoExec
===================================================================
--- fcode-utils/testsuite/AutoExec 2006-10-14 20:34:46 UTC (rev 92)
+++ fcode-utils/testsuite/AutoExec 2006-10-14 20:36:03 UTC (rev 93)
@@ -45,8 +45,8 @@
# Initial error-checking:
-if ( ( ! -x ./toke ) || ( ! -x ./detok ) ) then
- echo 'Starting in wrong directory. Executable toke and detok are not here.'
+if ( ( ! -x ./toke ) || ( ! -x ./detok ) || ( ! -x ./romheaders ) ) then
+ echo 'Starting in wrong directory. Executable toke, detok and romheaders are not here.'
exit 1
endif
1
0
Author: stepan
Date: 2006-10-14 22:34:46 +0200 (Sat, 14 Oct 2006)
New Revision: 92
Added:
fcode-utils/testsuite/AutoCompare
fcode-utils/testsuite/AutoExec
Log:
add testsuite scripts
Added: fcode-utils/testsuite/AutoCompare
===================================================================
--- fcode-utils/testsuite/AutoCompare (rev 0)
+++ fcode-utils/testsuite/AutoCompare 2006-10-14 20:34:46 UTC (rev 92)
@@ -0,0 +1,183 @@
+#! /bin/csh -f
+#
+# Part of automation of the testing process for the Tokenizer/De-Tokenizer
+# Automate Comparison of results of Auto-Execution of the various test-cases
+
+# Updated Fri, 16 Jun 2006 at 12:12 PDT by David L. Paktor
+
+# To Do:
+# Conditional comparison of .DeTok files:
+# Detect difference in .fc file, but do not display
+# Display differences in .Log file
+# If difference detected in .fc file, display mssg
+# Otherwise, detect difference in .DeTok file and display mssg
+# If either diff detected in .fc or in .DeTok file, show .DeTok diffs
+# Display differences in .RomHdr
+#
+# Compare the source (.fth) files (for regression testing...)
+
+# Usage:
+# Run this from the parent-directory of the various Test categories.
+# This script uses the same TestArgs files that were used by
+# (and described in) the AutoExec script.
+#
+# This script needs a shell environment variable called CygTestLogs
+# whose value is the path to the parent-directory that contains
+# the results of Auto-Execution of the various test-cases under
+# Cygwin, which is the "Gold Standard" to which the other
+# platforms' results will be compared.
+#
+# This script accepts an optional environment variable called LogFilesDiff
+# which may be set to change the number of lines by which two .Log
+# files are expected to differ (due to different compilation-signatures)
+# If this is not supplied in the environment, a default will be provided.
+#
+# This script compares only one platform's results at a time;
+# the parent-directory that contains the Auto-Execution results
+# for the platform to be compared should be the current directory.
+#
+# This script displays both operational errors and detected discrepancies
+# in Standard Output and also collects the same in a log file whose
+# name is AutoComp.Log.<time-and-date-stamp>
+#
+# A secondary output file, called AutoComp.TKdiffs.<time-and-date-stamp>
+# is produced; it can be "source"d to cause a sequential tkdiff of
+# the detected discrepancies
+
+
+# Set the number of lines by which two .Log files are expected to differ.
+# (this is due to different compilation-signature lines)
+set LogFilesDiffLines = 6
+# Over-ride with optional shell env't variable called LogFilesDiff
+if ( $?LogFilesDiff ) then
+ set notallnumbers = `echo $LogFilesDiff | tr '0-9' ' '`
+ if ( "$notallnumbers" == "" ) then
+ set LogFilesDiffLines = $LogFilesDiff
+ endif
+endif
+
+# Preliminary error checking:
+if ( ! $?CygTestLogs ) then
+ echo 'Please define a shell environment variable called CygTestLogs'
+ echo ' whose value is the path to the Cygwin test-results directory.'
+ exit 1
+endif
+
+set TArgFiles = `find . -name TestArgs -exec expr {} : '\./\(.*\)' \;`
+if ( $#TArgFiles == 0 ) then
+ echo 'No TestArgs files found in subdirectories.'
+ echo 'Starting in wrong directory?'
+ exit 2
+endif
+
+set TArgReslts = `find $CygTestLogs -name TestArgs -exec expr {} : $CygTestLogs/'\(.*\)' \;`
+if ( $#TArgReslts != $#TArgFiles ) then
+ echo 'Number of TestArgs files in CygTestLogs ('$CygTestLogs') directory'
+ echo ' does not match those found under current directory.'
+ echo 'Please correct discrepancy and try again.'
+ exit 4
+endif
+
+if ( "$TArgReslts" != "$TArgFiles" ) then
+ echo 'List of TestArgs files in CygTestLogs ('$CygTestLogs') directory'
+ echo ' does not match those found under current directory.'
+ echo 'Please correct discrepancy and try again.'
+ exit 8
+endif
+
+# Let's save mismatch identifiers:
+set datemark = `date '+%y%m%d.%H%M%S'`
+set ErrResltFil = AutoComp.Log.$datemark
+set ScriptResltFil = AutoComp.TKdiffs.$datemark
+
+# Let's show a progress-downcount
+# Find the count of actual tests; leave the max number on display:
+set cnt = `egrep '^[^#].*' $TArgFiles | wc -l`
+echo ''
+echo $cnt
+
+foreach TArgFil ( $TArgFiles )
+ set dir = $TArgFil:h
+
+ set lindxmax = `cat $TArgFil | wc -l`
+ set lindx = 0
+ while ( $lindx < $lindxmax )
+ @ lindx++
+ set targline = `sed -n ${lindx}p $TArgFil`
+ if ( $#targline == 0 ) continue
+ if ( "$targline[1]" == "#" ) continue
+ set ttarg = $dir/$targline[1]
+# One more error-check:
+ if ( ! -f ${ttarg}.fth ) then
+ echo File Not found: ${ttarg}.fth
+ echo Please update ${TArgFil} file, line $lindx
+ continue
+ endif
+
+ set label = `echo $targline | awk -F , '{print $2}'`
+ if ( "$label" != "" ) set label = .$label
+
+# Now begins the real fun...
+# Show a running down-count
+ echo -n X${cnt}' ' | tr X \\015
+ @ cnt--
+
+# Check the extensions that are text-type files
+ foreach txext ( Log RomHdr fl fl.missing )
+# Is the file in both?
+ if ( -f $CygTestLogs/${ttarg}${label}.${txext} && ! -f ${ttarg}${label}.${txext} ) then
+ echo Missing ${ttarg}${label}.${txext} | tee -a $ErrResltFil
+ else
+ if ( -f ${ttarg}${label}.${txext} ) then
+ set lim = 0
+ set fxext = `echo $txext | tr '.' '_'`
+ if ( `eval echo '$?'${fxext}FilesDiffLines` ) then
+ set lim = `eval echo '$'${fxext}FilesDiffLines`
+ endif
+ set logdiff = `diff {,$CygTestLogs/}${ttarg}${label}.${txext} | wc -l`
+ if ( $logdiff > $lim ) then
+ echo ${ttarg}${label}.${txext} files differ. | tee -a $ErrResltFil
+ diff {$CygTestLogs/,}${ttarg}${label}.${txext} | tee -a $ErrResltFil
+ echo 'tkdiff {$CygTestLogs/,}'${ttarg}${label}.${txext} >> $ScriptResltFil
+ endif
+ endif
+ endif
+ end
+
+# Now, check the FCode file.
+# If there's an FCode file in the reference directory ($CygTestLogs)
+# there should be one in the directory under test.
+ if ( -f $CygTestLogs/${ttarg}${label}.fc && ! -f ${ttarg}${label}.fc ) then
+ echo Missing ${ttarg}${label}.fc | tee -a $ErrResltFil
+ else
+# Is there an FCode file in the directory under test?
+ unset ShowDetokDiffs
+ if ( -f ${ttarg}${label}.fc ) then
+ set bindiff = `cmp {,$CygTestLogs/}${ttarg}${label}.fc`
+ if ( "$bindiff" != "" ) then
+ echo "$bindiff" | tee -a $ErrResltFil
+# If the binaries are different, show the difference in the DeTok form
+# If the DeTok form is missing, it's an even stranger error!
+ if ( ! -f $CygTestLogs/${ttarg}${label}.DeTok || ! -f ${ttarg}${label}.DeTok ) then
+ echo Missing DeTok file for ${ttarg}${label} | tee -a $ErrResltFil
+ else
+ set ShowDetokDiffs
+ endif
+ else
+# Even if the binaries are not different,
+# check for changes in in the DeTok form
+ set detokdiff = `diff {,$CygTestLogs/}${ttarg}${label}.DeTok | wc -l`
+ if ( $detokdiff > 0 ) set ShowDetokDiffs
+ endif
+ endif
+ if ( $?ShowDetokDiffs ) then
+ echo ${ttarg}${label}.DeTok files differ. | tee -a $ErrResltFil
+ diff {$CygTestLogs/,}${ttarg}${label}.DeTok | tee -a $ErrResltFil
+ echo 'tkdiff {$CygTestLogs/,}'${ttarg}${label}.DeTok >> $ScriptResltFil
+ endif
+ endif
+
+ end
+end
+
+
Added: fcode-utils/testsuite/AutoExec
===================================================================
--- fcode-utils/testsuite/AutoExec (rev 0)
+++ fcode-utils/testsuite/AutoExec 2006-10-14 20:34:46 UTC (rev 92)
@@ -0,0 +1,164 @@
+#! /bin/csh -f
+#
+# Part of automation of the testing process for the Tokenizer/De-Tokenizer
+# Automate Execution of Tokenizing and De-Tokenizing the various test-cases
+
+# Updated Thu, 09 Feb 2006 at 13:10 PST by David L. Paktor
+
+# Run this from the parent-directory of the various Test categories.
+# Sym-links to the binaries should be here.
+
+# Each Test category directory must have a TestArgs file,
+# formatted as follows:
+# Lines starting with # (Pound-sign Space) are comments,
+# and are ignored
+# Blank lines are also allowed, and are also ignored
+# Valid lines have four comma-separated fields:
+# Test-file base-name
+# Result-file label
+# Extra command-line switches
+# A script-command, to be run after, for specific
+# verification of this Test. Arguments can also
+# be included in this field, as long as they have
+# no commas.
+# An unspecified intermediate field must be represented as
+# an empty field separated by commas from the fields
+# preceding and following.
+# Lines that have no label, no switches, and no script
+# do not need any commas.
+# The -v (verbose) switch will always be used and does not need
+# to be explicitly specified. However, if the "script-command"
+# field starts with +V (case-sensitive), then the -v (verbose)
+# switch will not be used.
+#
+# The Test-file base-name field may have multiple base-names,
+# to run a multiple-file batch command.
+# If a multiple-file batch is run:
+# The Result-file label will apply only to the Log file.
+
+# To Do:
+# Contrive a way to run the second through last input files as
+# separate individual jobs (with same command-line switches)
+# This needs to be co-ordinated with the Auto-Compare script:
+# It will need to compare the .FC files from the batch with
+# those from the individual runs.
+
+
+# Initial error-checking:
+if ( ( ! -x ./toke ) || ( ! -x ./detok ) ) then
+ echo 'Starting in wrong directory. Executable toke and detok are not here.'
+ exit 1
+endif
+
+set TArgFiles = `find . -name TestArgs -exec expr {} : '\./\(.*\)' \;`
+if ( $#TArgFiles == 0 ) then
+ echo 'No TestArgs files found in subdirectories.'
+ echo 'Starting in wrong directory?'
+ exit 1
+endif
+
+set parent = `pwd`
+set tokex = `pwd`/toke
+set detokex = `pwd`/detok
+set romhdrex = `pwd`/romheaders
+
+set chirren = `echo $TArgFiles | tr ' ' \\012 | sed -e 'sX/[^/]*$XXg'`
+
+# The "verbose" flag is now a variable.
+set vflg = '-v'
+
+# Let's show a progress-downcount and time, stamps and elapsed.
+# Find the count; leave the max number on display:
+set cnt = `egrep '^[^#].*' $TArgFiles | wc -l`
+echo ''
+set starttime = `date +'%T'`
+echo $starttime
+echo $cnt
+
+foreach dir ( $chirren )
+ cd $dir
+ set lindxmax = `cat TestArgs | wc -l`
+ set lindx = 0
+ while ( $lindx < $lindxmax )
+ @ lindx++
+ set targline = `sed -n ${lindx}p TestArgs`
+ if ( $#targline == 0 ) continue
+ if ( "$targline[1]" == "#" ) continue
+ set ttargs = `echo $targline | awk -F , '{print $1}'`
+# One more error-check:
+ set tfths = ''
+ set fcfils = ''
+ unset FMissing
+ foreach tfth ( $ttargs )
+ if ( ! -f ${tfth}.fth ) then
+ echo File Not found: ${dir}/${tfth}.fth
+ echo Please update ${dir}/TestArgs file, line $lindx
+ set FMissing
+ endif
+ set tfths = ( $tfths ${tfth}.fth )
+ set fcfils = ( $fcfils ${tfth}.fc )
+ end
+ if ( $?FMissing ) continue
+
+ set ttarg = $ttargs[1]
+
+ set outfile = ''
+ set label = `echo $targline | awk -F , '{print $2}'`
+ if ( "$label" != "" ) then
+ set label = .$label
+ if ( $#tfths == 1 ) then
+ set fcfils = ${ttarg}${label}.fc
+ set outfile = ( -o $fcfils )
+ endif
+ endif
+# We don't set the switches as a shell-variable because we might
+# need to preserve quoted groupings that have embedded spaces.
+
+# Collect the script-command.
+# Awkward place to expect a "+V" option, but it'll have to serve....
+ set scriptcmd = `echo $targline | awk -F , '{print $4}'`
+ if ( $#scriptcmd > 0 ) then
+ if ( "$scriptcmd[1]" == "+V" ) then
+ set vflg = ""
+ if ( $#scriptcmd == 1 ) then
+ set scriptcmd = ""
+ else
+ set scriptcmd = ( $scriptcmd[2-] )
+ endif
+ endif
+ endif
+
+ echo -n X${cnt}' ' | tr X \\015
+ @ cnt--
+
+# Now do it.
+ set doromhdr = 0
+ echo toke $vflg `sed -n ${lindx}p TestArgs | awk -F , '{print $3}'` $outfile ${tfths} >& ${ttarg}${label}.Log
+ echo '' >>& ${ttarg}${label}.Log
+ eval $tokex $vflg `sed -n ${lindx}p TestArgs | awk -F , '{print $3}'` $outfile ${tfths} >>& ${ttarg}${label}.Log
+ set vflg = '-v'
+
+ foreach fcfil ( $fcfils )
+ if ( -f ${fcfil} ) then
+ $detokex -v -o ${fcfil} > ${fcfil:r}.DeTok
+ set doromhdr = `grep 'PCI Header identified' ${fcfil:r}.DeTok | wc -l`
+ if ( $doromhdr ) then
+ $romhdrex ${fcfil} > ${fcfil:r}.RomHdr
+ endif
+ endif
+ end
+
+
+ if ( "$scriptcmd" != "" ) then
+ eval $scriptcmd
+ endif
+
+ end
+ cd $parent
+end
+# Clear the display-line
+echo -n X' 'X | tr X \\015
+# Show time, stamps and elapsed.
+date +'%T'
+echo $starttime ' (Started)'
+
1
0
r91 - in fcode-utils: . testsuite testsuite/TokBrack testsuite/TokCondl testsuite/TokMisc testsuite/TokMisc/OldTkzr testsuite/TokMisc/sub.w.dots testsuite/TokeCommon testsuite/TokeErrs testsuite/TokoLoco
by svn＠openbios.org 14 Oct '06
by svn＠openbios.org 14 Oct '06
14 Oct '06
Author: stepan
Date: 2006-10-14 22:31:53 +0200 (Sat, 14 Oct 2006)
New Revision: 91
Added:
fcode-utils/testsuite/
fcode-utils/testsuite/GlobalLocalValues.fth
fcode-utils/testsuite/GlobalLocalValuesDevel.fth
fcode-utils/testsuite/LocalValuesDevelSupport.fth
fcode-utils/testsuite/LocalValuesSupport.fth
fcode-utils/testsuite/TokBrack/
fcode-utils/testsuite/TokBrack/TestArgs
fcode-utils/testsuite/TokBrack/TokBrkErrTst_01.fth
fcode-utils/testsuite/TokBrack/TokBrkTst_01.fth
fcode-utils/testsuite/TokBrack/TokBrkTst_02.fth
fcode-utils/testsuite/TokBrack/TokBrkTst_03.fth
fcode-utils/testsuite/TokBrack/revlev.fth
fcode-utils/testsuite/TokCondl/
fcode-utils/testsuite/TokCondl/BooBalah.fth
fcode-utils/testsuite/TokCondl/CondAlias.fth
fcode-utils/testsuite/TokCondl/CondMacAlias.fth
fcode-utils/testsuite/TokCondl/CondMacAlias_01.fth
fcode-utils/testsuite/TokCondl/CondOpInIgndMssg.fth
fcode-utils/testsuite/TokCondl/DefCondTst.fth
fcode-utils/testsuite/TokCondl/DefCondTst2.fth
fcode-utils/testsuite/TokCondl/DupLoadBody.fth
fcode-utils/testsuite/TokCondl/DupLoadTst.fth
fcode-utils/testsuite/TokCondl/MulFCimgFT.fth
fcode-utils/testsuite/TokCondl/MulFCimgTF.fth
fcode-utils/testsuite/TokCondl/MulFCimg_01.fth
fcode-utils/testsuite/TokCondl/MulFCimg_01_Body.fth
fcode-utils/testsuite/TokCondl/MulPCI_FC.fth
fcode-utils/testsuite/TokCondl/MulPCIhdr.fth
fcode-utils/testsuite/TokCondl/TestArgs
fcode-utils/testsuite/TokCondl/TokCondErrs.fth
fcode-utils/testsuite/TokCondl/TokCondMinTst.fth
fcode-utils/testsuite/TokCondl/TokConstCondTst01.fth
fcode-utils/testsuite/TokCondl/TokConstCondTst02.fth
fcode-utils/testsuite/TokCondl/TokConstCondTstF.fth
fcode-utils/testsuite/TokCondl/TokConstCondTstT.fth
fcode-utils/testsuite/TokCondl/TokDefCondTst.fth
fcode-utils/testsuite/TokCondl/TokExstCondNadaTst.fth
fcode-utils/testsuite/TokCondl/TokExstCondNada_01.fth
fcode-utils/testsuite/TokCondl/TokExstCondNada_02.fth
fcode-utils/testsuite/TokCondl/TokExstCondTst01.fth
fcode-utils/testsuite/TokCondl/TokExstCondTstN.fth
fcode-utils/testsuite/TokCondl/TokExstCondTstY.fth
fcode-utils/testsuite/TokMisc/
fcode-utils/testsuite/TokMisc/AbrtQuot.fth
fcode-utils/testsuite/TokMisc/AllMacros.fth
fcode-utils/testsuite/TokMisc/Almost_a_Buffer_of_Beer.fth
fcode-utils/testsuite/TokMisc/BasicCont.fth
fcode-utils/testsuite/TokMisc/BatchTst.fth
fcode-utils/testsuite/TokMisc/BranchOverNewBuffer.fth
fcode-utils/testsuite/TokMisc/CaseTkns.fth
fcode-utils/testsuite/TokMisc/ContErr1.fth
fcode-utils/testsuite/TokMisc/ContErr2.fth
fcode-utils/testsuite/TokMisc/ContErr3.fth
fcode-utils/testsuite/TokMisc/EncodTst.fth
fcode-utils/testsuite/TokMisc/EncodeSrc
fcode-utils/testsuite/TokMisc/ExamAllMacs.scr
fcode-utils/testsuite/TokMisc/ExtCont.fth
fcode-utils/testsuite/TokMisc/FlagSet.fth
fcode-utils/testsuite/TokMisc/FlagsHelp.fth
fcode-utils/testsuite/TokMisc/FlgReset.fth
fcode-utils/testsuite/TokMisc/FlgReset_1.fth
fcode-utils/testsuite/TokMisc/FlgReset_2.fth
fcode-utils/testsuite/TokMisc/HeadrSettings.fth
fcode-utils/testsuite/TokMisc/LotsOfAliases.fth
fcode-utils/testsuite/TokMisc/MinPCIHtst.fth
fcode-utils/testsuite/TokMisc/MiscFeatures.DOS.fth
fcode-utils/testsuite/TokMisc/MiscFeatures.fth
fcode-utils/testsuite/TokMisc/MiscFeaturesCopy.fth
fcode-utils/testsuite/TokMisc/MiscFeaturesXtra.fth
fcode-utils/testsuite/TokMisc/MulDev.fth
fcode-utils/testsuite/TokMisc/MulDev_01.fth
fcode-utils/testsuite/TokMisc/MulDev_02.fth
fcode-utils/testsuite/TokMisc/No_Beer.fth
fcode-utils/testsuite/TokMisc/OldTkzr/
fcode-utils/testsuite/TokMisc/OldTkzr/ContErr0.OldTkzr.DeTok
fcode-utils/testsuite/TokMisc/OldTkzr/ContErr0.OldTkzr.Log
fcode-utils/testsuite/TokMisc/OldTkzr/ContErr0.OldTkzr.fc
fcode-utils/testsuite/TokMisc/OldTkzr/ContErr0.fth
fcode-utils/testsuite/TokMisc/OldTkzr/SimplStrEscs.OldTkzr.DeTok
fcode-utils/testsuite/TokMisc/OldTkzr/SimplStrEscs.OldTkzr.Log
fcode-utils/testsuite/TokMisc/OldTkzr/SimplStrEscs.OldTkzr.fc
fcode-utils/testsuite/TokMisc/OldTkzr/SimplStrEscs.fth
fcode-utils/testsuite/TokMisc/OneBeer.fc
fcode-utils/testsuite/TokMisc/StrAtEof.fld.fth
fcode-utils/testsuite/TokMisc/StrAtEof.fth
fcode-utils/testsuite/TokMisc/StrEscs.fth
fcode-utils/testsuite/TokMisc/StrEscs_01.fth
fcode-utils/testsuite/TokMisc/StringsGenl.DOS.fth
fcode-utils/testsuite/TokMisc/StringsGenl.fth
fcode-utils/testsuite/TokMisc/TestArgs
fcode-utils/testsuite/TokMisc/TooLargeBeerBuffer_body.fth
fcode-utils/testsuite/TokMisc/TooLargeBufferMulPciFcb.fth
fcode-utils/testsuite/TokMisc/UserMacros.fth
fcode-utils/testsuite/TokMisc/sub.w.dots/
fcode-utils/testsuite/TokMisc/sub.w.dots/MulDev
fcode-utils/testsuite/TokeCommon/
fcode-utils/testsuite/TokeCommon/BinData.bin
fcode-utils/testsuite/TokeCommon/MyBeerAndYouCannotHaveIt.fth
fcode-utils/testsuite/TokeCommon/NoRead.bin
fcode-utils/testsuite/TokeCommon/OneBeer.fl
fcode-utils/testsuite/TokeCommon/OneBeer.fth
fcode-utils/testsuite/TokeCommon/ZeroLen.bin
fcode-utils/testsuite/TokeErrs/
fcode-utils/testsuite/TokeErrs/AbrtWQuotStr.fth
fcode-utils/testsuite/TokeErrs/CStrEscOvflw.fth
fcode-utils/testsuite/TokeErrs/CStrEscOvflw_body_1.fth
fcode-utils/testsuite/TokeErrs/CStrEscOvflw_body_2.fth
fcode-utils/testsuite/TokeErrs/CStrEscOvflw_body_3.fth
fcode-utils/testsuite/TokeErrs/CommOvrRun.fth
fcode-utils/testsuite/TokeErrs/CommOvrRun_01.fth
fcode-utils/testsuite/TokeErrs/CommOvrRun_02.fth
fcode-utils/testsuite/TokeErrs/CommOvrRun_03.fth
fcode-utils/testsuite/TokeErrs/CommOvrRun_04.fth
fcode-utils/testsuite/TokeErrs/CommOvrRun_05.fth
fcode-utils/testsuite/TokeErrs/CondlDefn.fth
fcode-utils/testsuite/TokeErrs/ControlMismatch.fth
fcode-utils/testsuite/TokeErrs/DevImbal.fth
fcode-utils/testsuite/TokeErrs/DevNodAli.fth
fcode-utils/testsuite/TokeErrs/DevNodAli_01.fth
fcode-utils/testsuite/TokeErrs/DupNams.fth
fcode-utils/testsuite/TokeErrs/ExpPath.fth
fcode-utils/testsuite/TokeErrs/FCShdrErrs.fth
fcode-utils/testsuite/TokeErrs/Frinstnce.fth
fcode-utils/testsuite/TokeErrs/GlobScopErrTst.fth
fcode-utils/testsuite/TokeErrs/GlobScopErrTst_01.fth
fcode-utils/testsuite/TokeErrs/GlobScopErrTst_02.fth
fcode-utils/testsuite/TokeErrs/GlobScopErrTst_03.fth
fcode-utils/testsuite/TokeErrs/InclLst.fth
fcode-utils/testsuite/TokeErrs/LargeTextNoQte.fth
fcode-utils/testsuite/TokeErrs/LitNums.fth
fcode-utils/testsuite/TokeErrs/LocOvrRun.fth
fcode-utils/testsuite/TokeErrs/LocOvrRun_01.fth
fcode-utils/testsuite/TokeErrs/LocOvrRun_02.fth
fcode-utils/testsuite/TokeErrs/LocOvrRun_03.fth
fcode-utils/testsuite/TokeErrs/LocOvrRun_04.fth
fcode-utils/testsuite/TokeErrs/LocalTest.fth
fcode-utils/testsuite/TokeErrs/LocalTest1.fth
fcode-utils/testsuite/TokeErrs/MacTest.fth
fcode-utils/testsuite/TokeErrs/MiscFeatErrs.fth
fcode-utils/testsuite/TokeErrs/MulPCI_LapFC.fth
fcode-utils/testsuite/TokeErrs/ObsoFCodes.fth
fcode-utils/testsuite/TokeErrs/OneTwoFive.fth
fcode-utils/testsuite/TokeErrs/PCI_FCShdrErrs.fth
fcode-utils/testsuite/TokeErrs/PCIhdrErrs.fth
fcode-utils/testsuite/TokeErrs/PooPsalah.fth
fcode-utils/testsuite/TokeErrs/RetStkDep.fth
fcode-utils/testsuite/TokeErrs/SmlOvrRun.fth
fcode-utils/testsuite/TokeErrs/SplitImbal.fth
fcode-utils/testsuite/TokeErrs/SplitImbal_01.fth
fcode-utils/testsuite/TokeErrs/SplitImbal_02.fth
fcode-utils/testsuite/TokeErrs/SplitImbal_03.fth
fcode-utils/testsuite/TokeErrs/SplitImbal_04.fth
fcode-utils/testsuite/TokeErrs/SplitImbal_05.fth
fcode-utils/testsuite/TokeErrs/SuppLocErrTest4.ErrMsgs.NoI
fcode-utils/testsuite/TokeErrs/SuppLocErrTest4.fth
fcode-utils/testsuite/TokeErrs/TestArgs
fcode-utils/testsuite/TokeErrs/ToAtEnd.fth
fcode-utils/testsuite/TokeErrs/TokCondUnconcF.fth
fcode-utils/testsuite/TokeErrs/TokCondUnconcT.fth
fcode-utils/testsuite/TokeErrs/TokCondUnconc_01.fth
fcode-utils/testsuite/TokeErrs/TooLargeBranch_N231_body.fth
fcode-utils/testsuite/TokeErrs/TooLargeBranch_N232_body.fth
fcode-utils/testsuite/TokeErrs/TooLargeBranch_N233_body.fth
fcode-utils/testsuite/TokeErrs/TooLargeBranch_V178_body.fth
fcode-utils/testsuite/TokeErrs/TooLargeBranch_V179_body.fth
fcode-utils/testsuite/TokeErrs/TooLargeBranch_V180_body.fth
fcode-utils/testsuite/TokeErrs/TooLargeBranch_off08.fth
fcode-utils/testsuite/TokeErrs/TooLargeBranch_off08_body.fth
fcode-utils/testsuite/TokeErrs/TooLargeBranch_off08_to_16.fth
fcode-utils/testsuite/TokeErrs/TooLargeBranch_off16.fth
fcode-utils/testsuite/TokeErrs/TooLargeBranch_off16_body.fth
fcode-utils/testsuite/TokeErrs/TooLargeCase.fth
fcode-utils/testsuite/TokeErrs/TooLargeCase_body.fth
fcode-utils/testsuite/TokeErrs/TooLargePMessage.fth
fcode-utils/testsuite/TokeErrs/TooLargePQuote.fth
fcode-utils/testsuite/TokeErrs/TooLargeParen.fth
fcode-utils/testsuite/TokeErrs/TooLargeQAbort.fth
fcode-utils/testsuite/TokeErrs/TooLargeQMessage.fth
fcode-utils/testsuite/TokeErrs/TooLargeQNoAbort.fth
fcode-utils/testsuite/TokeErrs/TooLargeSQuote.fth
fcode-utils/testsuite/TokeErrs/TooManyFCodes.fth
fcode-utils/testsuite/TokeErrs/TooTooLargeBuffer.fth
fcode-utils/testsuite/TokeErrs/TooTooLargeBuffer_body.fth
fcode-utils/testsuite/TokeErrs/UserMacroErrors.fth
fcode-utils/testsuite/TokeErrs/errtest1.fth
fcode-utils/testsuite/TokeErrs/errtest2.fth
fcode-utils/testsuite/TokeErrs/testLocDevSupG.fth
fcode-utils/testsuite/TokoLoco/
fcode-utils/testsuite/TokoLoco/GlobalLocalValues.fth
fcode-utils/testsuite/TokoLoco/SupportedLocalTest.fth
fcode-utils/testsuite/TokoLoco/SupportedLocalTest2.fth
fcode-utils/testsuite/TokoLoco/SupportedLocalTest3.fth
fcode-utils/testsuite/TokoLoco/SupportedLocalTest4.fth
fcode-utils/testsuite/TokoLoco/TestArgs
fcode-utils/testsuite/TokoLoco/testCatch.fth
fcode-utils/testsuite/TokoLoco/testDevelSupport.fth
fcode-utils/testsuite/TokoLoco/testNest.fth
fcode-utils/testsuite/TokoLoco/testNest1.fth
fcode-utils/testsuite/TokoLoco/testNest2.fth
fcode-utils/testsuite/TokoLoco/testNest3.fth
fcode-utils/testsuite/TokoLoco/testSupport.fth
fcode-utils/testsuite/TotalLocalValuesSupport.fth
Log:
testsuite 1.0.0
Added: fcode-utils/testsuite/GlobalLocalValues.fth
===================================================================
--- fcode-utils/testsuite/GlobalLocalValues.fth (rev 0)
+++ fcode-utils/testsuite/GlobalLocalValues.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1 @@
+link ../../LocalValues/GlobalLocalValues.fth
\ No newline at end of file
Property changes on: fcode-utils/testsuite/GlobalLocalValues.fth
___________________________________________________________________
Name: svn:special
+ *
Added: fcode-utils/testsuite/GlobalLocalValuesDevel.fth
===================================================================
--- fcode-utils/testsuite/GlobalLocalValuesDevel.fth (rev 0)
+++ fcode-utils/testsuite/GlobalLocalValuesDevel.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1 @@
+link ../../LocalValues/GlobalLocalValuesDevel.fth
\ No newline at end of file
Property changes on: fcode-utils/testsuite/GlobalLocalValuesDevel.fth
___________________________________________________________________
Name: svn:special
+ *
Added: fcode-utils/testsuite/LocalValuesDevelSupport.fth
===================================================================
--- fcode-utils/testsuite/LocalValuesDevelSupport.fth (rev 0)
+++ fcode-utils/testsuite/LocalValuesDevelSupport.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1 @@
+link ../../LocalValues/LocalValuesDevelSupport.fth
\ No newline at end of file
Property changes on: fcode-utils/testsuite/LocalValuesDevelSupport.fth
___________________________________________________________________
Name: svn:special
+ *
Added: fcode-utils/testsuite/LocalValuesSupport.fth
===================================================================
--- fcode-utils/testsuite/LocalValuesSupport.fth (rev 0)
+++ fcode-utils/testsuite/LocalValuesSupport.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1 @@
+link ../../LocalValues/LocalValuesSupport.fth
\ No newline at end of file
Property changes on: fcode-utils/testsuite/LocalValuesSupport.fth
___________________________________________________________________
Name: svn:special
+ *
Added: fcode-utils/testsuite/TokBrack/TestArgs
===================================================================
--- fcode-utils/testsuite/TokBrack/TestArgs (rev 0)
+++ fcode-utils/testsuite/TokBrack/TestArgs 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,20 @@
+# Automated Test Arguments file for TokBrack category
+# (That's short for "Tokenizer Bracket";
+# it refers to the Tokenizer Escape state.)
+
+# Valid lines have four comma-separated fields:
+# Test-file base-name
+# Result-file label
+# Extra command-line switches
+# A script-command with arguments (but no commas).
+# Lines that have no label, no switches, and no script
+# do not need any commas.
+
+# Updated Wed, 08 Mar 2006 at 19:11 PST by David L. Paktor
+
+# Might as well get the date-and-time one out of the way first...
+TokBrkTst_02 , , -i -l
+TokBrkTst_01 , , -i
+TokBrkTst_01 , alwyshdr , -i -f ALWays-heADers
+TokBrkTst_03
+TokBrkErrTst_01 , , -i
Added: fcode-utils/testsuite/TokBrack/TokBrkErrTst_01.fth
===================================================================
--- fcode-utils/testsuite/TokBrack/TokBrkErrTst_01.fth (rev 0)
+++ fcode-utils/testsuite/TokBrack/TokBrkErrTst_01.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,60 @@
+\ Test of tokenizer[ ]tokenizer scope Error-Detection
+\ Updated Fri, 17 Feb 2006 at 10:15 PST by David L. Paktor
+
+fcode-version2
+
+headers
+ h# 30
+ emit-byte
+hex
+tokenizer[
+ rummidge
+ 10 emit-byte
+ 10 emit-byte
+ d# 10 emit-byte
+ o# 10 emit-byte
+ h# 10 emit-byte
+ 802 next-fcode
+ h# 1020 next-fcode
+ h# 3682 emit-byte
+ ]tokenizer
+decimal 50 constant gummidge
+hex
+tokenizer[ gummidge
+ rummidge
+ ]tokenizer
+ h# 30 emit-byte
+
+100 constant pele_yoetz_ne'ema'an_anochi_hu_ha'omer_v'oseh_v'ain_c'moni_bchol_ha_aretz
+
+pele_yoetz_ne'ema'an_anochi_hu_ha'omer_v'oseh_v'ain_c'moni_bchol_ha_aretz 2 * constant clone
+
+b(lit)
+tokenizer[
+ 30 swap emit-byte
+ d# 20 emit-byte
+ o# 20 emit-byte
+ h# 20 emit-byte
+ ]tokenizer
+tokenizer[
+h# defeca8e constant poopoo
+h# beeffece constant moopoo
+ ]tokenizer
+ alias merde poopoo
+ alias couterde moopoo
+tokenizer[
+ merde fliteral
+ ]tokenizer
+ couterde fliteral
+
+tokenizer[
+ fcode-push
+ fliteral
+ a# Fink
+ fcode-pop
+ ]tokenizer
+
+end0
+
+
+
Added: fcode-utils/testsuite/TokBrack/TokBrkTst_01.fth
===================================================================
--- fcode-utils/testsuite/TokBrack/TokBrkTst_01.fth (rev 0)
+++ fcode-utils/testsuite/TokBrack/TokBrkTst_01.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,49 @@
+\ Elementary test of the tokenizer[ ]tokenizer scope functions
+\ Updated Fri, 21 Oct 2005 at 16:01 PDT by David L. Paktor
+
+fcode-version2
+
+headers
+hex
+
+b(lit)
+tokenizer[
+ 10 emit-byte
+ d# 10 emit-byte
+ o# 10 emit-byte
+ h# 10 emit-byte
+ ]tokenizer
+decimal
+100 constant pele_yoetz_ne'ema'an_anochi_hu_ha'omer_v'oseh_v'ain_c'moni_bchol_ha_aretz
+
+pele_yoetz_ne'ema'an_anochi_hu_ha'omer_v'oseh_v'ain_c'moni_bchol_ha_aretz 2 * constant clone
+
+12 c,
+tokenizer[ 12 fliteral
+ ]tokenizer l,
+12 c,
+: yuttzer 14 tokenizer[ 14 fliteral hex 14 fliteral ]tokenizer 14 ;
+
+hex
+headerless
+80 constant this_name_has_a_whole_lot_of_syllables_and_so_would_not_be_a_good_ingredient_in_ice_cream_but_at_least_you_know_what_it_means
+
+headers
+
+ f[ 1cec6ea3 constant a_name_with_too_many_letters_should_not_matter_in_tokenizer_escape_mode
+ ]f
+
+: brand-x-ice-cream \ Because it uses ingredients with too many syllables
+ pele_yoetz_ne'ema'an_anochi_hu_ha'omer_v'oseh_v'ain_c'moni_bchol_ha_aretz
+ dup 20 - do i . loop cr
+ ." Nameless one..." this_name_has_a_whole_lot_of_syllables_and_so_would_not_be_a_good_ingredient_in_ice_cream_but_at_least_you_know_what_it_means ." equals " . cr
+ ." But everyone likes an "
+ f[ a_name_with_too_many_letters_should_not_matter_in_tokenizer_escape_mode
+ f] fliteral .
+ clone . cr
+;
+
+end0
+
+
+
Added: fcode-utils/testsuite/TokBrack/TokBrkTst_02.fth
===================================================================
--- fcode-utils/testsuite/TokBrack/TokBrkTst_02.fth (rev 0)
+++ fcode-utils/testsuite/TokBrack/TokBrkTst_02.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,94 @@
+\ Secondary test of tokenizer-escape mode functions
+\ Updated Thu, 02 Mar 2006 at 17:47 PST by David L. Paktor
+
+[macro] where-from ." This came from " [input-file-name] type ." line " [line-number] .d cr
+[macro] in_what ." In " [function-name] type cr
+[macro] mess_in_what f[ [function-name] ]f
+
+tokenizer[
+
+fload revlev.fth
+
+h# 020000 constant eithernet \ Class Code: 0x020000 (Ethernet)
+h# 5417 constant deviouce \ Device ID: 0x5417
+h# 17d5 constant vanitor \ Vendor ID: 0x17d5
+
+ vanitor deviouce eithernet
+ i-got-a-Rev-Level
+ false
+ ]tokenizer
+
+not-last-image
+last-img
+set-last-image
+ SET-REV-LEVEL
+ pci-header
+
+fcode-version2
+
+headers
+hex
+tokenizer[
+
+d# 10 constant triumph
+ o# 40 constant trophy
+ h# 80 constant trumpet
+ ]tokenizer
+b(lit)
+tokenizer[
+ 10 emit-byte
+ triumph emit-byte
+ trumpet emit-byte
+ trophy emit-byte
+
+ ]tokenizer
+b(lit)
+tokenizer[
+
+ h# de h# fe h# ca h# 8e
+ 2swap swap
+ emit-byte emit-byte
+ swap emit-byte emit-byte
+
+ ]tokenizer
+
+h# defeca8e constant poopoo
+h# beeffece constant moopoo
+alias couterde moopoo
+tokenizer[
+h# defeca8e constant poopoo
+h# beeffece constant moopoo
+alias couterde moopoo
+ couterde poopoo
+ ]tokenizer fliteral
+ fliteral
+
+ f['] moopoo \ Can't f['] couterde just yet
+ couterde poopoo
+tokenizer[ h# feedbac4 ]tokenizer \ Leave something extra on the stack...
+: merde
+ ['] moopoo \ Can't ['] couterde just yet, either
+ ' poopoo
+ couterde
+ ascii b char e [char] f
+[message] About to tokenize run-time date and time stamps. Twice!
+ ." Date " [fcode-date] type
+ ." Time" [fcode-time] type cr
+ ." Time" [fcode-time] type
+ ." Date " [fcode-date] type cr
+f[ [fcode-date] [fcode-time] ]f
+ in_what where-from mess_in_what
+;
+ascii f
+ char e
+ [char] c
+
+: terde
+ in_what where-from mess_in_what
+;
+
+
+end0
+
+\ save-image chalupa.fc
+
Added: fcode-utils/testsuite/TokBrack/TokBrkTst_03.fth
===================================================================
--- fcode-utils/testsuite/TokBrack/TokBrkTst_03.fth (rev 0)
+++ fcode-utils/testsuite/TokBrack/TokBrkTst_03.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,18 @@
+\ Test new Aliasing algorithm
+
+\ Updated Tue, 31 May 2005 at 12:05 by David L. Paktor
+
+fcode-version2
+tokenizer[
+\ emit-date
+\ alias dte emit-date
+alias dq ."
+dq This is a message"
+\ dte
+h# 00030000 constant goodmeat
+goodmeat fliteral
+alias goodeats goodmeat
+goodeats fliteral
+reset-symbols
+ ]tokenizer
+end0
Added: fcode-utils/testsuite/TokBrack/revlev.fth
===================================================================
--- fcode-utils/testsuite/TokBrack/revlev.fth (rev 0)
+++ fcode-utils/testsuite/TokBrack/revlev.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,2 @@
+\ Fake out an FLOAD-able constant
+h# f2ed constant i-got-a-Rev-Level
Added: fcode-utils/testsuite/TokCondl/BooBalah.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/BooBalah.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/BooBalah.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,34 @@
+\ FLoadable body for various conditional tests, based on the value of
+\ a constant named "boobalah?" (Okay, so I was running out of ideas...)
+
+." Begin Nested ""Constant"" Test Test"
+f[ boobalah? f] [if]
+[message] The TRUE path has wisely been chosen, Boobalah!
+ ." Is True, level 1"
+ f[ boobalah? f] [if]
+ " Is True and is True, level 2"
+ [else]
+ " Is True but is Not True. What?"
+ [then]
+ ." Middle of level 2"
+ f[ boobalah? 0= f] [if]
+ " Is True and is False. What?"
+ [else]
+ " Is True and is Not False, level 2"
+ [then]
+[else]
+[message] Oy, Boobalah. You have foolishly chosen the FALSE path.
+ ." Is Not True, level 1"
+ f[ boobalah? f] [if]
+ " Is Not True but is True. What?"
+ [else]
+ " Is Not True and is Not True, level 2"
+ [then]
+ ." Middle of Not level 2"
+ f[ boobalah? 0= f] [if]
+ " Is Not True and is False, level 2"
+ [else]
+ " Is Not True and is Not False. What?"
+ [then]
+[then]
+
Added: fcode-utils/testsuite/TokCondl/CondAlias.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/CondAlias.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/CondAlias.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,42 @@
+\ Test aliasing of Conditional directives. Use Command-line-definition
+\ Updated Tue, 20 Dec 2005 at 16:15 PST by David L. Paktor
+
+\
+\ Symbol moogoo is either defined true (-1) or false (0), or is absent
+
+
+alias [dowegotit?] [ifdef]
+alias [ifyouaintgot] [ifndef]
+alias [izzatso?] [if]
+alias [udderwise] [else]
+alias [donewidit] [then]
+ f[ alias mess( .(
+ alias mess" ."
+ f]
+
+[ifyouaintgot] moogoo
+ f[
+ mess( Y'gotta define MooGoo on da command-line.)
+ mess" "n"tIt's eider -D moogoo=true or -D moogoo=false"
+ f]
+[udderwise]
+ f[
+ mess( Hey! Y'got MooGoo! Good for you!)
+ [defined] moogoo [izzatso?]
+ mess" And guess what! It's TRUE! Drinks all around!"
+ [udderwise]
+ mess( So wut's it gonna be? You gonna be FLASE to me?)
+ [donewidit]
+ f]
+[donewidit]
+
+[dowegotit?] moogoo
+ f[
+ mess( Hey! Did I menshun dat we got MooGoo?)
+ mess" "n"tYeah? Well, so wut if I did? I'm gonna menshun it again!
+ WE GOT MooGoo!!!"
+ f]
+[udderwise]
+ f[
+ mess" "n"tCuz if ya don' got dat MooGoo, it don't mean a t'ing..." f]
+[donewidit]
Added: fcode-utils/testsuite/TokCondl/CondMacAlias.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/CondMacAlias.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/CondMacAlias.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,58 @@
+\ Test Conditionals and Locals with Macros and Aliases
+\ without (intentional) errors, this time...
+\ Updated Fri, 10 Mar 2006 at 14:26 PST by David L. Paktor
+
+headers
+fcode-version2
+
+fload GlobalLocalValues.fth
+
+Global-definitions
+
+alias // \
+alias ((( (
+
+alias loc{ {
+
+alias [whatden] [endif]
+alias [younwhudahmy] [else]
+[macro] [donewidit] [whatden]
+[macro] [udderwise] [younwhudahmy]
+
+
+alias [isitdere] [ifexist]
+alias [ifitaint] [ifnexist]
+[macro] doIgotit [isitdere]
+[macro] Iaintgotit [ifitaint]
+
+[macro] [ifitis] Iaintgotit gumblefritz
+
+device-definitions
+
+\ Don't define gumblefritz
+
+[message] Didn't define gumblefritz
+
+[ifitaint] gumblefritz
+ #message" Can't ignore fload. What if it's got a balancing [endif] ?"
+ [message] Or a balancing [else]
+ fload CondMacAlias_01.fth
+[udderwise]
+ #message" Dis ain't gonna show even if it has an [endif] "
+ [message] Dere's an [endif] here too
+[donewidit]
+
+new-device
+
+create gumblefritz
+[message] Just defined gumblefritz
+
+doIgotit gumblefritz
+
+ fload CondMacAlias_01.fth
+
+[donewidit]
+
+finish-device
+
+fcode-end
Added: fcode-utils/testsuite/TokCondl/CondMacAlias_01.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/CondMacAlias_01.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/CondMacAlias_01.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,120 @@
+\ Test Conditionals and Locals with Macros and Aliases
+\ without (intentional) errors. Common code...
+\ Updated Fri, 10 Mar 2006 at 17:18 PST by David L. Paktor
+
+
+( File that floads this will have to define // as an alias to \ and
+ also ((( as an alias to ( (open-paren)
+
+((( That last also acts as the close-paren that finishes the two-line
+ comment above. Funny... We also need a macro called [ifitis]
+ whose meaning may change but which will always begin the "true"
+ segment of a conditional, a macro called [udderwise] which will
+ be the equivalent of [else] and one called [donewidit] which
+ will be the equivalent of [then] )
+// Oh, yeah. And loc{ as an alias to { (open-curly-brace)
+
+// we will also have various comments, remarks and messages
+\ with embedded false [else]'s and the like...
+
+[ifitis]
+ #message" Dis is da TROO side of da test. What [else] ya gonna do?
+ Da message goes on ta heayuh!"
+ f[ .( Yuh got anuddah message.
+ What [then] chum? ) ]f
+ [ifitis]
+ #message" Now yer in da TROO o' da TROO. What [then] ?"
+ [udderwise]
+ #message" Yer in da FLASE o' da TROO. Yer in trubble, chum!"
+ [donewidit]
+ #message" Back to da foist level o' da TROO. Let's try sump'in'..."
+ : contralto ((( tony vinnie looie -- marie )
+ #message" No warning for multiline decl'n and none for comment"
+ multi-line
+ loc{ _ay_tony
+ multi-line ((( He's da ringleadah
+ Y'know, da leader of da pack! )
+ _ay_vinnie // He's da mussel
+ _ay_bobby ( He's got da ringwoim )
+ | _ay_marie ((( She's my goil! )
+ }
+ _ay_tony _ay_bobby + _ay_vinnie *
+ -> _ay_marie
+ #message" Multiline warning for this comment"
+ ( Dey're all outa roo'beah!
+ Y'wanna Doctah Peppah instea'? ) \ Got used by dis instea'?
+ _ay_marie
+ ;
+ : alto ((( sis boom bah -- hahaha )
+ #message" Warning for multiline decl'n but not comment"
+ loc{ _sis _boom
+ _bah multi-line ((( What is this anyway?
+ Oh, right... ) | _hahaha
+ }
+ #message" Warning for this multiline comment" ((( What is this?
+ It is a whiz. )
+ _sis _bah * _boom - dup -> _hahaha
+ ;
+ : tenor ( jose placido luciano -- enrico josef )
+ #message" No warning for multiline decl'n, but one for comment"
+ multi-line
+ loc{ _jose ((( Can you see?
+ Buy the Donzerly light! )
+ _placido _luciano
+ | _enrico _josef
+ }
+ _placido _luciano + _jose / -> _josef
+ ;
+
+[udderwise]
+ #message" Dis is da FLASE side of da test. What ya gonna do [then] ?
+ Ya gonna let da message go on ta heayuh!"
+ f[ .( So dis is anuddah message.
+ What [else] chum? ) ]f
+ [ifitis]
+ #message" Dis is da TROO o' da FLASE. Y'shouldn'a'ought'a evuh be heayuh..."
+ f[ ." Let's try some spurious [else] action, whaddya say?" ]f
+ : [else] ." Don't do it" ; [message] Fake [else] got through
+ create [else] [message] Fake [else] got through
+ h# defeca8e constant [else] [message] Fake [else] got through
+ h# beeffece value [else] [message] Fake [else] got through
+ d# 64 buffer: [else] [message] Fake [else] got through
+ struct
+ /l field [else] [message] Fake [else] got through
+ variable [else] [message] Fake [else] got through
+ defer [else] [message] Fake [else] got through
+ ['] [else] [message] Fake [else] got through
+ to [else] [message] Fake [else] got through
+ ['] [else]
+ is [else] [message] Fake [else] got through
+ : say-what ( tony vinnie looie --
+ -- marie )
+\ multi-line \ Should refer to the loc's decl'n, not to the comment
+ loc{ _ay_tony
+ multi-line \ Y'want this to refer to the comment
+ // but when ignoring, what happens?
+ ((( He's da ringleadah
+ Y'know, da leader of da pack! )
+ _ay_vinnie // He's da mussel
+ [else] [message] Really bad fake [else] got through
+ _ay_bobby ( He's got da ringwoim )
+ | _ay_marie ((( She's my goil! )
+ }
+ _ay_tony _ay_bobby + _ay_vinnie *
+ -> _ay_marie
+ ( Dey're all outa roo'beah!
+ Y'wanna Doctah Peppah instea'? ) \ Got used by dis instea'?
+ _ay_marie
+ ;
+ .( What does an [else] do in dot-parens? ) [message] Fake [else] got through
+ ." What does an [else] do in dot-quotes?" [message] Fake [else] got through
+ s" What does an [else] do in Ess-quote?" [message] Fake [else] got through
+ " What does an [else] do in dbl-quotes?" [message] Fake [else] got through
+
+ [udderwise]
+ #message" Dis is da FLASE o' da FLASE. Yer [then] should be absawbed bot' ways."
+ [donewidit]
+ [message] Y'should be back to the FLASE side. Okay, [then]
+[donewidit]
+
+
Added: fcode-utils/testsuite/TokCondl/CondOpInIgndMssg.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/CondOpInIgndMssg.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/CondOpInIgndMssg.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,41 @@
+\ Here we will demonstrate the fate of Conditional-Operators
+\ that occur in the text-body of user-messages that occur
+\ in conditional-compilation sections that are being ignored.
+\ We will also test whether aliases to comment-delimiters are recognized:
+\ in Normal mode
+\ in Tokenizer-escape mode
+\ inside conditional-compilation sections
+
+\ Updated Wed, 22 Feb 2006 at 12:52 PST by David L. Paktor
+
+fcode-version2
+
+headers
+
+Global-definitions
+ alias // \
+device-definitions
+
+\ #message" This is cleanly commented-out and will be ignored"
+// #message" This, too, will be ignored"
+f[ \ #message" Comment safely ignored in Tok-esc mode"
+ // #message" Aliased comment in Tok-esc mode. Should be ignored."
+ ]f
+[ifnexist] dup
+ \ This section should be ignored consistently
+ \ #message" This conditional commented-out message will be ignored"
+ [message] The next message has a brack-then
+ [message] [then] #message" Should be ignored but isn't"
+ #message" Re-balance the conditional..." [ifnexist] dup
+ // Unprocessed Aliased comment. [then] #message" Faked-out" [ifnexist] dup
+
+[else]
+ #message" This will not be ignored."
+ // #message" Aliased comment in unignored section"
+
+[then]
+
+garblegarblegarble // Force an error.
+
+fcode-end
+
Added: fcode-utils/testsuite/TokCondl/DefCondTst.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/DefCondTst.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/DefCondTst.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,24 @@
+\ Test Command-line-defined conditional
+\ Updated Wed, 11 May 2005 at 09:45 by David L. Paktor
+\
+\ Symbol moogoo is either defined true (-1) or false (0), or is absent
+
+[ifndef] moogoo
+ f[
+ .( Y'gotta define MooGoo on the command-line.)
+ ." "!"
+ ." X
+a line." ." Another on the line."
+ ." "t(Lower-case will be okay, too)"
+ f]
+ #message Use -D moogoo=true or -D moogoo=false
+ [message] or even -D moogoo=-1 or -D moogoo=0
+ [#message]
+[else]
+ f[
+ [defined] moogoo
+ f]
+
+fload TokConstCondTst01.fth
+[then]
+
Added: fcode-utils/testsuite/TokCondl/DefCondTst2.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/DefCondTst2.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/DefCondTst2.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,109 @@
+\ Modified Command-line-defined conditional test.
+\ Using it to create anomalies for the detokenizer...
+\ Updated Wed, 29 Jun 2005 at 13:43 by David L. Paktor
+\
+\ Symbol moogoo is either defined true (-1) or false (0), or is absent
+
+[ifndef] moogoo
+ f[
+ .( Y'gotta define MooGoo on the command-line.)
+ ." "!"
+ ." X
+a line." ." Another on the line."
+ ." "t(Lower-case will be okay, too)"
+ f]
+ #message Use -D moogoo=true or -D moogoo=false
+ [message] or even -D moogoo=-1 or -D moogoo=0
+ [#message]
+[else]
+
+
+tokenizer[
+
+h# feeb \ Bogus Rev-Level
+ SET-REV-LEVEL
+
+not-last-image
+
+h# 1fad \ Vendor
+h# c0ed \ Bogus Device ID
+h# 90210 \ Bogus Class Code
+ pci-header
+
+ ]tokenizer
+
+fcode-version2
+
+ f[
+ [defined] moogoo
+ f]
+fload TokConstCondTst02.fth
+
+fcode-end
+
+tokenizer[
+ reset-symbols
+ ]tokenizer
+
+fcode-version2
+
+ f[
+ [defined] moogoo 0=
+ f]
+fload TokConstCondTst02.fth
+
+." De-tokenize THIS, wise-guy!"n"
+
+tokenizer[
+ 0 emit-byte \ Fake a premature end0
+ 6 emit-byte \ Just to be confusing!
+ h# 77 emit-byte
+ ]tokenizer
+
+fcode-end
+
+pci-header-end
+
+tokenizer[
+
+h# 2a55 \ Bogus Rev-Level
+ SET-REV-LEVEL
+
+ last-image
+
+h# 5afe \ Vendor
+h# 1991 \ Bogus Device ID
+h# 10203 \ Bogus Class Code
+ pci-header
+
+ ]tokenizer
+
+fcode-version2
+
+tokenizer[ reset-symbols true ]tokenizer
+
+fload TokConstCondTst02.fth
+
+tokenizer[
+ \ Fake Fcode-Block header in the middle of things...
+ h# f1 emit-byte \ Fake start-byte
+ 8 emit-byte \ Fake format
+ h# 21 emit-byte \ Fake checksum
+ h# 95 emit-byte
+ 0 emit-byte \ Fake length
+ 0 emit-byte
+ 0 emit-byte
+ h# 12 emit-byte
+
+ reset-symbols
+ false
+ ]tokenizer
+ reset-symbols
+fload TokConstCondTst02.fth
+
+fcode-end
+
+pci-header-end
+
+[then]
+
Added: fcode-utils/testsuite/TokCondl/DupLoadBody.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/DupLoadBody.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/DupLoadBody.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,13 @@
+\ Source file that controls duplicate loading of itself
+\ Updated Thu, 27 Jul 2006 at 15:24 PDT by David L. Paktor
+
+
+f[ [ifnexist] DupLoadBody.fth
+ true constant DupLoadBody.fth f]
+
+." Just this one time, eh!" cr
+
+f[ .( Go ask your mother) ]f
+
+
+f[ [endif] f]
Added: fcode-utils/testsuite/TokCondl/DupLoadTst.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/DupLoadTst.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/DupLoadTst.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,17 @@
+\ Test for being able to control duplicate loading of a source file
+\ Updated Thu, 27 Jul 2006 at 15:23 PDT by David L. Paktor
+
+
+fcode-version2
+
+." Going once," cr
+
+fload DupLoadBody.fth
+
+." Going twice." cr
+
+fload DupLoadBody.fth
+
+." Gone!" cr
+
+fcode-end
Added: fcode-utils/testsuite/TokCondl/MulFCimgFT.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/MulFCimgFT.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/MulFCimgFT.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,28 @@
+\ Multiple FCode images under one PCI header
+\ False, then True
+
+\ Updated Wed, 01 Jun 2005 at 14:51 by David L. Paktor
+
+tokenizer[
+
+h# fa57 \ Bogus Rev-Level
+ SET-REV-LEVEL
+
+h# cede \ Vendor
+h# 193a \ Bogus Device ID
+h# 95014 \ Bogus Class Code
+
+ ]tokenizer
+ pci-header
+
+
+fload TokConstCondTstF.fth
+
+tokenizer[
+ reset-symbols
+ ]tokenizer
+
+fload TokConstCondTstT.fth
+
+
+pci-header-end
Added: fcode-utils/testsuite/TokCondl/MulFCimgTF.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/MulFCimgTF.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/MulFCimgTF.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,25 @@
+\ Multiple FCode images under one PCI header
+\ True, then False
+
+\ Updated Wed, 01 Jun 2005 at 14:51 by David L. Paktor
+
+tokenizer[
+
+h# fa57 \ Bogus Rev-Level
+ SET-REV-LEVEL
+
+h# cede \ Vendor
+h# 193a \ Bogus Device ID
+h# 95014 \ Bogus Class Code
+
+ ]tokenizer
+ pci-header
+
+
+fload TokConstCondTstT.fth
+
+
+fload TokConstCondTstF.fth
+
+
+pci-header-end
Added: fcode-utils/testsuite/TokCondl/MulFCimg_01.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/MulFCimg_01.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/MulFCimg_01.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,53 @@
+\ Another test of conditionals and multiple FCode blocks.
+\ This is the "Wrapper" file.
+
+\ Updated Wed, 10 Aug 2005 at 10:57 by David L. Paktor
+
+
+[ifndef] moogoo
+ f[
+ .( Y'gotta define MooGoo on the command-line.)
+ #message Use -D moogoo=true or -D moogoo=false
+ f]
+[else]
+
+ tokenizer[
+
+ h# 5afe \ Bogus Rev-Level
+ SET-REV-LEVEL
+
+ h# beef \ Vendor
+ h# c0de \ Bogus Device ID
+ h# 90210 \ Beverly Hills ZIP Code. Now that's a _Class_ Code!
+
+ pci-header
+ ]tokenizer
+
+ f[
+ [defined] moogoo
+ constant boobalah?
+ f]
+
+ fcode-version2
+
+ fload MulFCimg_01_Body.fth
+
+ fcode-end
+
+
+ f[
+ reset-symbols
+ [defined] moogoo
+ 0=
+ constant boobalah?
+ f]
+
+ fcode-version2
+
+ fload MulFCimg_01_Body.fth
+
+ fcode-end
+
+ pci-header-end
+
+[then]
Added: fcode-utils/testsuite/TokCondl/MulFCimg_01_Body.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/MulFCimg_01_Body.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/MulFCimg_01_Body.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,23 @@
+\ Another test of conditionals and multiple FCode blocks.
+\ This is the "Body" file.
+
+\ Updated Wed, 10 Aug 2005 at 11:12 by David L. Paktor
+
+
+headers
+
+: whatziz
+ ." This is the "
+ f[ boobalah? [if] f] ." True " f[ [else] f] ." False" f[ [then] f]
+ ." side of the test." cr
+;
+
+: wherezis
+ fload BooBalah.fth
+;
+
+
+: whoozis whatziz wherezis ;
+
+: whyzis whoozis wherezis whatziz ;
+
Added: fcode-utils/testsuite/TokCondl/MulPCI_FC.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/MulPCI_FC.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/MulPCI_FC.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,36 @@
+\ Another multiple PCI and FCode test
+
+\ Updated Fri, 10 Jun 2005 at 09:06 by David L. Paktor
+
+
+[ifndef] first-path \ Check to see if the symbol was defined?
+ F[
+ ." "n"n"tAdd a command-line switch:"n"t"t-d ""first-path=<true|false>""
+ "tthen run this again."n"n"
+ F]
+[else]
+ F[
+ b00b c0ed 90210 pci-header
+ [defined] first-path
+ F]
+[message] Loading first pass
+ not-last-image
+
+ fload TokConstCondTst01.fth
+
+ pci-header-end
+
+
+F[ reset-symbols
+ b00b fece 07112 pci-header
+ [defined] first-path 0=
+ F]
+[message] Loading second pass
+ last-image
+
+ fload TokConstCondTst01.fth
+
+ pci-header-end
+
+[then]
+
Added: fcode-utils/testsuite/TokCondl/MulPCIhdr.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/MulPCIhdr.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/MulPCIhdr.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,44 @@
+\ Create an image with multiple PCI headers
+\ and then let's see what still we need to do
+\
+\ Updated Mon, 23 May 2005 at 16:17 by David L. Paktor
+
+
+tokenizer[
+
+h# f2a7 \ Bogus Rev-Level
+ SET-REV-LEVEL
+
+not-last-image
+
+h# 1fed \ Vendor
+h# 9009 \ Bogus Device ID
+h# 20109 \ Bogus Class Code
+ pci-header
+
+ ]tokenizer
+
+fload TokConstCondTstT.fth
+
+pci-header-end
+
+
+
+tokenizer[
+
+h# ea57 \ Bogus Rev-Level
+ SET-REV-LEVEL
+
+ last-image
+
+h# deaf \ Vendor
+h# 9021 \ Bogus Device ID
+h# 10902 \ Bogus Class Code
+ pci-header
+
+ ]tokenizer
+
+fload TokConstCondTstF.fth
+
+pci-header-end
+
Added: fcode-utils/testsuite/TokCondl/TestArgs
===================================================================
--- fcode-utils/testsuite/TokCondl/TestArgs (rev 0)
+++ fcode-utils/testsuite/TokCondl/TestArgs 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,55 @@
+# Automated Test Arguments file for TokCondl category
+# (That's short for "Tokenizer Conditional";
+# it refers to the Conditional Tokenization directives.)
+
+# Valid lines have four comma-separated fields:
+# Test-file base-name
+# Result-file label
+# Extra command-line switches
+# A script-command with arguments (but no commas).
+# Lines that have no label, no switches, and no script
+# do not need any commas.
+
+# Updated Thu, 27 Jul 2006 at 15:20 PDT by David L. Paktor
+
+TokExstCondTstY , , -l
+TokExstCondTstN , , -l
+TokExstCondNadaTst , , -i -f Trace-Conditionals
+CondOpInIgndMssg
+TokCondMinTst
+TokCondErrs , , -i -f Trace-Conditionals
+TokConstCondTstT , , -l
+TokConstCondTstF , , -l
+DefCondTst , , -l
+MulPCIhdr , , -l
+MulPCIhdr , BERev , -f Big-End-PCI-Rev-Level
+MulFCimgTF , , -l
+MulFCimgFT , , -l
+MulPCI_FC , , -l
+MulPCI_FC , fpT , -l -d first-path=true
+MulPCI_FC , fpF , -l -d first-path=false -f Trace-Conditionals
+
+TokDefCondTst , NotDef
+TokDefCondTst , Def , -d NEStTest
+
+DefCondTst , NotDef , -l
+DefCondTst , DefTrue , -d 'moOGOO=TRue' -l
+DefCondTst , DefFalse , -d 'MOOGoo=faLSE' -l -f Trace-Conditionals
+
+DefCondTst2 , NotDef , -l
+DefCondTst2 , MeT , -d 'MOOgoo=true' -l
+DefCondTst2 , MeF , -d 'moogOO=FalsE' -l -f Trace-Conditionals
+
+CondAlias , NotDef , -i
+CondAlias , MeT , -d 'MOOgoo=true' -i
+CondAlias , MeF , -d 'moogOO=FalsE' -i -f Trace-Conditionals
+
+CondMacAlias , , -I . -I .. -I ../TokoLoco
+CondMacAlias , NoSpc , -f Trace-Conditionals -I. -I.. -I ../TokoLoco
+
+MulFCimg_01 , NotDef , -l
+MulFCimg_01 , MeT , -d 'moogoo=TRUe' -l
+MulFCimg_01 , MeF , -d 'moogoo=false' -l
+
+DupLoadTst , , -f Trace-Conditionals
+
Added: fcode-utils/testsuite/TokCondl/TokCondErrs.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/TokCondErrs.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/TokCondErrs.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,91 @@
+\ Nested Conditionals Erorrs test
+
+\ Updated Fri, 07 Apr 2006 at 15:04 PDT by David L. Paktor
+
+fcode-version2
+
+headers
+
+create NestTest
+
+#else
+
+[endif]
+
+." Begin Nested Erorrs Test"
+[#ifexist]
+NestTest
+ ." Exists, level 1"
+ [ifexist] NestTest
+ ." Exists and exists, level 2"
+ [else]
+ ." Exists but doesn't exist. What? Level 2"
+ [then]
+ ." Resumes existence, level 1"
+ [ifnexist] NestTest
+ ." Exists but not exists. What? Level 2"
+ [else]
+ ." Exists and doesn't not exist, level 2"
+ [then]
+ ." Still exists, level 1"
+[else]
+ ." Doesn't exist, level 1"
+[else]
+ ." Dubble elst, Wazzat?"
+ [ifexist] NestTest
+ ." Doesn't exist but exists. What? Level 2"
+ [else]
+ ." Doesn't exist and doesn't exist, level 2"
+\ [then]
+ " Resumes non-existence, level 1"
+ [ifnexist] NestTest
+ ." Doesn't exist and not exists, level 2"
+ [else]
+ ." Doesn't exist but doesn't not exist. What? Level 2"
+ [then]
+ ." Still doesn't exist, level 1"
+[then]
+
+." Middle of Nest Test Test"
+[ifnexist] NestTest
+ ." Not exists, pass 2, level 1"
+ [ifexist] NestTest
+ ." Not exists but exists. What? Pass 2, Level 2"
+ [else]
+ ." Not exists and doesn't exist, pass 2, level 2"
+ [else]
+ ." Extra Else where it should be ignored, pass 2, level 2"
+ [then]
+ " Resumes non-existence, pass 2, level 1"
+ [ifnexist] NestTest
+ ." Not exists and not exists, pass 2, level 2"
+ [else]
+ ." Not exists but doesn't not exist. What? Pass 2, Level 2"
+ [else]
+ ." Extra Else where it should never be seen, pass 2, level 2"
+ [then]
+ ." Still not exists, pass 2, level 1"
+[else]
+ ." Doesn't not exist, pass 2, level 1"
+ [ifexist] NestTest
+ ." Doesn't not exist and exists, pass 2, level 2"
+ [else]
+ ." Doesn't not exist but doesn't exist. What? Pass 2, Level 2"
+ [then]
+ " Resumes not non-existing, pass 2, level 1"
+ [ifnexist] NestTest
+ ." Doesn't not exist but not exists. What? Pass 2, Level 2"
+ [else]
+ ." Doesn't not exist and doesn't not exist, pass 2, level 1"
+ [else]
+ ." And has an extra Else where it will be seen, pass 2, level 1"
+ [then]
+ ." Still doesn't not exist, pass 2, level 1"
+[then]
+
+." End Nest Test Test"
+
+
+fcode-end
+
+
Added: fcode-utils/testsuite/TokCondl/TokCondMinTst.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/TokCondMinTst.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/TokCondMinTst.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,16 @@
+\ Minimal Nested Conditionals test
+
+\ Updated Tue, 12 Apr 2005 at 15:55 by David L. Paktor
+
+
+fcode-version2
+
+headers
+
+create NestTest
+
+." Here is one."
+[ifnexist] NestTest
+ ." Here is another."
+[then]
+fcode-end
Added: fcode-utils/testsuite/TokCondl/TokConstCondTst01.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/TokConstCondTst01.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/TokConstCondTst01.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,23 @@
+\ Common code (insert obligatory sneeze here)
+\ for Nested "Constant" Conditionals test
+
+\ Updated Sun, 09 Apr 2006 at 00:22 PDT by David L. Paktor
+
+\ File that FLOADs this has already put TRUE or FALSE on the stack.
+
+f[ constant boobalah? f]
+
+fcode-version2
+
+: whatziz
+ ." This is the "
+ f[ boobalah? [if] f] ." True " f[ [else] f] ." False"
+ f[ [then] f] ." side of the test." cr
+;
+headers
+
+fload BooBalah.fth
+
+: whoozis whatziz ;
+
+fcode-end
Added: fcode-utils/testsuite/TokCondl/TokConstCondTst02.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/TokConstCondTst02.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/TokConstCondTst02.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,52 @@
+\ Common code (insert obligatory sneeze here)
+\ for second Nested "Constant" Conditionals test
+
+\ Updated Wed, 29 Jun 2005 at 13:41 by David L. Paktor
+
+\ File that FLOADs this has already put TRUE or FALSE on the stack.
+
+f[ constant boobalah? f]
+
+: whatziz
+ ." This is the "
+ f[ boobalah? [if] f] ." True " f[ [else] f] ." False" f[ [then] f]
+ ." side of the test." cr
+;
+headers
+
+: tell-me
+ ." Begin Nested ""Constant"" Test Test"
+ f[ boobalah? f] [if]
+ [message] The TRUE path has wisely been chosen, Boobalah!
+ ." Is True, level 1"
+ f[ boobalah? f] [if]
+ " Is True and is True, level 2"
+ [else]
+ " Is True but is Not True. What?"
+ [then]
+ ." Middle of level 2"
+ f[ boobalah? 0= f] [if]
+ " Is True and is False. What?"
+ [else]
+ " Is True and is Not False, level 2"
+ [then]
+ [else]
+ [message] Oy, Boobalah. You have foolishly chosen the FALSE path.
+ ." Is Not True, level 1"
+ f[ boobalah? f] [if]
+ " Is Not True but is True. What?"
+ [else]
+ " Is Not True and is Not True, level 2"
+ [then]
+ ." Middle of Not level 2"
+ f[ boobalah? 0= f] [if]
+ " Is Not True and is False, level 2"
+ [else]
+ " Is Not True and is Not False. What?"
+ [then]
+ [then]
+;
+
+: whoozis whatziz ;
+
+
Added: fcode-utils/testsuite/TokCondl/TokConstCondTstF.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/TokConstCondTstF.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/TokConstCondTstF.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,8 @@
+\ "False" side of Nested "Constant" Conditionals test
+
+\ Updated Wed, 20 Apr 2005 at 11:14 by David L. Paktor
+\
+
+f[ false f]
+
+fload TokConstCondTst01.fth
Added: fcode-utils/testsuite/TokCondl/TokConstCondTstT.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/TokConstCondTstT.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/TokConstCondTstT.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,8 @@
+\ "True" side of Nested "Constant" Conditionals test
+
+\ Updated Wed, 20 Apr 2005 at 11:14 by David L. Paktor
+\
+
+f[ true f]
+
+fload TokConstCondTst01.fth
Added: fcode-utils/testsuite/TokCondl/TokDefCondTst.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/TokDefCondTst.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/TokDefCondTst.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,73 @@
+\ Stand-alone version of Nested "Defined" Conditionals test
+\ looking for command-line or [define] def'n of NestTest
+
+\ Updated Wed, 27 Apr 2005 at 17:59 by David L. Paktor
+
+fcode-version2
+
+." Begin Nest Test Test"
+[ifdef] NestTest
+ ." Is defined, level 1"
+ [ifdef] NestTest
+ ." Is defined and is defined, level 2"
+ [else]
+ ." Is defined but isn't defined. What? Level 2"
+ [then]
+ ." Resumes defined-ness, level 1"
+ [ifndef] NestTest
+ ." Is defined but is not defined. What? Level 2"
+ [else]
+ ." Is defined and isn't not defined, level 2"
+ [then]
+ ." Still is defined, level 1"
+[else]
+ ." Isn't defined, level 1"
+ [ifdef] NestTest
+ ." Isn't defined but is defined. What? Level 2"
+ [else]
+ ." Isn't defined and isn't defined, level 2"
+ [then]
+ " Resumes non-defined-ness, level 1"
+ [ifndef] NestTest
+ ." Isn't defined and is not defined, level 2"
+ [else]
+ ." Isn't defined but isn't not defined. What? Level 2"
+ [then]
+ ." Still isn't defined, level 1"
+[then]
+
+." Middle of Nest Test Test"
+[ifndef] NestTest
+ ." Is not defined, pass 2, level 1"
+ [ifdef] NestTest
+ ." Is not defined but is defined. What? Pass 2, Level 2"
+ [else]
+ ." Is not defined and isn't defined, pass 2, level 2"
+ [then]
+ " Resumes non-defined-ness, pass 2, level 1"
+ [ifndef] NestTest
+ ." Is not defined and is not defined, pass 2, level 2"
+ [else]
+ ." Is not defined but isn't not defined. What? Pass 2, Level 2"
+ [then]
+ ." Still is not defined, pass 2, level 1"
+[else]
+ ." Isn't not defined, pass 2, level 1"
+ [ifdef] NestTest
+ ." Isn't not defined and is defined, pass 2, level 2"
+ [else]
+ ." Isn't not defined but isn't defined. What? Pass 2, Level 2"
+ [then]
+ " Resumes not non-existing, pass 2, level 1"
+ [ifndef] NestTest
+ ." Isn't not defined but is not defined. What? Pass 2, Level 2"
+ [else]
+ ." Isn't not defined and isn't not defined, pass 2, level 1"
+ [then]
+ ." Still isn't not defined, pass 2, level 1"
+[then]
+
+." End Nest Test Test"
+
+
+fcode-end
Added: fcode-utils/testsuite/TokCondl/TokExstCondNadaTst.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/TokExstCondNadaTst.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/TokExstCondNadaTst.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,60 @@
+\ What happens to "Exists" Conditionals test when the
+\ target isn't on the same line?
+\ "Exists" side of test
+
+\ Updated Tue, 21 Feb 2006 at 15:33 PST by David L. Paktor
+
+
+fcode-version2
+
+headers
+
+create HotNasty
+
+fload TokExstCondNada_01.fth
+
+Global-definitions
+ alias [yestest] [ifexist]
+device-definitions
+
+fload TokExstCondNada_01.fth
+
+Global-definitions
+ alias [notest] [ifnexist]
+device-definitions
+
+fload TokExstCondNada_01.fth
+
+\ Here we will test:
+\ Whether aliases to comment-delimiters are recognized:
+\ in Normal mode
+\ in Tokenizer-escape mode
+\ inside conditional-compilation sections
+\ We will also re-demonstrate the fate of Conditional-Operators
+\ that occur inside conditional-compilation sections that are
+\ being ignored.
+
+Global-definitions
+ alias // \
+device-definitions
+
+\ #message" This is cleanly commented-out and will be ignored"
+// #message" This, too, will be ignored"
+f[ \ #message" Comment safely ignored in Tok-esc mode"
+ // #message" Aliased comment in Tok-esc mode. Should be ignored."
+ ]f
+[ifnexist] dup
+ \ This section should be ignored consistently
+ \ #message" This conditional commented-out message will be ignored"
+ [message] The next message has a brack-then
+ [message] [then] #message" Should be ignored but isn't"
+ #message" Re-balance the conditional..." [ifnexist] dup
+ // Unprocessed Aliased comment. [then] #message" Faked-out" [ifnexist] dup
+
+[else]
+ #message" This will not be ignored."
+ // #message" Aliased comment in unignored section"
+
+[then]
+
+fcode-end
Added: fcode-utils/testsuite/TokCondl/TokExstCondNada_01.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/TokExstCondNada_01.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/TokExstCondNada_01.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,31 @@
+\ What happens to "Exists" Conditionals test when the
+\ target isn't on the same line?
+\ Or the "Defined" Conditionals, for that matter
+\ Preliminary test before FLoading Common code (insert obligatory sneeze here)
+
+\ Updated Tue, 21 Feb 2006 at 15:33 PST by David L. Paktor
+
+
+\ File that FLoads this must define a pair of macros or aliases
+\ called [yestest] and [notest] respectively, that are
+\ inverses of each other.
+
+f[ false ]f
+[ifnexist] [yestest]
+ [if] [endif] \ Until we have a better way to drop in tok-esc mode
+ f[ true ]f
+[endif]
+
+[ifnexist] [notest]
+ [if] [endif] \ Until we have a better way to drop in tok-esc mode
+ f[ true ]f
+[endif]
+[#message] got this far
+[if]
+ [#message] \ Must define macros or aliases called [yestest] and [notest] respectively
+[else]
+[#message] are we here
+ fload TokExstCondNada_02.fth
+[#message] we are here
+[endif]
+
Added: fcode-utils/testsuite/TokCondl/TokExstCondNada_02.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/TokExstCondNada_02.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/TokExstCondNada_02.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,71 @@
+\ What happens to "Exists" Conditionals test when the
+\ target isn't on the same line?
+\ Or the "Defined" Conditionals, for that matter
+\ Common code (insert obligatory sneeze here)
+\ FLoaded only after necessary preliminary test.
+
+\ Updated Tue, 21 Feb 2006 at 15:58 PST by David L. Paktor
+
+." Begin Nest Test Test"
+[yestest]
+ ." Exists, level 1"
+ [yestest]
+ ." Exists and exists, level 2"
+ [else]
+ ." Exists but doesn't exist. What? Level 2"
+ [then]
+ ." Resumes existence, level 1"
+ [notest]
+ ." Exists but not exists. What? Level 2"
+ [else]
+ ." Exists and doesn't not exist, level 2"
+ [then]
+ ." Still exists, level 1"
+[else]
+ ." Doesn't exist, level 1"
+ [yestest]
+ ." Doesn't exist but exists. What? Level 2"
+ [else]
+ ." Doesn't exist and doesn't exist, level 2"
+ [then]
+ " Resumes non-existence, level 1"
+ [notest]
+ ." Doesn't exist and not exists, level 2"
+ [else]
+ ." Doesn't exist but doesn't not exist. What? Level 2"
+ [then]
+ ." Still doesn't exist, level 1"
+[then]
+
+." Middle of Nest Test Test"
+[notest]
+ ." Not exists, pass 2, level 1"
+ [yestest]
+ ." Not exists but exists. What? Pass 2, Level 2"
+ [else]
+ ." Not exists and doesn't exist, pass 2, level 2"
+ [then]
+ " Resumes non-existence, pass 2, level 1"
+ [notest]
+ ." Not exists and not exists, pass 2, level 2"
+ [else]
+ ." Not exists but doesn't not exist. What? Pass 2, Level 2"
+ [then]
+ ." Still not exists, pass 2, level 1"
+[else]
+ ." Doesn't not exist, pass 2, level 1"
+ [yestest]
+ ." Doesn't not exist and exists, pass 2, level 2"
+ [else]
+ ." Doesn't not exist but doesn't exist. What? Pass 2, Level 2"
+ [then]
+ " Resumes not non-existing, pass 2, level 1"
+ [notest]
+ ." Doesn't not exist but not exists. What? Pass 2, Level 2"
+ [else]
+ ." Doesn't not exist and doesn't not exist, pass 2, level 1"
+ [then]
+ ." Still doesn't not exist, pass 2, level 1"
+[then]
+
+." End Nest Test Test"
Added: fcode-utils/testsuite/TokCondl/TokExstCondTst01.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/TokExstCondTst01.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/TokExstCondTst01.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,70 @@
+\ Common code (insert obligatory sneeze here)
+\ for Nested "Exists" Conditionals test
+
+\ Updated Tue, 12 Apr 2005 at 14:45 by David L. Paktor
+
+
+." Begin Nest Test Test"
+[ifexist] NestTest
+ ." Exists, level 1"
+ [ifexist] NestTest
+ ." Exists and exists, level 2"
+ [else]
+ ." Exists but doesn't exist. What? Level 2"
+ [then]
+ ." Resumes existence, level 1"
+ [ifnexist] NestTest
+ ." Exists but not exists. What? Level 2"
+ [else]
+ ." Exists and doesn't not exist, level 2"
+ [then]
+ ." Still exists, level 1"
+[else]
+ ." Doesn't exist, level 1"
+ [ifexist] NestTest
+ ." Doesn't exist but exists. What? Level 2"
+ [else]
+ ." Doesn't exist and doesn't exist, level 2"
+ [then]
+ " Resumes non-existence, level 1"
+ [ifnexist] NestTest
+ ." Doesn't exist and not exists, level 2"
+ [else]
+ ." Doesn't exist but doesn't not exist. What? Level 2"
+ [then]
+ ." Still doesn't exist, level 1"
+[then]
+
+." Middle of Nest Test Test"
+[ifnexist] NestTest
+ ." Not exists, pass 2, level 1"
+ [ifexist] NestTest
+ ." Not exists but exists. What? Pass 2, Level 2"
+ [else]
+ ." Not exists and doesn't exist, pass 2, level 2"
+ [then]
+ " Resumes non-existence, pass 2, level 1"
+ [ifnexist] NestTest
+ ." Not exists and not exists, pass 2, level 2"
+ [else]
+ ." Not exists but doesn't not exist. What? Pass 2, Level 2"
+ [then]
+ ." Still not exists, pass 2, level 1"
+[else]
+ ." Doesn't not exist, pass 2, level 1"
+ [ifexist] NestTest
+ ." Doesn't not exist and exists, pass 2, level 2"
+ [else]
+ ." Doesn't not exist but doesn't exist. What? Pass 2, Level 2"
+ [then]
+ " Resumes not non-existing, pass 2, level 1"
+ [ifnexist] NestTest
+ ." Doesn't not exist but not exists. What? Pass 2, Level 2"
+ [else]
+ ." Doesn't not exist and doesn't not exist, pass 2, level 1"
+ [then]
+ ." Still doesn't not exist, pass 2, level 1"
+[then]
+
+." End Nest Test Test"
+
Added: fcode-utils/testsuite/TokCondl/TokExstCondTstN.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/TokExstCondTstN.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/TokExstCondTstN.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,14 @@
+\ "Doesn't Exist" side of Nested "Exists" Conditionals test
+
+\ Updated Tue, 12 Apr 2005 at 14:45 by David L. Paktor
+
+
+fcode-version2
+
+headers
+
+create NotTasty
+
+fload TokExstCondTst01.fth
+
+fcode-end
Added: fcode-utils/testsuite/TokCondl/TokExstCondTstY.fth
===================================================================
--- fcode-utils/testsuite/TokCondl/TokExstCondTstY.fth (rev 0)
+++ fcode-utils/testsuite/TokCondl/TokExstCondTstY.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,14 @@
+\ "Exists" side of Nested "Exists" Conditionals test
+
+\ Updated Tue, 12 Apr 2005 at 14:45 by David L. Paktor
+
+
+fcode-version2
+
+headers
+
+create NestTest
+
+fload TokExstCondTst01.fth
+
+fcode-end
Added: fcode-utils/testsuite/TokMisc/AbrtQuot.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/AbrtQuot.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/AbrtQuot.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,24 @@
+\ Test of Abort" with various switches, JTMS.
+\ Throw in a few other misc goodies while we're at it...
+
+
+fcode-version2
+
+headers
+
+h# defeca8e constant poopoo
+h# beeffece constant moopoo
+alias couterde moopoo
+
+: gotta_try_it
+ gumfritsch \ Let's see how an unknown word is treated, before.
+ { \ What does this do?
+ } \ Or let's see what this does...
+ couterde poopoo = abort" Should be different. "
+ ." poopoo is " f['] poopoo .h cr
+ ." couterde is " f['] couterde .h cr
+ ." And its XT is: " ['] couterde
+ strumburkle \ Let's see how an unknown word is treated after.
+;
+
+fcode-end
Added: fcode-utils/testsuite/TokMisc/AllMacros.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/AllMacros.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/AllMacros.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,81 @@
+\ Quick test for all single-function macros that have just been moved...
+\ This code isn't executable in any sense; but a detokenization
+\ should show that each "original" function is displayed twice
+\ (With the exception of the last pair, which takes a little more...)
+
+fcode-version2
+
+" Start of simple pairs"
+ not
+ invert
+ <<
+ lshift
+ >>
+ rshift
+ na1+
+ cell+
+ /c*
+ chars
+ /n*
+ cells
+ flip
+ wbflip
+ version
+ fcode-revision
+ true
+ -1
+ false
+ 0
+ struct
+ 0
+ eval
+ evaluate
+ u*x
+ um*
+ xu/mod
+ um/mod
+ x+
+ d+
+ x-
+ d-
+ attribute
+ property
+ xdrint
+ encode-int
+ xdr+
+ encode+
+ xdrphys
+ encode-phys
+ xdrstring
+ encode-string
+ xdrbytes
+ encode-bytes
+ decode-2int
+ parse-2int
+ map-sbus
+ map-low
+ name
+ device-name
+ get-my-attribute
+ get-my-property
+ xdrtoint
+ decode-int
+ xdrtostring
+ decode-string
+ get-inherited-attribute
+ get-inherited-property
+ delete-attribute
+ delete-property
+ get-package-attribute
+ get-package-property
+ wflips
+ wbflips
+ lflips
+ lwflips
+" End of simple pairs."
+0 if " Last phrase-item"
+ endif
+0 if " Last phrase-item"
+ then
+
+fcode-end
Added: fcode-utils/testsuite/TokMisc/Almost_a_Buffer_of_Beer.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/Almost_a_Buffer_of_Beer.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/Almost_a_Buffer_of_Beer.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,2582 @@
+." Oh, six hundred and forty-five Bottles of Beer on the wall," cr
+." six hundred and forty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and forty-four Bottles of Beer on the wall." cr
+." Oh, six hundred and forty-four Bottles of Beer on the wall," cr
+." six hundred and forty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and forty-three Bottles of Beer on the wall." cr
+." Oh, six hundred and forty-three Bottles of Beer on the wall," cr
+." six hundred and forty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and forty-two Bottles of Beer on the wall." cr
+." Oh, six hundred and forty-two Bottles of Beer on the wall," cr
+." six hundred and forty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and forty-one Bottles of Beer on the wall." cr
+." Oh, six hundred and forty-one Bottles of Beer on the wall," cr
+." six hundred and forty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and forty Bottles of Beer on the wall." cr
+." Oh, six hundred and forty Bottles of Beer on the wall," cr
+." six hundred and forty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirty-nine Bottles of Beer on the wall." cr
+." Oh, six hundred and thirty-nine Bottles of Beer on the wall," cr
+." six hundred and thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirty-eight Bottles of Beer on the wall." cr
+." Oh, six hundred and thirty-eight Bottles of Beer on the wall," cr
+." six hundred and thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirty-seven Bottles of Beer on the wall." cr
+." Oh, six hundred and thirty-seven Bottles of Beer on the wall," cr
+." six hundred and thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirty-six Bottles of Beer on the wall." cr
+." Oh, six hundred and thirty-six Bottles of Beer on the wall," cr
+." six hundred and thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirty-five Bottles of Beer on the wall." cr
+." Oh, six hundred and thirty-five Bottles of Beer on the wall," cr
+." six hundred and thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirty-four Bottles of Beer on the wall." cr
+." Oh, six hundred and thirty-four Bottles of Beer on the wall," cr
+." six hundred and thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirty-three Bottles of Beer on the wall." cr
+." Oh, six hundred and thirty-three Bottles of Beer on the wall," cr
+." six hundred and thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirty-two Bottles of Beer on the wall." cr
+." Oh, six hundred and thirty-two Bottles of Beer on the wall," cr
+." six hundred and thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirty-one Bottles of Beer on the wall." cr
+." Oh, six hundred and thirty-one Bottles of Beer on the wall," cr
+." six hundred and thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirty Bottles of Beer on the wall." cr
+." Oh, six hundred and thirty Bottles of Beer on the wall," cr
+." six hundred and thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twenty-nine Bottles of Beer on the wall." cr
+." Oh, six hundred and twenty-nine Bottles of Beer on the wall," cr
+." six hundred and twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twenty-eight Bottles of Beer on the wall." cr
+." Oh, six hundred and twenty-eight Bottles of Beer on the wall," cr
+." six hundred and twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twenty-seven Bottles of Beer on the wall." cr
+." Oh, six hundred and twenty-seven Bottles of Beer on the wall," cr
+." six hundred and twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twenty-six Bottles of Beer on the wall." cr
+." Oh, six hundred and twenty-six Bottles of Beer on the wall," cr
+." six hundred and twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twenty-five Bottles of Beer on the wall." cr
+." Oh, six hundred and twenty-five Bottles of Beer on the wall," cr
+." six hundred and twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twenty-four Bottles of Beer on the wall." cr
+." Oh, six hundred and twenty-four Bottles of Beer on the wall," cr
+." six hundred and twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twenty-three Bottles of Beer on the wall." cr
+." Oh, six hundred and twenty-three Bottles of Beer on the wall," cr
+." six hundred and twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twenty-two Bottles of Beer on the wall." cr
+." Oh, six hundred and twenty-two Bottles of Beer on the wall," cr
+." six hundred and twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twenty-one Bottles of Beer on the wall." cr
+." Oh, six hundred and twenty-one Bottles of Beer on the wall," cr
+." six hundred and twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twenty Bottles of Beer on the wall." cr
+." Oh, six hundred and twenty Bottles of Beer on the wall," cr
+." six hundred and twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and nineteen Bottles of Beer on the wall." cr
+." Oh, six hundred and nineteen Bottles of Beer on the wall," cr
+." six hundred and nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and eighteen Bottles of Beer on the wall." cr
+." Oh, six hundred and eighteen Bottles of Beer on the wall," cr
+." six hundred and eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and seventeen Bottles of Beer on the wall." cr
+." Oh, six hundred and seventeen Bottles of Beer on the wall," cr
+." six hundred and seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and sixteen Bottles of Beer on the wall." cr
+." Oh, six hundred and sixteen Bottles of Beer on the wall," cr
+." six hundred and sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and fifteen Bottles of Beer on the wall." cr
+." Oh, six hundred and fifteen Bottles of Beer on the wall," cr
+." six hundred and fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and fourteen Bottles of Beer on the wall." cr
+." Oh, six hundred and fourteen Bottles of Beer on the wall," cr
+." six hundred and fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirteen Bottles of Beer on the wall." cr
+." Oh, six hundred and thirteen Bottles of Beer on the wall," cr
+." six hundred and thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twelve Bottles of Beer on the wall." cr
+." Oh, six hundred and twelve Bottles of Beer on the wall," cr
+." six hundred and twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and eleven Bottles of Beer on the wall." cr
+." Oh, six hundred and eleven Bottles of Beer on the wall," cr
+." six hundred and eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and ten Bottles of Beer on the wall." cr
+." Oh, six hundred and ten Bottles of Beer on the wall," cr
+." six hundred and ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and nine Bottles of Beer on the wall." cr
+." Oh, six hundred and nine Bottles of Beer on the wall," cr
+." six hundred and nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and eight Bottles of Beer on the wall." cr
+." Oh, six hundred and eight Bottles of Beer on the wall," cr
+." six hundred and eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and seven Bottles of Beer on the wall." cr
+." Oh, six hundred and seven Bottles of Beer on the wall," cr
+." six hundred and seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and six Bottles of Beer on the wall." cr
+." Oh, six hundred and six Bottles of Beer on the wall," cr
+." six hundred and six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and five Bottles of Beer on the wall." cr
+." Oh, six hundred and five Bottles of Beer on the wall," cr
+." six hundred and five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and four Bottles of Beer on the wall." cr
+." Oh, six hundred and four Bottles of Beer on the wall," cr
+." six hundred and four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and three Bottles of Beer on the wall." cr
+." Oh, six hundred and three Bottles of Beer on the wall," cr
+." six hundred and three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and two Bottles of Beer on the wall." cr
+." Oh, six hundred and two Bottles of Beer on the wall," cr
+." six hundred and two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and one Bottles of Beer on the wall." cr
+." Oh, six hundred and one Bottles of Beer on the wall," cr
+." six hundred and one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred Bottles of Beer on the wall." cr
+." Oh, six hundred Bottles of Beer on the wall," cr
+." six hundred Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ninety-nine Bottles of Beer on the wall." cr
+." Oh, five hundred and ninety-nine Bottles of Beer on the wall," cr
+." five hundred and ninety-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ninety-eight Bottles of Beer on the wall." cr
+." Oh, five hundred and ninety-eight Bottles of Beer on the wall," cr
+." five hundred and ninety-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ninety-seven Bottles of Beer on the wall." cr
+." Oh, five hundred and ninety-seven Bottles of Beer on the wall," cr
+." five hundred and ninety-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ninety-six Bottles of Beer on the wall." cr
+." Oh, five hundred and ninety-six Bottles of Beer on the wall," cr
+." five hundred and ninety-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ninety-five Bottles of Beer on the wall." cr
+." Oh, five hundred and ninety-five Bottles of Beer on the wall," cr
+." five hundred and ninety-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ninety-four Bottles of Beer on the wall." cr
+." Oh, five hundred and ninety-four Bottles of Beer on the wall," cr
+." five hundred and ninety-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ninety-three Bottles of Beer on the wall." cr
+." Oh, five hundred and ninety-three Bottles of Beer on the wall," cr
+." five hundred and ninety-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ninety-two Bottles of Beer on the wall." cr
+." Oh, five hundred and ninety-two Bottles of Beer on the wall," cr
+." five hundred and ninety-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ninety-one Bottles of Beer on the wall." cr
+." Oh, five hundred and ninety-one Bottles of Beer on the wall," cr
+." five hundred and ninety-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ninety Bottles of Beer on the wall." cr
+." Oh, five hundred and ninety Bottles of Beer on the wall," cr
+." five hundred and ninety Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighty-nine Bottles of Beer on the wall." cr
+." Oh, five hundred and eighty-nine Bottles of Beer on the wall," cr
+." five hundred and eighty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighty-eight Bottles of Beer on the wall." cr
+." Oh, five hundred and eighty-eight Bottles of Beer on the wall," cr
+." five hundred and eighty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighty-seven Bottles of Beer on the wall." cr
+." Oh, five hundred and eighty-seven Bottles of Beer on the wall," cr
+." five hundred and eighty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighty-six Bottles of Beer on the wall." cr
+." Oh, five hundred and eighty-six Bottles of Beer on the wall," cr
+." five hundred and eighty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighty-five Bottles of Beer on the wall." cr
+." Oh, five hundred and eighty-five Bottles of Beer on the wall," cr
+." five hundred and eighty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighty-four Bottles of Beer on the wall." cr
+." Oh, five hundred and eighty-four Bottles of Beer on the wall," cr
+." five hundred and eighty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighty-three Bottles of Beer on the wall." cr
+." Oh, five hundred and eighty-three Bottles of Beer on the wall," cr
+." five hundred and eighty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighty-two Bottles of Beer on the wall." cr
+." Oh, five hundred and eighty-two Bottles of Beer on the wall," cr
+." five hundred and eighty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighty-one Bottles of Beer on the wall." cr
+." Oh, five hundred and eighty-one Bottles of Beer on the wall," cr
+." five hundred and eighty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighty Bottles of Beer on the wall." cr
+." Oh, five hundred and eighty Bottles of Beer on the wall," cr
+." five hundred and eighty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventy-nine Bottles of Beer on the wall." cr
+." Oh, five hundred and seventy-nine Bottles of Beer on the wall," cr
+." five hundred and seventy-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventy-eight Bottles of Beer on the wall." cr
+." Oh, five hundred and seventy-eight Bottles of Beer on the wall," cr
+." five hundred and seventy-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventy-seven Bottles of Beer on the wall." cr
+." Oh, five hundred and seventy-seven Bottles of Beer on the wall," cr
+." five hundred and seventy-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventy-six Bottles of Beer on the wall." cr
+." Oh, five hundred and seventy-six Bottles of Beer on the wall," cr
+." five hundred and seventy-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventy-five Bottles of Beer on the wall." cr
+." Oh, five hundred and seventy-five Bottles of Beer on the wall," cr
+." five hundred and seventy-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventy-four Bottles of Beer on the wall." cr
+." Oh, five hundred and seventy-four Bottles of Beer on the wall," cr
+." five hundred and seventy-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventy-three Bottles of Beer on the wall." cr
+." Oh, five hundred and seventy-three Bottles of Beer on the wall," cr
+." five hundred and seventy-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventy-two Bottles of Beer on the wall." cr
+." Oh, five hundred and seventy-two Bottles of Beer on the wall," cr
+." five hundred and seventy-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventy-one Bottles of Beer on the wall." cr
+." Oh, five hundred and seventy-one Bottles of Beer on the wall," cr
+." five hundred and seventy-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventy Bottles of Beer on the wall." cr
+." Oh, five hundred and seventy Bottles of Beer on the wall," cr
+." five hundred and seventy Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixty-nine Bottles of Beer on the wall." cr
+." Oh, five hundred and sixty-nine Bottles of Beer on the wall," cr
+." five hundred and sixty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixty-eight Bottles of Beer on the wall." cr
+." Oh, five hundred and sixty-eight Bottles of Beer on the wall," cr
+." five hundred and sixty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixty-seven Bottles of Beer on the wall." cr
+." Oh, five hundred and sixty-seven Bottles of Beer on the wall," cr
+." five hundred and sixty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixty-six Bottles of Beer on the wall." cr
+." Oh, five hundred and sixty-six Bottles of Beer on the wall," cr
+." five hundred and sixty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixty-five Bottles of Beer on the wall." cr
+." Oh, five hundred and sixty-five Bottles of Beer on the wall," cr
+." five hundred and sixty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixty-four Bottles of Beer on the wall." cr
+." Oh, five hundred and sixty-four Bottles of Beer on the wall," cr
+." five hundred and sixty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixty-three Bottles of Beer on the wall." cr
+." Oh, five hundred and sixty-three Bottles of Beer on the wall," cr
+." five hundred and sixty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixty-two Bottles of Beer on the wall." cr
+." Oh, five hundred and sixty-two Bottles of Beer on the wall," cr
+." five hundred and sixty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixty-one Bottles of Beer on the wall." cr
+." Oh, five hundred and sixty-one Bottles of Beer on the wall," cr
+." five hundred and sixty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixty Bottles of Beer on the wall." cr
+." Oh, five hundred and sixty Bottles of Beer on the wall," cr
+." five hundred and sixty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifty-nine Bottles of Beer on the wall." cr
+." Oh, five hundred and fifty-nine Bottles of Beer on the wall," cr
+." five hundred and fifty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifty-eight Bottles of Beer on the wall." cr
+." Oh, five hundred and fifty-eight Bottles of Beer on the wall," cr
+." five hundred and fifty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifty-seven Bottles of Beer on the wall." cr
+." Oh, five hundred and fifty-seven Bottles of Beer on the wall," cr
+." five hundred and fifty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifty-six Bottles of Beer on the wall." cr
+." Oh, five hundred and fifty-six Bottles of Beer on the wall," cr
+." five hundred and fifty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifty-five Bottles of Beer on the wall." cr
+." Oh, five hundred and fifty-five Bottles of Beer on the wall," cr
+." five hundred and fifty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifty-four Bottles of Beer on the wall." cr
+." Oh, five hundred and fifty-four Bottles of Beer on the wall," cr
+." five hundred and fifty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifty-three Bottles of Beer on the wall." cr
+." Oh, five hundred and fifty-three Bottles of Beer on the wall," cr
+." five hundred and fifty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifty-two Bottles of Beer on the wall." cr
+." Oh, five hundred and fifty-two Bottles of Beer on the wall," cr
+." five hundred and fifty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifty-one Bottles of Beer on the wall." cr
+." Oh, five hundred and fifty-one Bottles of Beer on the wall," cr
+." five hundred and fifty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifty Bottles of Beer on the wall." cr
+." Oh, five hundred and fifty Bottles of Beer on the wall," cr
+." five hundred and fifty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and forty-nine Bottles of Beer on the wall." cr
+." Oh, five hundred and forty-nine Bottles of Beer on the wall," cr
+." five hundred and forty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and forty-eight Bottles of Beer on the wall." cr
+." Oh, five hundred and forty-eight Bottles of Beer on the wall," cr
+." five hundred and forty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and forty-seven Bottles of Beer on the wall." cr
+." Oh, five hundred and forty-seven Bottles of Beer on the wall," cr
+." five hundred and forty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and forty-six Bottles of Beer on the wall." cr
+." Oh, five hundred and forty-six Bottles of Beer on the wall," cr
+." five hundred and forty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and forty-five Bottles of Beer on the wall." cr
+." Oh, five hundred and forty-five Bottles of Beer on the wall," cr
+." five hundred and forty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and forty-four Bottles of Beer on the wall." cr
+." Oh, five hundred and forty-four Bottles of Beer on the wall," cr
+." five hundred and forty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and forty-three Bottles of Beer on the wall." cr
+." Oh, five hundred and forty-three Bottles of Beer on the wall," cr
+." five hundred and forty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and forty-two Bottles of Beer on the wall." cr
+." Oh, five hundred and forty-two Bottles of Beer on the wall," cr
+." five hundred and forty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and forty-one Bottles of Beer on the wall." cr
+." Oh, five hundred and forty-one Bottles of Beer on the wall," cr
+." five hundred and forty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and forty Bottles of Beer on the wall." cr
+." Oh, five hundred and forty Bottles of Beer on the wall," cr
+." five hundred and forty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirty-nine Bottles of Beer on the wall." cr
+." Oh, five hundred and thirty-nine Bottles of Beer on the wall," cr
+." five hundred and thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirty-eight Bottles of Beer on the wall." cr
+." Oh, five hundred and thirty-eight Bottles of Beer on the wall," cr
+." five hundred and thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirty-seven Bottles of Beer on the wall." cr
+." Oh, five hundred and thirty-seven Bottles of Beer on the wall," cr
+." five hundred and thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirty-six Bottles of Beer on the wall." cr
+." Oh, five hundred and thirty-six Bottles of Beer on the wall," cr
+." five hundred and thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirty-five Bottles of Beer on the wall." cr
+." Oh, five hundred and thirty-five Bottles of Beer on the wall," cr
+." five hundred and thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirty-four Bottles of Beer on the wall." cr
+." Oh, five hundred and thirty-four Bottles of Beer on the wall," cr
+." five hundred and thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirty-three Bottles of Beer on the wall." cr
+." Oh, five hundred and thirty-three Bottles of Beer on the wall," cr
+." five hundred and thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirty-two Bottles of Beer on the wall." cr
+." Oh, five hundred and thirty-two Bottles of Beer on the wall," cr
+." five hundred and thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirty-one Bottles of Beer on the wall." cr
+." Oh, five hundred and thirty-one Bottles of Beer on the wall," cr
+." five hundred and thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirty Bottles of Beer on the wall." cr
+." Oh, five hundred and thirty Bottles of Beer on the wall," cr
+." five hundred and thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twenty-nine Bottles of Beer on the wall." cr
+." Oh, five hundred and twenty-nine Bottles of Beer on the wall," cr
+." five hundred and twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twenty-eight Bottles of Beer on the wall." cr
+." Oh, five hundred and twenty-eight Bottles of Beer on the wall," cr
+." five hundred and twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twenty-seven Bottles of Beer on the wall." cr
+." Oh, five hundred and twenty-seven Bottles of Beer on the wall," cr
+." five hundred and twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twenty-six Bottles of Beer on the wall." cr
+." Oh, five hundred and twenty-six Bottles of Beer on the wall," cr
+." five hundred and twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twenty-five Bottles of Beer on the wall." cr
+." Oh, five hundred and twenty-five Bottles of Beer on the wall," cr
+." five hundred and twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twenty-four Bottles of Beer on the wall." cr
+." Oh, five hundred and twenty-four Bottles of Beer on the wall," cr
+." five hundred and twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twenty-three Bottles of Beer on the wall." cr
+." Oh, five hundred and twenty-three Bottles of Beer on the wall," cr
+." five hundred and twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twenty-two Bottles of Beer on the wall." cr
+." Oh, five hundred and twenty-two Bottles of Beer on the wall," cr
+." five hundred and twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twenty-one Bottles of Beer on the wall." cr
+." Oh, five hundred and twenty-one Bottles of Beer on the wall," cr
+." five hundred and twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twenty Bottles of Beer on the wall." cr
+." Oh, five hundred and twenty Bottles of Beer on the wall," cr
+." five hundred and twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and nineteen Bottles of Beer on the wall." cr
+." Oh, five hundred and nineteen Bottles of Beer on the wall," cr
+." five hundred and nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighteen Bottles of Beer on the wall." cr
+." Oh, five hundred and eighteen Bottles of Beer on the wall," cr
+." five hundred and eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventeen Bottles of Beer on the wall." cr
+." Oh, five hundred and seventeen Bottles of Beer on the wall," cr
+." five hundred and seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixteen Bottles of Beer on the wall." cr
+." Oh, five hundred and sixteen Bottles of Beer on the wall," cr
+." five hundred and sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifteen Bottles of Beer on the wall." cr
+." Oh, five hundred and fifteen Bottles of Beer on the wall," cr
+." five hundred and fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fourteen Bottles of Beer on the wall." cr
+." Oh, five hundred and fourteen Bottles of Beer on the wall," cr
+." five hundred and fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirteen Bottles of Beer on the wall." cr
+." Oh, five hundred and thirteen Bottles of Beer on the wall," cr
+." five hundred and thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twelve Bottles of Beer on the wall." cr
+." Oh, five hundred and twelve Bottles of Beer on the wall," cr
+." five hundred and twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eleven Bottles of Beer on the wall." cr
+." Oh, five hundred and eleven Bottles of Beer on the wall," cr
+." five hundred and eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ten Bottles of Beer on the wall." cr
+." Oh, five hundred and ten Bottles of Beer on the wall," cr
+." five hundred and ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and nine Bottles of Beer on the wall." cr
+." Oh, five hundred and nine Bottles of Beer on the wall," cr
+." five hundred and nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eight Bottles of Beer on the wall." cr
+." Oh, five hundred and eight Bottles of Beer on the wall," cr
+." five hundred and eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seven Bottles of Beer on the wall." cr
+." Oh, five hundred and seven Bottles of Beer on the wall," cr
+." five hundred and seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and six Bottles of Beer on the wall." cr
+." Oh, five hundred and six Bottles of Beer on the wall," cr
+." five hundred and six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and five Bottles of Beer on the wall." cr
+." Oh, five hundred and five Bottles of Beer on the wall," cr
+." five hundred and five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and four Bottles of Beer on the wall." cr
+." Oh, five hundred and four Bottles of Beer on the wall," cr
+." five hundred and four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and three Bottles of Beer on the wall." cr
+." Oh, five hundred and three Bottles of Beer on the wall," cr
+." five hundred and three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and two Bottles of Beer on the wall." cr
+." Oh, five hundred and two Bottles of Beer on the wall," cr
+." five hundred and two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and one Bottles of Beer on the wall." cr
+." Oh, five hundred and one Bottles of Beer on the wall," cr
+." five hundred and one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred Bottles of Beer on the wall." cr
+." Oh, five hundred Bottles of Beer on the wall," cr
+." five hundred Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ninety-nine Bottles of Beer on the wall." cr
+." Oh, four hundred and ninety-nine Bottles of Beer on the wall," cr
+." four hundred and ninety-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ninety-eight Bottles of Beer on the wall." cr
+." Oh, four hundred and ninety-eight Bottles of Beer on the wall," cr
+." four hundred and ninety-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ninety-seven Bottles of Beer on the wall." cr
+." Oh, four hundred and ninety-seven Bottles of Beer on the wall," cr
+." four hundred and ninety-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ninety-six Bottles of Beer on the wall." cr
+." Oh, four hundred and ninety-six Bottles of Beer on the wall," cr
+." four hundred and ninety-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ninety-five Bottles of Beer on the wall." cr
+." Oh, four hundred and ninety-five Bottles of Beer on the wall," cr
+." four hundred and ninety-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ninety-four Bottles of Beer on the wall." cr
+." Oh, four hundred and ninety-four Bottles of Beer on the wall," cr
+." four hundred and ninety-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ninety-three Bottles of Beer on the wall." cr
+." Oh, four hundred and ninety-three Bottles of Beer on the wall," cr
+." four hundred and ninety-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ninety-two Bottles of Beer on the wall." cr
+." Oh, four hundred and ninety-two Bottles of Beer on the wall," cr
+." four hundred and ninety-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ninety-one Bottles of Beer on the wall." cr
+." Oh, four hundred and ninety-one Bottles of Beer on the wall," cr
+." four hundred and ninety-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ninety Bottles of Beer on the wall." cr
+." Oh, four hundred and ninety Bottles of Beer on the wall," cr
+." four hundred and ninety Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighty-nine Bottles of Beer on the wall." cr
+." Oh, four hundred and eighty-nine Bottles of Beer on the wall," cr
+." four hundred and eighty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighty-eight Bottles of Beer on the wall." cr
+." Oh, four hundred and eighty-eight Bottles of Beer on the wall," cr
+." four hundred and eighty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighty-seven Bottles of Beer on the wall." cr
+." Oh, four hundred and eighty-seven Bottles of Beer on the wall," cr
+." four hundred and eighty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighty-six Bottles of Beer on the wall." cr
+." Oh, four hundred and eighty-six Bottles of Beer on the wall," cr
+." four hundred and eighty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighty-five Bottles of Beer on the wall." cr
+." Oh, four hundred and eighty-five Bottles of Beer on the wall," cr
+." four hundred and eighty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighty-four Bottles of Beer on the wall." cr
+." Oh, four hundred and eighty-four Bottles of Beer on the wall," cr
+." four hundred and eighty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighty-three Bottles of Beer on the wall." cr
+." Oh, four hundred and eighty-three Bottles of Beer on the wall," cr
+." four hundred and eighty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighty-two Bottles of Beer on the wall." cr
+." Oh, four hundred and eighty-two Bottles of Beer on the wall," cr
+." four hundred and eighty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighty-one Bottles of Beer on the wall." cr
+." Oh, four hundred and eighty-one Bottles of Beer on the wall," cr
+." four hundred and eighty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighty Bottles of Beer on the wall." cr
+." Oh, four hundred and eighty Bottles of Beer on the wall," cr
+." four hundred and eighty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventy-nine Bottles of Beer on the wall." cr
+." Oh, four hundred and seventy-nine Bottles of Beer on the wall," cr
+." four hundred and seventy-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventy-eight Bottles of Beer on the wall." cr
+." Oh, four hundred and seventy-eight Bottles of Beer on the wall," cr
+." four hundred and seventy-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventy-seven Bottles of Beer on the wall." cr
+." Oh, four hundred and seventy-seven Bottles of Beer on the wall," cr
+." four hundred and seventy-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventy-six Bottles of Beer on the wall." cr
+." Oh, four hundred and seventy-six Bottles of Beer on the wall," cr
+." four hundred and seventy-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventy-five Bottles of Beer on the wall." cr
+." Oh, four hundred and seventy-five Bottles of Beer on the wall," cr
+." four hundred and seventy-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventy-four Bottles of Beer on the wall." cr
+." Oh, four hundred and seventy-four Bottles of Beer on the wall," cr
+." four hundred and seventy-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventy-three Bottles of Beer on the wall." cr
+." Oh, four hundred and seventy-three Bottles of Beer on the wall," cr
+." four hundred and seventy-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventy-two Bottles of Beer on the wall." cr
+." Oh, four hundred and seventy-two Bottles of Beer on the wall," cr
+." four hundred and seventy-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventy-one Bottles of Beer on the wall." cr
+." Oh, four hundred and seventy-one Bottles of Beer on the wall," cr
+." four hundred and seventy-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventy Bottles of Beer on the wall." cr
+." Oh, four hundred and seventy Bottles of Beer on the wall," cr
+." four hundred and seventy Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixty-nine Bottles of Beer on the wall." cr
+." Oh, four hundred and sixty-nine Bottles of Beer on the wall," cr
+." four hundred and sixty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixty-eight Bottles of Beer on the wall." cr
+." Oh, four hundred and sixty-eight Bottles of Beer on the wall," cr
+." four hundred and sixty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixty-seven Bottles of Beer on the wall." cr
+." Oh, four hundred and sixty-seven Bottles of Beer on the wall," cr
+." four hundred and sixty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixty-six Bottles of Beer on the wall." cr
+." Oh, four hundred and sixty-six Bottles of Beer on the wall," cr
+." four hundred and sixty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixty-five Bottles of Beer on the wall." cr
+." Oh, four hundred and sixty-five Bottles of Beer on the wall," cr
+." four hundred and sixty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixty-four Bottles of Beer on the wall." cr
+." Oh, four hundred and sixty-four Bottles of Beer on the wall," cr
+." four hundred and sixty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixty-three Bottles of Beer on the wall." cr
+." Oh, four hundred and sixty-three Bottles of Beer on the wall," cr
+." four hundred and sixty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixty-two Bottles of Beer on the wall." cr
+." Oh, four hundred and sixty-two Bottles of Beer on the wall," cr
+." four hundred and sixty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixty-one Bottles of Beer on the wall." cr
+." Oh, four hundred and sixty-one Bottles of Beer on the wall," cr
+." four hundred and sixty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixty Bottles of Beer on the wall." cr
+." Oh, four hundred and sixty Bottles of Beer on the wall," cr
+." four hundred and sixty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifty-nine Bottles of Beer on the wall." cr
+." Oh, four hundred and fifty-nine Bottles of Beer on the wall," cr
+." four hundred and fifty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifty-eight Bottles of Beer on the wall." cr
+." Oh, four hundred and fifty-eight Bottles of Beer on the wall," cr
+." four hundred and fifty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifty-seven Bottles of Beer on the wall." cr
+." Oh, four hundred and fifty-seven Bottles of Beer on the wall," cr
+." four hundred and fifty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifty-six Bottles of Beer on the wall." cr
+." Oh, four hundred and fifty-six Bottles of Beer on the wall," cr
+." four hundred and fifty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifty-five Bottles of Beer on the wall." cr
+." Oh, four hundred and fifty-five Bottles of Beer on the wall," cr
+." four hundred and fifty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifty-four Bottles of Beer on the wall." cr
+." Oh, four hundred and fifty-four Bottles of Beer on the wall," cr
+." four hundred and fifty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifty-three Bottles of Beer on the wall." cr
+." Oh, four hundred and fifty-three Bottles of Beer on the wall," cr
+." four hundred and fifty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifty-two Bottles of Beer on the wall." cr
+." Oh, four hundred and fifty-two Bottles of Beer on the wall," cr
+." four hundred and fifty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifty-one Bottles of Beer on the wall." cr
+." Oh, four hundred and fifty-one Bottles of Beer on the wall," cr
+." four hundred and fifty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifty Bottles of Beer on the wall." cr
+." Oh, four hundred and fifty Bottles of Beer on the wall," cr
+." four hundred and fifty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and forty-nine Bottles of Beer on the wall." cr
+." Oh, four hundred and forty-nine Bottles of Beer on the wall," cr
+." four hundred and forty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and forty-eight Bottles of Beer on the wall." cr
+." Oh, four hundred and forty-eight Bottles of Beer on the wall," cr
+." four hundred and forty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and forty-seven Bottles of Beer on the wall." cr
+." Oh, four hundred and forty-seven Bottles of Beer on the wall," cr
+." four hundred and forty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and forty-six Bottles of Beer on the wall." cr
+." Oh, four hundred and forty-six Bottles of Beer on the wall," cr
+." four hundred and forty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and forty-five Bottles of Beer on the wall." cr
+." Oh, four hundred and forty-five Bottles of Beer on the wall," cr
+." four hundred and forty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and forty-four Bottles of Beer on the wall." cr
+." Oh, four hundred and forty-four Bottles of Beer on the wall," cr
+." four hundred and forty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and forty-three Bottles of Beer on the wall." cr
+." Oh, four hundred and forty-three Bottles of Beer on the wall," cr
+." four hundred and forty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and forty-two Bottles of Beer on the wall." cr
+." Oh, four hundred and forty-two Bottles of Beer on the wall," cr
+." four hundred and forty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and forty-one Bottles of Beer on the wall." cr
+." Oh, four hundred and forty-one Bottles of Beer on the wall," cr
+." four hundred and forty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and forty Bottles of Beer on the wall." cr
+." Oh, four hundred and forty Bottles of Beer on the wall," cr
+." four hundred and forty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirty-nine Bottles of Beer on the wall." cr
+." Oh, four hundred and thirty-nine Bottles of Beer on the wall," cr
+." four hundred and thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirty-eight Bottles of Beer on the wall." cr
+." Oh, four hundred and thirty-eight Bottles of Beer on the wall," cr
+." four hundred and thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirty-seven Bottles of Beer on the wall." cr
+." Oh, four hundred and thirty-seven Bottles of Beer on the wall," cr
+." four hundred and thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirty-six Bottles of Beer on the wall." cr
+." Oh, four hundred and thirty-six Bottles of Beer on the wall," cr
+." four hundred and thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirty-five Bottles of Beer on the wall." cr
+." Oh, four hundred and thirty-five Bottles of Beer on the wall," cr
+." four hundred and thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirty-four Bottles of Beer on the wall." cr
+." Oh, four hundred and thirty-four Bottles of Beer on the wall," cr
+." four hundred and thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirty-three Bottles of Beer on the wall." cr
+." Oh, four hundred and thirty-three Bottles of Beer on the wall," cr
+." four hundred and thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirty-two Bottles of Beer on the wall." cr
+." Oh, four hundred and thirty-two Bottles of Beer on the wall," cr
+." four hundred and thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirty-one Bottles of Beer on the wall." cr
+." Oh, four hundred and thirty-one Bottles of Beer on the wall," cr
+." four hundred and thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirty Bottles of Beer on the wall." cr
+." Oh, four hundred and thirty Bottles of Beer on the wall," cr
+." four hundred and thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twenty-nine Bottles of Beer on the wall." cr
+." Oh, four hundred and twenty-nine Bottles of Beer on the wall," cr
+." four hundred and twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twenty-eight Bottles of Beer on the wall." cr
+." Oh, four hundred and twenty-eight Bottles of Beer on the wall," cr
+." four hundred and twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twenty-seven Bottles of Beer on the wall." cr
+." Oh, four hundred and twenty-seven Bottles of Beer on the wall," cr
+." four hundred and twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twenty-six Bottles of Beer on the wall." cr
+." Oh, four hundred and twenty-six Bottles of Beer on the wall," cr
+." four hundred and twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twenty-five Bottles of Beer on the wall." cr
+." Oh, four hundred and twenty-five Bottles of Beer on the wall," cr
+." four hundred and twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twenty-four Bottles of Beer on the wall." cr
+." Oh, four hundred and twenty-four Bottles of Beer on the wall," cr
+." four hundred and twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twenty-three Bottles of Beer on the wall." cr
+." Oh, four hundred and twenty-three Bottles of Beer on the wall," cr
+." four hundred and twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twenty-two Bottles of Beer on the wall." cr
+." Oh, four hundred and twenty-two Bottles of Beer on the wall," cr
+." four hundred and twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twenty-one Bottles of Beer on the wall." cr
+." Oh, four hundred and twenty-one Bottles of Beer on the wall," cr
+." four hundred and twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twenty Bottles of Beer on the wall." cr
+." Oh, four hundred and twenty Bottles of Beer on the wall," cr
+." four hundred and twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and nineteen Bottles of Beer on the wall." cr
+." Oh, four hundred and nineteen Bottles of Beer on the wall," cr
+." four hundred and nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighteen Bottles of Beer on the wall." cr
+." Oh, four hundred and eighteen Bottles of Beer on the wall," cr
+." four hundred and eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventeen Bottles of Beer on the wall." cr
+." Oh, four hundred and seventeen Bottles of Beer on the wall," cr
+." four hundred and seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixteen Bottles of Beer on the wall." cr
+." Oh, four hundred and sixteen Bottles of Beer on the wall," cr
+." four hundred and sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifteen Bottles of Beer on the wall." cr
+." Oh, four hundred and fifteen Bottles of Beer on the wall," cr
+." four hundred and fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fourteen Bottles of Beer on the wall." cr
+." Oh, four hundred and fourteen Bottles of Beer on the wall," cr
+." four hundred and fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirteen Bottles of Beer on the wall." cr
+." Oh, four hundred and thirteen Bottles of Beer on the wall," cr
+." four hundred and thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twelve Bottles of Beer on the wall." cr
+." Oh, four hundred and twelve Bottles of Beer on the wall," cr
+." four hundred and twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eleven Bottles of Beer on the wall." cr
+." Oh, four hundred and eleven Bottles of Beer on the wall," cr
+." four hundred and eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ten Bottles of Beer on the wall." cr
+." Oh, four hundred and ten Bottles of Beer on the wall," cr
+." four hundred and ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and nine Bottles of Beer on the wall." cr
+." Oh, four hundred and nine Bottles of Beer on the wall," cr
+." four hundred and nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eight Bottles of Beer on the wall." cr
+." Oh, four hundred and eight Bottles of Beer on the wall," cr
+." four hundred and eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seven Bottles of Beer on the wall." cr
+." Oh, four hundred and seven Bottles of Beer on the wall," cr
+." four hundred and seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and six Bottles of Beer on the wall." cr
+." Oh, four hundred and six Bottles of Beer on the wall," cr
+." four hundred and six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and five Bottles of Beer on the wall." cr
+." Oh, four hundred and five Bottles of Beer on the wall," cr
+." four hundred and five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and four Bottles of Beer on the wall." cr
+." Oh, four hundred and four Bottles of Beer on the wall," cr
+." four hundred and four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and three Bottles of Beer on the wall." cr
+." Oh, four hundred and three Bottles of Beer on the wall," cr
+." four hundred and three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and two Bottles of Beer on the wall." cr
+." Oh, four hundred and two Bottles of Beer on the wall," cr
+." four hundred and two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and one Bottles of Beer on the wall." cr
+." Oh, four hundred and one Bottles of Beer on the wall," cr
+." four hundred and one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred Bottles of Beer on the wall." cr
+." Oh, four hundred Bottles of Beer on the wall," cr
+." four hundred Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ninety-nine Bottles of Beer on the wall." cr
+." Oh, three hundred and ninety-nine Bottles of Beer on the wall," cr
+." three hundred and ninety-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ninety-eight Bottles of Beer on the wall." cr
+." Oh, three hundred and ninety-eight Bottles of Beer on the wall," cr
+." three hundred and ninety-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ninety-seven Bottles of Beer on the wall." cr
+." Oh, three hundred and ninety-seven Bottles of Beer on the wall," cr
+." three hundred and ninety-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ninety-six Bottles of Beer on the wall." cr
+." Oh, three hundred and ninety-six Bottles of Beer on the wall," cr
+." three hundred and ninety-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ninety-five Bottles of Beer on the wall." cr
+." Oh, three hundred and ninety-five Bottles of Beer on the wall," cr
+." three hundred and ninety-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ninety-four Bottles of Beer on the wall." cr
+." Oh, three hundred and ninety-four Bottles of Beer on the wall," cr
+." three hundred and ninety-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ninety-three Bottles of Beer on the wall." cr
+." Oh, three hundred and ninety-three Bottles of Beer on the wall," cr
+." three hundred and ninety-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ninety-two Bottles of Beer on the wall." cr
+." Oh, three hundred and ninety-two Bottles of Beer on the wall," cr
+." three hundred and ninety-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ninety-one Bottles of Beer on the wall." cr
+." Oh, three hundred and ninety-one Bottles of Beer on the wall," cr
+." three hundred and ninety-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ninety Bottles of Beer on the wall." cr
+." Oh, three hundred and ninety Bottles of Beer on the wall," cr
+." three hundred and ninety Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighty-nine Bottles of Beer on the wall." cr
+." Oh, three hundred and eighty-nine Bottles of Beer on the wall," cr
+." three hundred and eighty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighty-eight Bottles of Beer on the wall." cr
+." Oh, three hundred and eighty-eight Bottles of Beer on the wall," cr
+." three hundred and eighty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighty-seven Bottles of Beer on the wall." cr
+." Oh, three hundred and eighty-seven Bottles of Beer on the wall," cr
+." three hundred and eighty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighty-six Bottles of Beer on the wall." cr
+." Oh, three hundred and eighty-six Bottles of Beer on the wall," cr
+." three hundred and eighty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighty-five Bottles of Beer on the wall." cr
+." Oh, three hundred and eighty-five Bottles of Beer on the wall," cr
+." three hundred and eighty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighty-four Bottles of Beer on the wall." cr
+." Oh, three hundred and eighty-four Bottles of Beer on the wall," cr
+." three hundred and eighty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighty-three Bottles of Beer on the wall." cr
+." Oh, three hundred and eighty-three Bottles of Beer on the wall," cr
+." three hundred and eighty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighty-two Bottles of Beer on the wall." cr
+." Oh, three hundred and eighty-two Bottles of Beer on the wall," cr
+." three hundred and eighty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighty-one Bottles of Beer on the wall." cr
+." Oh, three hundred and eighty-one Bottles of Beer on the wall," cr
+." three hundred and eighty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighty Bottles of Beer on the wall." cr
+." Oh, three hundred and eighty Bottles of Beer on the wall," cr
+." three hundred and eighty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventy-nine Bottles of Beer on the wall." cr
+." Oh, three hundred and seventy-nine Bottles of Beer on the wall," cr
+." three hundred and seventy-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventy-eight Bottles of Beer on the wall." cr
+." Oh, three hundred and seventy-eight Bottles of Beer on the wall," cr
+." three hundred and seventy-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventy-seven Bottles of Beer on the wall." cr
+." Oh, three hundred and seventy-seven Bottles of Beer on the wall," cr
+." three hundred and seventy-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventy-six Bottles of Beer on the wall." cr
+." Oh, three hundred and seventy-six Bottles of Beer on the wall," cr
+." three hundred and seventy-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventy-five Bottles of Beer on the wall." cr
+." Oh, three hundred and seventy-five Bottles of Beer on the wall," cr
+." three hundred and seventy-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventy-four Bottles of Beer on the wall." cr
+." Oh, three hundred and seventy-four Bottles of Beer on the wall," cr
+." three hundred and seventy-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventy-three Bottles of Beer on the wall." cr
+." Oh, three hundred and seventy-three Bottles of Beer on the wall," cr
+." three hundred and seventy-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventy-two Bottles of Beer on the wall." cr
+." Oh, three hundred and seventy-two Bottles of Beer on the wall," cr
+." three hundred and seventy-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventy-one Bottles of Beer on the wall." cr
+." Oh, three hundred and seventy-one Bottles of Beer on the wall," cr
+." three hundred and seventy-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventy Bottles of Beer on the wall." cr
+." Oh, three hundred and seventy Bottles of Beer on the wall," cr
+." three hundred and seventy Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixty-nine Bottles of Beer on the wall." cr
+." Oh, three hundred and sixty-nine Bottles of Beer on the wall," cr
+." three hundred and sixty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixty-eight Bottles of Beer on the wall." cr
+." Oh, three hundred and sixty-eight Bottles of Beer on the wall," cr
+." three hundred and sixty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixty-seven Bottles of Beer on the wall." cr
+." Oh, three hundred and sixty-seven Bottles of Beer on the wall," cr
+." three hundred and sixty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixty-six Bottles of Beer on the wall." cr
+." Oh, three hundred and sixty-six Bottles of Beer on the wall," cr
+." three hundred and sixty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixty-five Bottles of Beer on the wall." cr
+." Oh, three hundred and sixty-five Bottles of Beer on the wall," cr
+." three hundred and sixty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixty-four Bottles of Beer on the wall." cr
+." Oh, three hundred and sixty-four Bottles of Beer on the wall," cr
+." three hundred and sixty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixty-three Bottles of Beer on the wall." cr
+." Oh, three hundred and sixty-three Bottles of Beer on the wall," cr
+." three hundred and sixty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixty-two Bottles of Beer on the wall." cr
+." Oh, three hundred and sixty-two Bottles of Beer on the wall," cr
+." three hundred and sixty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixty-one Bottles of Beer on the wall." cr
+." Oh, three hundred and sixty-one Bottles of Beer on the wall," cr
+." three hundred and sixty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixty Bottles of Beer on the wall." cr
+." Oh, three hundred and sixty Bottles of Beer on the wall," cr
+." three hundred and sixty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifty-nine Bottles of Beer on the wall." cr
+." Oh, three hundred and fifty-nine Bottles of Beer on the wall," cr
+." three hundred and fifty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifty-eight Bottles of Beer on the wall." cr
+." Oh, three hundred and fifty-eight Bottles of Beer on the wall," cr
+." three hundred and fifty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifty-seven Bottles of Beer on the wall." cr
+." Oh, three hundred and fifty-seven Bottles of Beer on the wall," cr
+." three hundred and fifty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifty-six Bottles of Beer on the wall." cr
+." Oh, three hundred and fifty-six Bottles of Beer on the wall," cr
+." three hundred and fifty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifty-five Bottles of Beer on the wall." cr
+." Oh, three hundred and fifty-five Bottles of Beer on the wall," cr
+." three hundred and fifty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifty-four Bottles of Beer on the wall." cr
+." Oh, three hundred and fifty-four Bottles of Beer on the wall," cr
+." three hundred and fifty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifty-three Bottles of Beer on the wall." cr
+." Oh, three hundred and fifty-three Bottles of Beer on the wall," cr
+." three hundred and fifty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifty-two Bottles of Beer on the wall." cr
+." Oh, three hundred and fifty-two Bottles of Beer on the wall," cr
+." three hundred and fifty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifty-one Bottles of Beer on the wall." cr
+." Oh, three hundred and fifty-one Bottles of Beer on the wall," cr
+." three hundred and fifty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifty Bottles of Beer on the wall." cr
+." Oh, three hundred and fifty Bottles of Beer on the wall," cr
+." three hundred and fifty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and forty-nine Bottles of Beer on the wall." cr
+." Oh, three hundred and forty-nine Bottles of Beer on the wall," cr
+." three hundred and forty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and forty-eight Bottles of Beer on the wall." cr
+." Oh, three hundred and forty-eight Bottles of Beer on the wall," cr
+." three hundred and forty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and forty-seven Bottles of Beer on the wall." cr
+." Oh, three hundred and forty-seven Bottles of Beer on the wall," cr
+." three hundred and forty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and forty-six Bottles of Beer on the wall." cr
+." Oh, three hundred and forty-six Bottles of Beer on the wall," cr
+." three hundred and forty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and forty-five Bottles of Beer on the wall." cr
+." Oh, three hundred and forty-five Bottles of Beer on the wall," cr
+." three hundred and forty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and forty-four Bottles of Beer on the wall." cr
+." Oh, three hundred and forty-four Bottles of Beer on the wall," cr
+." three hundred and forty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and forty-three Bottles of Beer on the wall." cr
+." Oh, three hundred and forty-three Bottles of Beer on the wall," cr
+." three hundred and forty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and forty-two Bottles of Beer on the wall." cr
+." Oh, three hundred and forty-two Bottles of Beer on the wall," cr
+." three hundred and forty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and forty-one Bottles of Beer on the wall." cr
+." Oh, three hundred and forty-one Bottles of Beer on the wall," cr
+." three hundred and forty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and forty Bottles of Beer on the wall." cr
+." Oh, three hundred and forty Bottles of Beer on the wall," cr
+." three hundred and forty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirty-nine Bottles of Beer on the wall." cr
+." Oh, three hundred and thirty-nine Bottles of Beer on the wall," cr
+." three hundred and thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirty-eight Bottles of Beer on the wall." cr
+." Oh, three hundred and thirty-eight Bottles of Beer on the wall," cr
+." three hundred and thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirty-seven Bottles of Beer on the wall." cr
+." Oh, three hundred and thirty-seven Bottles of Beer on the wall," cr
+." three hundred and thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirty-six Bottles of Beer on the wall." cr
+." Oh, three hundred and thirty-six Bottles of Beer on the wall," cr
+." three hundred and thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirty-five Bottles of Beer on the wall." cr
+." Oh, three hundred and thirty-five Bottles of Beer on the wall," cr
+." three hundred and thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirty-four Bottles of Beer on the wall." cr
+." Oh, three hundred and thirty-four Bottles of Beer on the wall," cr
+." three hundred and thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirty-three Bottles of Beer on the wall." cr
+." Oh, three hundred and thirty-three Bottles of Beer on the wall," cr
+." three hundred and thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirty-two Bottles of Beer on the wall." cr
+." Oh, three hundred and thirty-two Bottles of Beer on the wall," cr
+." three hundred and thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirty-one Bottles of Beer on the wall." cr
+." Oh, three hundred and thirty-one Bottles of Beer on the wall," cr
+." three hundred and thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirty Bottles of Beer on the wall." cr
+." Oh, three hundred and thirty Bottles of Beer on the wall," cr
+." three hundred and thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twenty-nine Bottles of Beer on the wall." cr
+." Oh, three hundred and twenty-nine Bottles of Beer on the wall," cr
+." three hundred and twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twenty-eight Bottles of Beer on the wall." cr
+." Oh, three hundred and twenty-eight Bottles of Beer on the wall," cr
+." three hundred and twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twenty-seven Bottles of Beer on the wall." cr
+." Oh, three hundred and twenty-seven Bottles of Beer on the wall," cr
+." three hundred and twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twenty-six Bottles of Beer on the wall." cr
+." Oh, three hundred and twenty-six Bottles of Beer on the wall," cr
+." three hundred and twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twenty-five Bottles of Beer on the wall." cr
+." Oh, three hundred and twenty-five Bottles of Beer on the wall," cr
+." three hundred and twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twenty-four Bottles of Beer on the wall." cr
+." Oh, three hundred and twenty-four Bottles of Beer on the wall," cr
+." three hundred and twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twenty-three Bottles of Beer on the wall." cr
+." Oh, three hundred and twenty-three Bottles of Beer on the wall," cr
+." three hundred and twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twenty-two Bottles of Beer on the wall." cr
+." Oh, three hundred and twenty-two Bottles of Beer on the wall," cr
+." three hundred and twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twenty-one Bottles of Beer on the wall." cr
+." Oh, three hundred and twenty-one Bottles of Beer on the wall," cr
+." three hundred and twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twenty Bottles of Beer on the wall." cr
+." Oh, three hundred and twenty Bottles of Beer on the wall," cr
+." three hundred and twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and nineteen Bottles of Beer on the wall." cr
+." Oh, three hundred and nineteen Bottles of Beer on the wall," cr
+." three hundred and nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighteen Bottles of Beer on the wall." cr
+." Oh, three hundred and eighteen Bottles of Beer on the wall," cr
+." three hundred and eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventeen Bottles of Beer on the wall." cr
+." Oh, three hundred and seventeen Bottles of Beer on the wall," cr
+." three hundred and seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixteen Bottles of Beer on the wall." cr
+." Oh, three hundred and sixteen Bottles of Beer on the wall," cr
+." three hundred and sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifteen Bottles of Beer on the wall." cr
+." Oh, three hundred and fifteen Bottles of Beer on the wall," cr
+." three hundred and fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fourteen Bottles of Beer on the wall." cr
+." Oh, three hundred and fourteen Bottles of Beer on the wall," cr
+." three hundred and fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirteen Bottles of Beer on the wall." cr
+." Oh, three hundred and thirteen Bottles of Beer on the wall," cr
+." three hundred and thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twelve Bottles of Beer on the wall." cr
+." Oh, three hundred and twelve Bottles of Beer on the wall," cr
+." three hundred and twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eleven Bottles of Beer on the wall." cr
+." Oh, three hundred and eleven Bottles of Beer on the wall," cr
+." three hundred and eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ten Bottles of Beer on the wall." cr
+." Oh, three hundred and ten Bottles of Beer on the wall," cr
+." three hundred and ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and nine Bottles of Beer on the wall." cr
+." Oh, three hundred and nine Bottles of Beer on the wall," cr
+." three hundred and nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eight Bottles of Beer on the wall." cr
+." Oh, three hundred and eight Bottles of Beer on the wall," cr
+." three hundred and eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seven Bottles of Beer on the wall." cr
+." Oh, three hundred and seven Bottles of Beer on the wall," cr
+." three hundred and seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and six Bottles of Beer on the wall." cr
+." Oh, three hundred and six Bottles of Beer on the wall," cr
+." three hundred and six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and five Bottles of Beer on the wall." cr
+." Oh, three hundred and five Bottles of Beer on the wall," cr
+." three hundred and five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and four Bottles of Beer on the wall." cr
+." Oh, three hundred and four Bottles of Beer on the wall," cr
+." three hundred and four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and three Bottles of Beer on the wall." cr
+." Oh, three hundred and three Bottles of Beer on the wall," cr
+." three hundred and three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and two Bottles of Beer on the wall." cr
+." Oh, three hundred and two Bottles of Beer on the wall," cr
+." three hundred and two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and one Bottles of Beer on the wall." cr
+." Oh, three hundred and one Bottles of Beer on the wall," cr
+." three hundred and one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred Bottles of Beer on the wall." cr
+." Oh, three hundred Bottles of Beer on the wall," cr
+." three hundred Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ninety-nine Bottles of Beer on the wall." cr
+." Oh, two hundred and ninety-nine Bottles of Beer on the wall," cr
+." two hundred and ninety-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ninety-eight Bottles of Beer on the wall." cr
+." Oh, two hundred and ninety-eight Bottles of Beer on the wall," cr
+." two hundred and ninety-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ninety-seven Bottles of Beer on the wall." cr
+." Oh, two hundred and ninety-seven Bottles of Beer on the wall," cr
+." two hundred and ninety-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ninety-six Bottles of Beer on the wall." cr
+." Oh, two hundred and ninety-six Bottles of Beer on the wall," cr
+." two hundred and ninety-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ninety-five Bottles of Beer on the wall." cr
+." Oh, two hundred and ninety-five Bottles of Beer on the wall," cr
+." two hundred and ninety-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ninety-four Bottles of Beer on the wall." cr
+." Oh, two hundred and ninety-four Bottles of Beer on the wall," cr
+." two hundred and ninety-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ninety-three Bottles of Beer on the wall." cr
+." Oh, two hundred and ninety-three Bottles of Beer on the wall," cr
+." two hundred and ninety-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ninety-two Bottles of Beer on the wall." cr
+." Oh, two hundred and ninety-two Bottles of Beer on the wall," cr
+." two hundred and ninety-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ninety-one Bottles of Beer on the wall." cr
+." Oh, two hundred and ninety-one Bottles of Beer on the wall," cr
+." two hundred and ninety-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ninety Bottles of Beer on the wall." cr
+." Oh, two hundred and ninety Bottles of Beer on the wall," cr
+." two hundred and ninety Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighty-nine Bottles of Beer on the wall." cr
+." Oh, two hundred and eighty-nine Bottles of Beer on the wall," cr
+." two hundred and eighty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighty-eight Bottles of Beer on the wall." cr
+." Oh, two hundred and eighty-eight Bottles of Beer on the wall," cr
+." two hundred and eighty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighty-seven Bottles of Beer on the wall." cr
+." Oh, two hundred and eighty-seven Bottles of Beer on the wall," cr
+." two hundred and eighty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighty-six Bottles of Beer on the wall." cr
+." Oh, two hundred and eighty-six Bottles of Beer on the wall," cr
+." two hundred and eighty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighty-five Bottles of Beer on the wall." cr
+." Oh, two hundred and eighty-five Bottles of Beer on the wall," cr
+." two hundred and eighty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighty-four Bottles of Beer on the wall." cr
+." Oh, two hundred and eighty-four Bottles of Beer on the wall," cr
+." two hundred and eighty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighty-three Bottles of Beer on the wall." cr
+." Oh, two hundred and eighty-three Bottles of Beer on the wall," cr
+." two hundred and eighty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighty-two Bottles of Beer on the wall." cr
+." Oh, two hundred and eighty-two Bottles of Beer on the wall," cr
+." two hundred and eighty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighty-one Bottles of Beer on the wall." cr
+." Oh, two hundred and eighty-one Bottles of Beer on the wall," cr
+." two hundred and eighty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighty Bottles of Beer on the wall." cr
+." Oh, two hundred and eighty Bottles of Beer on the wall," cr
+." two hundred and eighty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventy-nine Bottles of Beer on the wall." cr
+." Oh, two hundred and seventy-nine Bottles of Beer on the wall," cr
+." two hundred and seventy-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventy-eight Bottles of Beer on the wall." cr
+." Oh, two hundred and seventy-eight Bottles of Beer on the wall," cr
+." two hundred and seventy-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventy-seven Bottles of Beer on the wall." cr
+." Oh, two hundred and seventy-seven Bottles of Beer on the wall," cr
+." two hundred and seventy-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventy-six Bottles of Beer on the wall." cr
+." Oh, two hundred and seventy-six Bottles of Beer on the wall," cr
+." two hundred and seventy-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventy-five Bottles of Beer on the wall." cr
+." Oh, two hundred and seventy-five Bottles of Beer on the wall," cr
+." two hundred and seventy-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventy-four Bottles of Beer on the wall." cr
+." Oh, two hundred and seventy-four Bottles of Beer on the wall," cr
+." two hundred and seventy-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventy-three Bottles of Beer on the wall." cr
+." Oh, two hundred and seventy-three Bottles of Beer on the wall," cr
+." two hundred and seventy-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventy-two Bottles of Beer on the wall." cr
+." Oh, two hundred and seventy-two Bottles of Beer on the wall," cr
+." two hundred and seventy-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventy-one Bottles of Beer on the wall." cr
+." Oh, two hundred and seventy-one Bottles of Beer on the wall," cr
+." two hundred and seventy-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventy Bottles of Beer on the wall." cr
+." Oh, two hundred and seventy Bottles of Beer on the wall," cr
+." two hundred and seventy Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixty-nine Bottles of Beer on the wall." cr
+." Oh, two hundred and sixty-nine Bottles of Beer on the wall," cr
+." two hundred and sixty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixty-eight Bottles of Beer on the wall." cr
+." Oh, two hundred and sixty-eight Bottles of Beer on the wall," cr
+." two hundred and sixty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixty-seven Bottles of Beer on the wall." cr
+." Oh, two hundred and sixty-seven Bottles of Beer on the wall," cr
+." two hundred and sixty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixty-six Bottles of Beer on the wall." cr
+." Oh, two hundred and sixty-six Bottles of Beer on the wall," cr
+." two hundred and sixty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixty-five Bottles of Beer on the wall." cr
+." Oh, two hundred and sixty-five Bottles of Beer on the wall," cr
+." two hundred and sixty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixty-four Bottles of Beer on the wall." cr
+." Oh, two hundred and sixty-four Bottles of Beer on the wall," cr
+." two hundred and sixty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixty-three Bottles of Beer on the wall." cr
+." Oh, two hundred and sixty-three Bottles of Beer on the wall," cr
+." two hundred and sixty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixty-two Bottles of Beer on the wall." cr
+." Oh, two hundred and sixty-two Bottles of Beer on the wall," cr
+." two hundred and sixty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixty-one Bottles of Beer on the wall." cr
+." Oh, two hundred and sixty-one Bottles of Beer on the wall," cr
+." two hundred and sixty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixty Bottles of Beer on the wall." cr
+." Oh, two hundred and sixty Bottles of Beer on the wall," cr
+." two hundred and sixty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifty-nine Bottles of Beer on the wall." cr
+." Oh, two hundred and fifty-nine Bottles of Beer on the wall," cr
+." two hundred and fifty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifty-eight Bottles of Beer on the wall." cr
+." Oh, two hundred and fifty-eight Bottles of Beer on the wall," cr
+." two hundred and fifty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifty-seven Bottles of Beer on the wall." cr
+." Oh, two hundred and fifty-seven Bottles of Beer on the wall," cr
+." two hundred and fifty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifty-six Bottles of Beer on the wall." cr
+." Oh, two hundred and fifty-six Bottles of Beer on the wall," cr
+." two hundred and fifty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifty-five Bottles of Beer on the wall." cr
+." Oh, two hundred and fifty-five Bottles of Beer on the wall," cr
+." two hundred and fifty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifty-four Bottles of Beer on the wall." cr
+." Oh, two hundred and fifty-four Bottles of Beer on the wall," cr
+." two hundred and fifty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifty-three Bottles of Beer on the wall." cr
+." Oh, two hundred and fifty-three Bottles of Beer on the wall," cr
+." two hundred and fifty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifty-two Bottles of Beer on the wall." cr
+." Oh, two hundred and fifty-two Bottles of Beer on the wall," cr
+." two hundred and fifty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifty-one Bottles of Beer on the wall." cr
+." Oh, two hundred and fifty-one Bottles of Beer on the wall," cr
+." two hundred and fifty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifty Bottles of Beer on the wall." cr
+." Oh, two hundred and fifty Bottles of Beer on the wall," cr
+." two hundred and fifty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and forty-nine Bottles of Beer on the wall." cr
+." Oh, two hundred and forty-nine Bottles of Beer on the wall," cr
+." two hundred and forty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and forty-eight Bottles of Beer on the wall." cr
+." Oh, two hundred and forty-eight Bottles of Beer on the wall," cr
+." two hundred and forty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and forty-seven Bottles of Beer on the wall." cr
+." Oh, two hundred and forty-seven Bottles of Beer on the wall," cr
+." two hundred and forty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and forty-six Bottles of Beer on the wall." cr
+." Oh, two hundred and forty-six Bottles of Beer on the wall," cr
+." two hundred and forty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and forty-five Bottles of Beer on the wall." cr
+." Oh, two hundred and forty-five Bottles of Beer on the wall," cr
+." two hundred and forty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and forty-four Bottles of Beer on the wall." cr
+." Oh, two hundred and forty-four Bottles of Beer on the wall," cr
+." two hundred and forty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and forty-three Bottles of Beer on the wall." cr
+." Oh, two hundred and forty-three Bottles of Beer on the wall," cr
+." two hundred and forty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and forty-two Bottles of Beer on the wall." cr
+." Oh, two hundred and forty-two Bottles of Beer on the wall," cr
+." two hundred and forty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and forty-one Bottles of Beer on the wall." cr
+." Oh, two hundred and forty-one Bottles of Beer on the wall," cr
+." two hundred and forty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and forty Bottles of Beer on the wall." cr
+." Oh, two hundred and forty Bottles of Beer on the wall," cr
+." two hundred and forty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirty-nine Bottles of Beer on the wall." cr
+." Oh, two hundred and thirty-nine Bottles of Beer on the wall," cr
+." two hundred and thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirty-eight Bottles of Beer on the wall." cr
+." Oh, two hundred and thirty-eight Bottles of Beer on the wall," cr
+." two hundred and thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirty-seven Bottles of Beer on the wall." cr
+." Oh, two hundred and thirty-seven Bottles of Beer on the wall," cr
+." two hundred and thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirty-six Bottles of Beer on the wall." cr
+." Oh, two hundred and thirty-six Bottles of Beer on the wall," cr
+." two hundred and thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirty-five Bottles of Beer on the wall." cr
+." Oh, two hundred and thirty-five Bottles of Beer on the wall," cr
+." two hundred and thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirty-four Bottles of Beer on the wall." cr
+." Oh, two hundred and thirty-four Bottles of Beer on the wall," cr
+." two hundred and thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirty-three Bottles of Beer on the wall." cr
+." Oh, two hundred and thirty-three Bottles of Beer on the wall," cr
+." two hundred and thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirty-two Bottles of Beer on the wall." cr
+." Oh, two hundred and thirty-two Bottles of Beer on the wall," cr
+." two hundred and thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirty-one Bottles of Beer on the wall." cr
+." Oh, two hundred and thirty-one Bottles of Beer on the wall," cr
+." two hundred and thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirty Bottles of Beer on the wall." cr
+." Oh, two hundred and thirty Bottles of Beer on the wall," cr
+." two hundred and thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twenty-nine Bottles of Beer on the wall." cr
+." Oh, two hundred and twenty-nine Bottles of Beer on the wall," cr
+." two hundred and twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twenty-eight Bottles of Beer on the wall." cr
+." Oh, two hundred and twenty-eight Bottles of Beer on the wall," cr
+." two hundred and twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twenty-seven Bottles of Beer on the wall." cr
+." Oh, two hundred and twenty-seven Bottles of Beer on the wall," cr
+." two hundred and twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twenty-six Bottles of Beer on the wall." cr
+." Oh, two hundred and twenty-six Bottles of Beer on the wall," cr
+." two hundred and twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twenty-five Bottles of Beer on the wall." cr
+." Oh, two hundred and twenty-five Bottles of Beer on the wall," cr
+." two hundred and twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twenty-four Bottles of Beer on the wall." cr
+." Oh, two hundred and twenty-four Bottles of Beer on the wall," cr
+." two hundred and twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twenty-three Bottles of Beer on the wall." cr
+." Oh, two hundred and twenty-three Bottles of Beer on the wall," cr
+." two hundred and twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twenty-two Bottles of Beer on the wall." cr
+." Oh, two hundred and twenty-two Bottles of Beer on the wall," cr
+." two hundred and twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twenty-one Bottles of Beer on the wall." cr
+." Oh, two hundred and twenty-one Bottles of Beer on the wall," cr
+." two hundred and twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twenty Bottles of Beer on the wall." cr
+." Oh, two hundred and twenty Bottles of Beer on the wall," cr
+." two hundred and twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and nineteen Bottles of Beer on the wall." cr
+." Oh, two hundred and nineteen Bottles of Beer on the wall," cr
+." two hundred and nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighteen Bottles of Beer on the wall." cr
+." Oh, two hundred and eighteen Bottles of Beer on the wall," cr
+." two hundred and eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventeen Bottles of Beer on the wall." cr
+." Oh, two hundred and seventeen Bottles of Beer on the wall," cr
+." two hundred and seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixteen Bottles of Beer on the wall." cr
+." Oh, two hundred and sixteen Bottles of Beer on the wall," cr
+." two hundred and sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifteen Bottles of Beer on the wall." cr
+." Oh, two hundred and fifteen Bottles of Beer on the wall," cr
+." two hundred and fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fourteen Bottles of Beer on the wall." cr
+." Oh, two hundred and fourteen Bottles of Beer on the wall," cr
+." two hundred and fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirteen Bottles of Beer on the wall." cr
+." Oh, two hundred and thirteen Bottles of Beer on the wall," cr
+." two hundred and thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twelve Bottles of Beer on the wall." cr
+." Oh, two hundred and twelve Bottles of Beer on the wall," cr
+." two hundred and twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eleven Bottles of Beer on the wall." cr
+." Oh, two hundred and eleven Bottles of Beer on the wall," cr
+." two hundred and eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ten Bottles of Beer on the wall." cr
+." Oh, two hundred and ten Bottles of Beer on the wall," cr
+." two hundred and ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and nine Bottles of Beer on the wall." cr
+." Oh, two hundred and nine Bottles of Beer on the wall," cr
+." two hundred and nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eight Bottles of Beer on the wall." cr
+." Oh, two hundred and eight Bottles of Beer on the wall," cr
+." two hundred and eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seven Bottles of Beer on the wall." cr
+." Oh, two hundred and seven Bottles of Beer on the wall," cr
+." two hundred and seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and six Bottles of Beer on the wall." cr
+." Oh, two hundred and six Bottles of Beer on the wall," cr
+." two hundred and six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and five Bottles of Beer on the wall." cr
+." Oh, two hundred and five Bottles of Beer on the wall," cr
+." two hundred and five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and four Bottles of Beer on the wall." cr
+." Oh, two hundred and four Bottles of Beer on the wall," cr
+." two hundred and four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and three Bottles of Beer on the wall." cr
+." Oh, two hundred and three Bottles of Beer on the wall," cr
+." two hundred and three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and two Bottles of Beer on the wall." cr
+." Oh, two hundred and two Bottles of Beer on the wall," cr
+." two hundred and two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and one Bottles of Beer on the wall." cr
+." Oh, two hundred and one Bottles of Beer on the wall," cr
+." two hundred and one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred Bottles of Beer on the wall." cr
+." Oh, two hundred Bottles of Beer on the wall," cr
+." two hundred Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ninety-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and ninety-nine Bottles of Beer on the wall," cr
+." one hundred and ninety-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ninety-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and ninety-eight Bottles of Beer on the wall," cr
+." one hundred and ninety-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ninety-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and ninety-seven Bottles of Beer on the wall," cr
+." one hundred and ninety-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ninety-six Bottles of Beer on the wall." cr
+." Oh, one hundred and ninety-six Bottles of Beer on the wall," cr
+." one hundred and ninety-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ninety-five Bottles of Beer on the wall." cr
+." Oh, one hundred and ninety-five Bottles of Beer on the wall," cr
+." one hundred and ninety-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ninety-four Bottles of Beer on the wall." cr
+." Oh, one hundred and ninety-four Bottles of Beer on the wall," cr
+." one hundred and ninety-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ninety-three Bottles of Beer on the wall." cr
+." Oh, one hundred and ninety-three Bottles of Beer on the wall," cr
+." one hundred and ninety-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ninety-two Bottles of Beer on the wall." cr
+." Oh, one hundred and ninety-two Bottles of Beer on the wall," cr
+." one hundred and ninety-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ninety-one Bottles of Beer on the wall." cr
+." Oh, one hundred and ninety-one Bottles of Beer on the wall," cr
+." one hundred and ninety-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ninety Bottles of Beer on the wall." cr
+." Oh, one hundred and ninety Bottles of Beer on the wall," cr
+." one hundred and ninety Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and eighty-nine Bottles of Beer on the wall," cr
+." one hundred and eighty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and eighty-eight Bottles of Beer on the wall," cr
+." one hundred and eighty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and eighty-seven Bottles of Beer on the wall," cr
+." one hundred and eighty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and eighty-six Bottles of Beer on the wall," cr
+." one hundred and eighty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and eighty-five Bottles of Beer on the wall," cr
+." one hundred and eighty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and eighty-four Bottles of Beer on the wall," cr
+." one hundred and eighty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and eighty-three Bottles of Beer on the wall," cr
+." one hundred and eighty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and eighty-two Bottles of Beer on the wall," cr
+." one hundred and eighty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and eighty-one Bottles of Beer on the wall," cr
+." one hundred and eighty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighty Bottles of Beer on the wall." cr
+." Oh, one hundred and eighty Bottles of Beer on the wall," cr
+." one hundred and eighty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-nine Bottles of Beer on the wall," cr
+." one hundred and seventy-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-eight Bottles of Beer on the wall," cr
+." one hundred and seventy-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-seven Bottles of Beer on the wall," cr
+." one hundred and seventy-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-six Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-six Bottles of Beer on the wall," cr
+." one hundred and seventy-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-five Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-five Bottles of Beer on the wall," cr
+." one hundred and seventy-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-four Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-four Bottles of Beer on the wall," cr
+." one hundred and seventy-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-three Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-three Bottles of Beer on the wall," cr
+." one hundred and seventy-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-two Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-two Bottles of Beer on the wall," cr
+." one hundred and seventy-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-one Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-one Bottles of Beer on the wall," cr
+." one hundred and seventy-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy Bottles of Beer on the wall," cr
+." one hundred and seventy Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-nine Bottles of Beer on the wall," cr
+." one hundred and sixty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-eight Bottles of Beer on the wall," cr
+." one hundred and sixty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-seven Bottles of Beer on the wall," cr
+." one hundred and sixty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-six Bottles of Beer on the wall," cr
+." one hundred and sixty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-five Bottles of Beer on the wall," cr
+." one hundred and sixty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-four Bottles of Beer on the wall," cr
+." one hundred and sixty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-three Bottles of Beer on the wall," cr
+." one hundred and sixty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-two Bottles of Beer on the wall," cr
+." one hundred and sixty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-one Bottles of Beer on the wall," cr
+." one hundred and sixty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty Bottles of Beer on the wall," cr
+." one hundred and sixty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-nine Bottles of Beer on the wall," cr
+." one hundred and fifty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-eight Bottles of Beer on the wall," cr
+." one hundred and fifty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-seven Bottles of Beer on the wall," cr
+." one hundred and fifty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-six Bottles of Beer on the wall," cr
+." one hundred and fifty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-five Bottles of Beer on the wall," cr
+." one hundred and fifty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-four Bottles of Beer on the wall," cr
+." one hundred and fifty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-three Bottles of Beer on the wall," cr
+." one hundred and fifty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-two Bottles of Beer on the wall," cr
+." one hundred and fifty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-one Bottles of Beer on the wall," cr
+." one hundred and fifty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty Bottles of Beer on the wall," cr
+." one hundred and fifty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-nine Bottles of Beer on the wall," cr
+." one hundred and forty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-eight Bottles of Beer on the wall," cr
+." one hundred and forty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-seven Bottles of Beer on the wall," cr
+." one hundred and forty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-six Bottles of Beer on the wall," cr
+." one hundred and forty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-five Bottles of Beer on the wall," cr
+." one hundred and forty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-four Bottles of Beer on the wall," cr
+." one hundred and forty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-three Bottles of Beer on the wall," cr
+." one hundred and forty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-two Bottles of Beer on the wall," cr
+." one hundred and forty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-one Bottles of Beer on the wall," cr
+." one hundred and forty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty Bottles of Beer on the wall." cr
+." Oh, one hundred and forty Bottles of Beer on the wall," cr
+." one hundred and forty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-nine Bottles of Beer on the wall," cr
+." one hundred and thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-eight Bottles of Beer on the wall," cr
+." one hundred and thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-seven Bottles of Beer on the wall," cr
+." one hundred and thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-six Bottles of Beer on the wall," cr
+." one hundred and thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-five Bottles of Beer on the wall," cr
+." one hundred and thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-four Bottles of Beer on the wall," cr
+." one hundred and thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-three Bottles of Beer on the wall," cr
+." one hundred and thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-two Bottles of Beer on the wall," cr
+." one hundred and thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-one Bottles of Beer on the wall," cr
+." one hundred and thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty Bottles of Beer on the wall," cr
+." one hundred and thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-nine Bottles of Beer on the wall," cr
+." one hundred and twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-eight Bottles of Beer on the wall," cr
+." one hundred and twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-seven Bottles of Beer on the wall," cr
+." one hundred and twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-six Bottles of Beer on the wall," cr
+." one hundred and twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-five Bottles of Beer on the wall," cr
+." one hundred and twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-four Bottles of Beer on the wall," cr
+." one hundred and twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-three Bottles of Beer on the wall," cr
+." one hundred and twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-two Bottles of Beer on the wall," cr
+." one hundred and twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-one Bottles of Beer on the wall," cr
+." one hundred and twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty Bottles of Beer on the wall," cr
+." one hundred and twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and nineteen Bottles of Beer on the wall." cr
+." Oh, one hundred and nineteen Bottles of Beer on the wall," cr
+." one hundred and nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighteen Bottles of Beer on the wall." cr
+." Oh, one hundred and eighteen Bottles of Beer on the wall," cr
+." one hundred and eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventeen Bottles of Beer on the wall." cr
+." Oh, one hundred and seventeen Bottles of Beer on the wall," cr
+." one hundred and seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixteen Bottles of Beer on the wall." cr
+." Oh, one hundred and sixteen Bottles of Beer on the wall," cr
+." one hundred and sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifteen Bottles of Beer on the wall." cr
+." Oh, one hundred and fifteen Bottles of Beer on the wall," cr
+." one hundred and fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fourteen Bottles of Beer on the wall." cr
+." Oh, one hundred and fourteen Bottles of Beer on the wall," cr
+." one hundred and fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirteen Bottles of Beer on the wall." cr
+." Oh, one hundred and thirteen Bottles of Beer on the wall," cr
+." one hundred and thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twelve Bottles of Beer on the wall." cr
+." Oh, one hundred and twelve Bottles of Beer on the wall," cr
+." one hundred and twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eleven Bottles of Beer on the wall." cr
+." Oh, one hundred and eleven Bottles of Beer on the wall," cr
+." one hundred and eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ten Bottles of Beer on the wall." cr
+." Oh, one hundred and ten Bottles of Beer on the wall," cr
+." one hundred and ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and nine Bottles of Beer on the wall." cr
+." Oh, one hundred and nine Bottles of Beer on the wall," cr
+." one hundred and nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eight Bottles of Beer on the wall." cr
+." Oh, one hundred and eight Bottles of Beer on the wall," cr
+." one hundred and eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seven Bottles of Beer on the wall." cr
+." Oh, one hundred and seven Bottles of Beer on the wall," cr
+." one hundred and seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and six Bottles of Beer on the wall." cr
+." Oh, one hundred and six Bottles of Beer on the wall," cr
+." one hundred and six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and five Bottles of Beer on the wall." cr
+." Oh, one hundred and five Bottles of Beer on the wall," cr
+." one hundred and five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and four Bottles of Beer on the wall." cr
+." Oh, one hundred and four Bottles of Beer on the wall," cr
+." one hundred and four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and three Bottles of Beer on the wall." cr
+." Oh, one hundred and three Bottles of Beer on the wall," cr
+." one hundred and three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and two Bottles of Beer on the wall." cr
+." Oh, one hundred and two Bottles of Beer on the wall," cr
+." one hundred and two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and one Bottles of Beer on the wall." cr
+." Oh, one hundred and one Bottles of Beer on the wall," cr
+." one hundred and one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred Bottles of Beer on the wall." cr
+." Oh, one hundred Bottles of Beer on the wall," cr
+." one hundred Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-nine Bottles of Beer on the wall." cr
+." Oh, ninety-nine Bottles of Beer on the wall," cr
+." ninety-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-eight Bottles of Beer on the wall." cr
+." Oh, ninety-eight Bottles of Beer on the wall," cr
+." ninety-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-seven Bottles of Beer on the wall." cr
+." Oh, ninety-seven Bottles of Beer on the wall," cr
+." ninety-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-six Bottles of Beer on the wall." cr
+." Oh, ninety-six Bottles of Beer on the wall," cr
+." ninety-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-five Bottles of Beer on the wall." cr
+." Oh, ninety-five Bottles of Beer on the wall," cr
+." ninety-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-four Bottles of Beer on the wall." cr
+." Oh, ninety-four Bottles of Beer on the wall," cr
+." ninety-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-three Bottles of Beer on the wall." cr
+." Oh, ninety-three Bottles of Beer on the wall," cr
+." ninety-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-two Bottles of Beer on the wall." cr
+." Oh, ninety-two Bottles of Beer on the wall," cr
+." ninety-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-one Bottles of Beer on the wall." cr
+." Oh, ninety-one Bottles of Beer on the wall," cr
+." ninety-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety Bottles of Beer on the wall." cr
+." Oh, ninety Bottles of Beer on the wall," cr
+." ninety Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-nine Bottles of Beer on the wall." cr
+." Oh, eighty-nine Bottles of Beer on the wall," cr
+." eighty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-eight Bottles of Beer on the wall." cr
+." Oh, eighty-eight Bottles of Beer on the wall," cr
+." eighty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-seven Bottles of Beer on the wall." cr
+." Oh, eighty-seven Bottles of Beer on the wall," cr
+." eighty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-six Bottles of Beer on the wall." cr
+." Oh, eighty-six Bottles of Beer on the wall," cr
+." eighty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-five Bottles of Beer on the wall." cr
+." Oh, eighty-five Bottles of Beer on the wall," cr
+." eighty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-four Bottles of Beer on the wall." cr
+." Oh, eighty-four Bottles of Beer on the wall," cr
+." eighty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-three Bottles of Beer on the wall." cr
+." Oh, eighty-three Bottles of Beer on the wall," cr
+." eighty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-two Bottles of Beer on the wall." cr
+." Oh, eighty-two Bottles of Beer on the wall," cr
+." eighty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-one Bottles of Beer on the wall." cr
+." Oh, eighty-one Bottles of Beer on the wall," cr
+." eighty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty Bottles of Beer on the wall." cr
+." Oh, eighty Bottles of Beer on the wall," cr
+." eighty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-nine Bottles of Beer on the wall." cr
+." Oh, seventy-nine Bottles of Beer on the wall," cr
+." seventy-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-eight Bottles of Beer on the wall." cr
+." Oh, seventy-eight Bottles of Beer on the wall," cr
+." seventy-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-seven Bottles of Beer on the wall." cr
+." Oh, seventy-seven Bottles of Beer on the wall," cr
+." seventy-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-six Bottles of Beer on the wall." cr
+." Oh, seventy-six Bottles of Beer on the wall," cr
+." seventy-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-five Bottles of Beer on the wall." cr
+." Oh, seventy-five Bottles of Beer on the wall," cr
+." seventy-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-four Bottles of Beer on the wall." cr
+." Oh, seventy-four Bottles of Beer on the wall," cr
+." seventy-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-three Bottles of Beer on the wall." cr
+." Oh, seventy-three Bottles of Beer on the wall," cr
+." seventy-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-two Bottles of Beer on the wall." cr
+." Oh, seventy-two Bottles of Beer on the wall," cr
+." seventy-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-one Bottles of Beer on the wall." cr
+." Oh, seventy-one Bottles of Beer on the wall," cr
+." seventy-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy Bottles of Beer on the wall." cr
+." Oh, seventy Bottles of Beer on the wall," cr
+." seventy Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-nine Bottles of Beer on the wall." cr
+." Oh, sixty-nine Bottles of Beer on the wall," cr
+." sixty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-eight Bottles of Beer on the wall." cr
+." Oh, sixty-eight Bottles of Beer on the wall," cr
+." sixty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-seven Bottles of Beer on the wall." cr
+." Oh, sixty-seven Bottles of Beer on the wall," cr
+." sixty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-six Bottles of Beer on the wall." cr
+." Oh, sixty-six Bottles of Beer on the wall," cr
+." sixty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-five Bottles of Beer on the wall." cr
+." Oh, sixty-five Bottles of Beer on the wall," cr
+." sixty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-four Bottles of Beer on the wall." cr
+." Oh, sixty-four Bottles of Beer on the wall," cr
+." sixty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-three Bottles of Beer on the wall." cr
+." Oh, sixty-three Bottles of Beer on the wall," cr
+." sixty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-two Bottles of Beer on the wall." cr
+." Oh, sixty-two Bottles of Beer on the wall," cr
+." sixty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-one Bottles of Beer on the wall." cr
+." Oh, sixty-one Bottles of Beer on the wall," cr
+." sixty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty Bottles of Beer on the wall." cr
+." Oh, sixty Bottles of Beer on the wall," cr
+." sixty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-nine Bottles of Beer on the wall." cr
+." Oh, fifty-nine Bottles of Beer on the wall," cr
+." fifty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-eight Bottles of Beer on the wall." cr
+." Oh, fifty-eight Bottles of Beer on the wall," cr
+." fifty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-seven Bottles of Beer on the wall." cr
+." Oh, fifty-seven Bottles of Beer on the wall," cr
+." fifty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-six Bottles of Beer on the wall." cr
+." Oh, fifty-six Bottles of Beer on the wall," cr
+." fifty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-five Bottles of Beer on the wall." cr
+." Oh, fifty-five Bottles of Beer on the wall," cr
+." fifty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-four Bottles of Beer on the wall." cr
+." Oh, fifty-four Bottles of Beer on the wall," cr
+." fifty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-three Bottles of Beer on the wall." cr
+." Oh, fifty-three Bottles of Beer on the wall," cr
+." fifty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-two Bottles of Beer on the wall." cr
+." Oh, fifty-two Bottles of Beer on the wall," cr
+." fifty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-one Bottles of Beer on the wall." cr
+." Oh, fifty-one Bottles of Beer on the wall," cr
+." fifty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty Bottles of Beer on the wall." cr
+." Oh, fifty Bottles of Beer on the wall," cr
+." fifty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-nine Bottles of Beer on the wall." cr
+." Oh, forty-nine Bottles of Beer on the wall," cr
+." forty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-eight Bottles of Beer on the wall." cr
+." Oh, forty-eight Bottles of Beer on the wall," cr
+." forty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-seven Bottles of Beer on the wall." cr
+." Oh, forty-seven Bottles of Beer on the wall," cr
+." forty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-six Bottles of Beer on the wall." cr
+." Oh, forty-six Bottles of Beer on the wall," cr
+." forty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-five Bottles of Beer on the wall." cr
+." Oh, forty-five Bottles of Beer on the wall," cr
+." forty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-four Bottles of Beer on the wall." cr
+." Oh, forty-four Bottles of Beer on the wall," cr
+." forty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-three Bottles of Beer on the wall." cr
+." Oh, forty-three Bottles of Beer on the wall," cr
+." forty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-two Bottles of Beer on the wall." cr
+." Oh, forty-two Bottles of Beer on the wall," cr
+." forty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-one Bottles of Beer on the wall." cr
+." Oh, forty-one Bottles of Beer on the wall," cr
+." forty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty Bottles of Beer on the wall." cr
+." Oh, forty Bottles of Beer on the wall," cr
+." forty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-nine Bottles of Beer on the wall." cr
+." Oh, thirty-nine Bottles of Beer on the wall," cr
+." thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-eight Bottles of Beer on the wall." cr
+." Oh, thirty-eight Bottles of Beer on the wall," cr
+." thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-seven Bottles of Beer on the wall." cr
+." Oh, thirty-seven Bottles of Beer on the wall," cr
+." thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-six Bottles of Beer on the wall." cr
+." Oh, thirty-six Bottles of Beer on the wall," cr
+." thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-five Bottles of Beer on the wall." cr
+." Oh, thirty-five Bottles of Beer on the wall," cr
+." thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-four Bottles of Beer on the wall." cr
+." Oh, thirty-four Bottles of Beer on the wall," cr
+." thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-three Bottles of Beer on the wall." cr
+." Oh, thirty-three Bottles of Beer on the wall," cr
+." thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-two Bottles of Beer on the wall." cr
+." Oh, thirty-two Bottles of Beer on the wall," cr
+." thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-one Bottles of Beer on the wall." cr
+." Oh, thirty-one Bottles of Beer on the wall," cr
+." thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty Bottles of Beer on the wall." cr
+." Oh, thirty Bottles of Beer on the wall," cr
+." thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-nine Bottles of Beer on the wall." cr
+." Oh, twenty-nine Bottles of Beer on the wall," cr
+." twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-eight Bottles of Beer on the wall." cr
+." Oh, twenty-eight Bottles of Beer on the wall," cr
+." twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-seven Bottles of Beer on the wall." cr
+." Oh, twenty-seven Bottles of Beer on the wall," cr
+." twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-six Bottles of Beer on the wall." cr
+." Oh, twenty-six Bottles of Beer on the wall," cr
+." twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-five Bottles of Beer on the wall." cr
+." Oh, twenty-five Bottles of Beer on the wall," cr
+." twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-four Bottles of Beer on the wall." cr
+." Oh, twenty-four Bottles of Beer on the wall," cr
+." twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-three Bottles of Beer on the wall." cr
+." Oh, twenty-three Bottles of Beer on the wall," cr
+." twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-two Bottles of Beer on the wall." cr
+." Oh, twenty-two Bottles of Beer on the wall," cr
+." twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-one Bottles of Beer on the wall." cr
+." Oh, twenty-one Bottles of Beer on the wall," cr
+." twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty Bottles of Beer on the wall." cr
+." Oh, twenty Bottles of Beer on the wall," cr
+." twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." nineteen Bottles of Beer on the wall." cr
+." Oh, nineteen Bottles of Beer on the wall," cr
+." nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighteen Bottles of Beer on the wall." cr
+." Oh, eighteen Bottles of Beer on the wall," cr
+." eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventeen Bottles of Beer on the wall." cr
+." Oh, seventeen Bottles of Beer on the wall," cr
+." seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixteen Bottles of Beer on the wall." cr
+." Oh, sixteen Bottles of Beer on the wall," cr
+." sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifteen Bottles of Beer on the wall." cr
+." Oh, fifteen Bottles of Beer on the wall," cr
+." fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fourteen Bottles of Beer on the wall." cr
+." Oh, fourteen Bottles of Beer on the wall," cr
+." fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirteen Bottles of Beer on the wall." cr
+." Oh, thirteen Bottles of Beer on the wall," cr
+." thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twelve Bottles of Beer on the wall." cr
+." Oh, twelve Bottles of Beer on the wall," cr
+." twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eleven Bottles of Beer on the wall." cr
+." Oh, eleven Bottles of Beer on the wall," cr
+." eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ten Bottles of Beer on the wall." cr
+." Oh, ten Bottles of Beer on the wall," cr
+." ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." nine Bottles of Beer on the wall." cr
+." Oh, nine Bottles of Beer on the wall," cr
+." nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eight Bottles of Beer on the wall." cr
+." Oh, eight Bottles of Beer on the wall," cr
+." eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seven Bottles of Beer on the wall." cr
+." Oh, seven Bottles of Beer on the wall," cr
+." seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six Bottles of Beer on the wall." cr
+." Oh, six Bottles of Beer on the wall," cr
+." six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five Bottles of Beer on the wall." cr
+." Oh, five Bottles of Beer on the wall," cr
+." five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four Bottles of Beer on the wall." cr
+." Oh, four Bottles of Beer on the wall," cr
+." four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three Bottles of Beer on the wall." cr
+." Oh, three Bottles of Beer on the wall," cr
+." three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two Bottles of Beer on the wall." cr
+." Oh, two Bottles of Beer on the wall," cr
+." two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one Bottle of Beer on the wall." cr
+." Oh, one Bottle of Beer on the wall," cr
+." one Bottle of Beer!," cr
+." Take it down and pass it around..." cr
+." How dry I am! How dry I am!" cr
+." No body knows how dry I am." cr
+." How ... Dry I ... Aaaammm." cr
Added: fcode-utils/testsuite/TokMisc/BasicCont.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/BasicCont.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/BasicCont.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,48 @@
+\ Test Basic Control Constructs
+\ Updated Mon, 02 May 2005 at 15:39 by David L. Paktor
+
+
+fcode-version2
+
+headers
+
+: mishka
+ ." begin" begin
+ ." -1 if" -1 if
+ exit
+ ." else" else 0 drop
+ ." then" then
+ ." again" again
+ ." Donshka vith Mishka"
+;
+
+: moose
+ ." begin" begin
+ ." 0 while" 0 while
+ ." repeat" repeat
+ ." Done Vith Moose."
+;
+
+: minski
+ ." 1 0 do" 1 0 do
+ ." i drop" i drop
+ ." Please leave" leave
+ ." loop" loop
+ ." Donesky vith Minski"
+;
+
+: goofsky
+ ." 0 case" 0 case
+ ." 1 of"
+ 1 of ." 1 endof" 1 endof
+ ." 2 of"
+ 2 of ." 2 endof" 2 endof
+ ." 3 of"
+ 3 of ." 3 endof" 3 endof
+ ." default 0" 0
+ ." endcase"
+ endcase
+ ." Donesky vith goofsky."
+;
+
+fcode-end
Added: fcode-utils/testsuite/TokMisc/BatchTst.fth
===================================================================
Added: fcode-utils/testsuite/TokMisc/BranchOverNewBuffer.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/BranchOverNewBuffer.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/BranchOverNewBuffer.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,33 @@
+\ Test case: a normal-size branch that takes place across the point
+\ where the output buffer was expanded.
+\ We will use a body generated by the "Verbal Bottles of Beer" script
+\ To just almost but not quite fill up the buffer.
+\ A parameter of 645 does it
+
+fcode-version2 \ Sixteen-bit offsets.
+
+headers
+
+\ Try various tricks to force an allocation of the space
+\ just above the output buffer so that the realloc of
+\ the output buffer will be forced into a new space
+f[
+ fload LotsOfAliases.fth
+ f]
+
+: a-lot-of-beer
+ ." We're about a third of the way into a school-bus trip" cr
+ ." that started with a thousand bottles." cr
+
+fload Almost_a_Buffer_of_Beer.fth
+
+ 0 if
+
+fload No_Beer.fth
+
+ then
+ ." It's so over."
+;
+
+fcode-end
+
Added: fcode-utils/testsuite/TokMisc/CaseTkns.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/CaseTkns.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/CaseTkns.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,36 @@
+\ Test the new Upper-Case-Token-Names and Lower-Case-Token-Names flags
+\ Updated Tue, 27 Jun 2006 at 11:32 PDT by David L. Paktor
+
+hex headers
+
+fcode-version2
+
+123 constant MiXeD-uP-CaSes-natch
+
+#flag Lower-Case-Token-Names
+
+456 constant MiXeD-uP-TO-LoWeR-Case
+." But This sTrInG KeePS ItS MIxeD CaSEs."
+
+#flag Upper-Case-Token-Names
+
+789 constant Up-mIxEd-tO-uPPer-cASe
+." THis StRiNG KeEpS ItS MiXeD CaSeS tOO."
+
+headerless
+defeca8e constant NoShiT,sHerLocK!
+headers
+
+#flag Lower-Case-Token-Names
+
+0abc constant mIXeD-BaCk-To-Lower-CAsE
+
+#flag noUpper-Case-Token-Names
+
+0def constant mIxEd-BuT-StIlL-To-Lower
+
+#flag noLower-Case-Token-Names
+
+0fed constant BaCk-To-tHe-MiX
+
+fcode-end
Added: fcode-utils/testsuite/TokMisc/ContErr1.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/ContErr1.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/ContErr1.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,50 @@
+\ Another test of cunningly contrived Erroneous Control Constructs.
+\ This one doesn't pass the "Old" tokenizer, even though
+\ it doesn't have the check for Control-Structure matching,
+\ because the way it does its case .. of .. endof ... endcase
+\ is completely incompatible with the way it does its if ... then
+\
+
+\ Updated Wed, 04 May 2005 at 16:26 by David L. Paktor
+
+fcode-version2
+
+headers
+
+
+\ We can't fake this to the "Old" tokenizer, because
+\ it does its case .. of .. endof ... endcase
+\ in a way that's completely incompatible with
+\ the way it does its if ... then
+\ So just test this with the "New".
+
+: garfield
+ ." if" if
+ ." begin" begin
+ ." Question-Leave?" ?leave
+ ." 0 if unloop exit then" 0 if unloop exit then
+ ." Would you be leave..." leave
+ ." loop?" loop
+ ." Done with garfield"
+;
+
+: jon
+ ." begin" begin
+ ." if" if
+ ." endof" endof
+ ." again" again
+ ." then" then
+ ." ouch"
+;
+
+: nermal
+ ." begin noop" begin noop
+ ." if" if
+ ." endof" endof
+ ." loop" loop
+;
+
+: liz-the-vet
+ ." No concluding semicolon"
+
+fcode-end
Added: fcode-utils/testsuite/TokMisc/ContErr2.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/ContErr2.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/ContErr2.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,74 @@
+\ Another test of Erroneous Control Constructs.
+\ Contrived to completely crash the tokenizer...
+
+\ Updated Wed, 03 Aug 2005 at 09:49 by David L. Paktor
+
+
+fcode-version2
+
+headers
+
+\ Seven dwarves:
+\ Happy Grumpy Sleepy Sneezy Dopey Bashful and Doc
+\ Their disfavored cousins:
+\ Crappy Dumpy Sneaky Sleazy Gropey Trashful and Schlock
+: crapsky
+ ." 0 case" 0 case
+ ." 1 of"
+ 1 of ." 1 endof" 1 endof
+ ." 2 of"
+ 2 of ." 2 endof" 2 endof
+ ." 3 of"
+ 3 of ." 3 endof" 3 endof
+ ." default 0" 0
+ ." resolve case w/ then" then
+ ." resolve 3 endof w/ then" then
+ ." resolve 2 endof w/ then" then
+ ." resolve 1 endof w/ then" then
+ ." Donesky vith crapsky."
+;
+
+: dumpsky
+ ." 0 if" 0 if
+ ." free-floating endcase"
+ endcase ." And no then"
+;
+
+: sneaksky
+ ." Free-floating else" else
+ ." And notsnik aftervards."
+;
+
+
+ : gropsky
+ ." A typo. 0 of not 0 if"
+ 0 of
+ ." Misbalanced by a then?"
+ then
+ ." Goobar... Guwno?"
+ ;
+
+: trashsky
+ ." Another typo..."
+ ." 0 case " 0 case
+ ." 10 if not 10 of"
+ 10 if
+ ." Misbalanced by endof."
+ endof
+ ." Not my default."
+ endcase
+ ." That was an endcase just in case"
+;
+
+: schlocksky
+ ." Like trashsky but without final balancer..."
+ ." Another typo..."
+ ." 0 case " 0 case
+ ." 10 if not 10 of"
+ 10 if
+ ." Misbalanced by endof."
+ endof
+ ." No endcase here"
+;
+
+fcode-end
Added: fcode-utils/testsuite/TokMisc/ContErr3.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/ContErr3.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/ContErr3.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,144 @@
+\ An even more severe test of Erroneous Control Constructs.
+
+\ Updated Fri, 28 Jul 2006 at 14:28 PDT by David L. Paktor
+
+fcode-version2
+
+headers
+
+\ Seven dwarves:
+\ Happy Grumpy Sleepy Sneezy Dopey Bashful and Doc
+\ Their disfavored cousins:
+\ Crappy Dumpy Sneaky Sleazy Gropey Trashful and Schlock
+: crapsky
+ ." 0 case" 0 case
+ ." 1 of"
+ 1 of ." 1 endof" 1 endof
+ ." 2 of"
+ 2 of ." 2 endof" 2 endof
+ ." 3 of"
+ 3 of ." 3 endof" 3 endof
+ ." default 0" 0
+ ." resolve case w/ then" then
+ ." resolve 3 endof w/ then" then
+ ." resolve 2 endof w/ then" then
+ ." resolve 1 endof w/ then" then
+ ." Donesky vith crapsky."
+;
+
+: dumpsky
+ ." 0 if" 0 if
+ ." free-floating endcase"
+ endcase ." And no then"
+;
+
+: sneaksky
+ ." Free-floating else" else
+ ." And notsnik aftervards."
+;
+
+ ." While by itself, outside of def'n"
+ while
+
+ : gropsky
+ ." A typo. 0 of not 0 if"
+ 0 of
+ ." Misbalanced by a then?"
+ then
+ ." Goobar... Guwno?"
+ ;
+
+: trashsky
+ ." Another typo..."
+ ." 0 case " 0 case
+ ." 10 if not 10 of"
+ 10 if
+ ." Misbalanced by endof."
+ endof
+ ." Not my default."
+ endcase
+ ." That was an endcase just in case"
+;
+
+: schlocksky
+ ." Like trashsky but without final balancer..."
+ ." Another typo..."
+ ." 0 case " 0 case
+ ." 10 if not 10 of"
+ 10 if
+ ." Misbalanced by endof."
+ endof
+ ." No endcase here"
+;
+
+." We need to be able to detect Leave out of context."
+." Let's see if this can fool it..."
+." 1 0 DO" 1 0 do
+
+: stinsky
+ ." if leave then "
+ if
+ leave
+ then
+;
+
+." 1 begin" 1 begin
+." 1 - ?dup while" 1 - ?dup while
+." What the hey? Loop ?" loop
+
+
+." 1 begin" 1 begin
+." 1 - ?dup while" 1 - ?dup while
+." again then ought to match..."
+again
+then
+
+." How about IF BEGIN without WHILE then REPEAT..."
+." 0 if" 0 if
+begin
+." There's an IF ; where's the WHILE?" #message" There's an IF ; where's the WHILE?"
+repeat
+." That compiles..." #message" Won't be easy to catch."
+
+." How about BEGIN without WHILE then REPEAT..."
+." begin" begin #message" BEGIN without WHILE then REPEAT..."
+." Where's the while?" #message" Where's the while?"
+repeat
+
+
+." repeat without precedent..." repeat
+
+." loop without precedent" loop
+
+." 1 0 DO" 1 0 do
+." What???"
+." repeat..." repeat
+
+#message" Definitions within a loop" ." ...within a loop"
+
+: test_something ( indx -- targ true | false )
+ ." Stub" 2 = dup if h# 1923 swap then
+;
+4 0 do
+ i test_something if
+ ( targ ) value targ ( klingon-pet )
+ : funny_stuff
+ 1 0 do targ u.
+ #message" Error here..." j
+ #message" But not here" 1 0 do j . loop
+ loop test_something
+ ;
+
+ then
+loop
+
+#message" Same line as a loop" ." ...Same line as a loop"
+
+4 0 do i test_something if to targ : runny_stuff begin
+ 1 0 do targ u. #message" Error here, too..." j
+ #message" But not here either" 1 0 do j . loop
+ loop true #message" Missing an until"
+;
+then loop
+
+fcode-end
Added: fcode-utils/testsuite/TokMisc/EncodTst.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/EncodTst.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/EncodTst.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,17 @@
+\ Test and confirm behavior of encode-file and embedded end0
+
+\ Updated Mon, 27 Jun 2005 at 16:35 by David L. Paktor
+
+
+fcode-version2
+
+headers
+
+encode-file EncodeSrc
+
+
+: whatnot
+ if ['] end0 execute then
+;
+
+fcode-end
Added: fcode-utils/testsuite/TokMisc/EncodeSrc
===================================================================
--- fcode-utils/testsuite/TokMisc/EncodeSrc (rev 0)
+++ fcode-utils/testsuite/TokMisc/EncodeSrc 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,6 @@
+This is the symphony that Schubert wrote and never finished
+This is the symphony that Schubert wrote and never ...
+Alma, tell us, all modern women are jealous.
+Which of your magical wands got you Gustav and Walter and Franz?
+Away out here they got a name for rain and wind and fire.
+The rain is Tess, the fire's Joe and they call the wind Mariah.
Added: fcode-utils/testsuite/TokMisc/ExamAllMacs.scr
===================================================================
--- fcode-utils/testsuite/TokMisc/ExamAllMacs.scr (rev 0)
+++ fcode-utils/testsuite/TokMisc/ExamAllMacs.scr 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,51 @@
+#! /bin/csh -f
+#
+# Examine the results of the AllMacros detokenization.
+# All but the last items are in pairs...
+
+set ExamFil = AllMacros.DeTok
+if ( ! -f $ExamFil ) then
+ echo Missing Examination-target file -- $ExamFil
+ exit 237
+endif
+
+# Get the line number that starts the simple pairs,
+# identified by a text message.
+set firstlin = `grep -n 'Start of simple pairs' $ExamFil | awk -F: '{print $1+1}'`
+set lastlin = `grep -n 'End of simple pairs' $ExamFil | awk -F: '{print $1}'`
+
+
+# Get the line numbers of the final phrase-item pair,
+# identified by a text message.
+set lastphrase = `grep -n 'Last phrase-item' $ExamFil | awk -F: '{print $1+1}'`
+
+# We'll need a pair o temp-files
+# First, repository for one of each pair of lines
+set reposfil = /tmp/$0:t.1.$$
+# Second, accumulation of differences
+set accumfil = /tmp/$0:t.2.$$
+
+# Set up to compare two by two.
+# Start with the final phrase-item pair
+set flin = $lastphrase[1]
+set slin = $lastphrase[2]
+set linnum = $firstlin
+while ( $linnum < $lastlin )
+ sed -n ${flin}p $ExamFil | sed -e 'sX^ *[0-9]*: XX' > ${reposfil}
+ sed -n ${slin}p $ExamFil | sed -e 'sX^ *[0-9]*: XX' | diff - ${reposfil} | tee -a ${accumfil}
+
+ set flin = $linnum
+ @ linnum++
+ set slin = $linnum
+ @ linnum++
+end
+
+if ( ! -z ${accumfil} ) then
+ cp -p ${accumfil} ./$0.Results.$$
+ echo Errors seen in $ExamFil. See ./$0.Results.$$ for diffs
+endif
+
+rm -f ${reposfil} ${accumfil}
+
+
+
Property changes on: fcode-utils/testsuite/TokMisc/ExamAllMacs.scr
___________________________________________________________________
Name: svn:executable
+ *
Added: fcode-utils/testsuite/TokMisc/ExtCont.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/ExtCont.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/ExtCont.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,32 @@
+\ Test extended-control constructs
+
+\ Updated Tue, 03 May 2005 at 12:40 by David L. Paktor
+
+fcode-version2
+
+headers
+
+\ First, something ordinary
+: goose
+ ." begin" begin
+ ." 4 until" 4 until
+ ." Done with goose"
+ ;
+ : caboose
+ ." begin" begin
+ ." 5 while" 5 while
+ ." repeat" repeat
+ ." Done with caboose"
+;
+
+: fusbat
+ ." begin" begin
+ ." 1 while" 1 while
+ ." 2 while" 2 while
+ ." 3 until" 3 until
+ ." 2 then" then ( 2 )
+ ." 1 then" then ( 1 )
+ ." Done with fusbat"
+;
+
+fcode-end
Added: fcode-utils/testsuite/TokMisc/FlagSet.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/FlagSet.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/FlagSet.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,34 @@
+\ Special-Feature Flags test
+
+\ Updated Mon, 08 Aug 2005 at 18:22 by David L. Paktor
+
+#flag help
+#flag nohelp
+
+#flag Local-Values
+#flag noLocal-Values
+#flag LV-Legacy-Separator
+#flag noLV-Legacy-Separator
+#flag LV-Legacy-Message
+#flag noLV-Legacy-Message
+#flag ABORT-Quote
+#flag noABORT-Quote
+#flag Sun-ABORT-Quote
+#flag noSun-ABORT-Quote
+#flag String-remark-escape
+#flag noString-remark-escape
+#flag Hex-remark-escape
+#flag noHex-remark-escape
+#flag C-Style-string-escape
+#flag noC-Style-string-escape
+#flag Always-Headers
+#flag NoAlways-Headers
+#flag Always-External
+#flag NoAlways-External
+#flag Warn-if-Duplicate
+#flag noWarn-if-Duplicate
+
+#flags
+
+#flag MoreGimmeMore!
+#flag noMorePleaseNoMore!
Added: fcode-utils/testsuite/TokMisc/FlagsHelp.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/FlagsHelp.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/FlagsHelp.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,3 @@
+\ Empty file to test various cammand-line options relating to Flags Help
+\
+[message] Nothing to be done.
Added: fcode-utils/testsuite/TokMisc/FlgReset.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/FlgReset.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/FlgReset.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,15 @@
+
+[message] Flipping many switches
+
+[flag] Local-Values
+[flag] noLV-Legacy-Separator
+[flag] noLV-Legacy-Message
+[flag] noABORT-Quote
+[flag] noSun-ABORT-Quote
+[flag] noString-remark-escape
+[flag] noC-Style-string-escape
+[flag] Always-Headers
+[flag] noWarn-if-Duplicate
+[flag] noObsolete-FCode-Warning
+
+[FLAGS]
Added: fcode-utils/testsuite/TokMisc/FlgReset_1.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/FlgReset_1.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/FlgReset_1.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,9 @@
+
+[message] Flipping a few switches
+
+[flag] noLocal-Values
+[flag] noHex-remark-escape
+[flag] noAlways-External
+[flag] Obsolete-FCode-Warning
+
+[flags]
Added: fcode-utils/testsuite/TokMisc/FlgReset_2.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/FlgReset_2.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/FlgReset_2.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,5 @@
+
+
+[message] Flipping no switches at all
+
+[flags]
Added: fcode-utils/testsuite/TokMisc/HeadrSettings.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/HeadrSettings.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/HeadrSettings.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,24 @@
+\ Play games with state of header-ness...
+
+
+fcode-version2
+
+." Default is headerless" cr
+10 constant ten-ten-a-big-fat-hen
+
+." Specifying headers hex" cr
+headers hex
+20 constant henty-plenty
+
+
+" Specifying external" cr
+external
+40 constant chirkken-keetchee
+
+: use-it-all ten-ten-a-big-fat-hen henty-plenty chirkken-keetchee ;
+
+end0
+
+headers
+hex
+
Added: fcode-utils/testsuite/TokMisc/LotsOfAliases.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/LotsOfAliases.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/LotsOfAliases.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,71 @@
+
+alias a_70_swap swap
+alias a_69_swap swap
+alias a_68_swap swap
+alias a_67_swap swap
+alias a_66_swap swap
+alias a_65_swap swap
+alias a_64_swap swap
+alias a_63_swap swap
+alias a_62_swap swap
+alias a_61_swap swap
+alias a_60_swap swap
+alias a_59_swap swap
+alias a_58_swap swap
+alias a_57_swap swap
+alias a_56_swap swap
+alias a_55_swap swap
+alias a_54_swap swap
+alias a_53_swap swap
+alias a_52_swap swap
+alias a_51_swap swap
+alias a_50_swap swap
+alias a_49_swap swap
+alias a_48_swap swap
+alias a_47_swap swap
+alias a_46_swap swap
+alias a_45_swap swap
+alias a_44_swap swap
+alias a_43_swap swap
+alias a_42_swap swap
+alias a_41_swap swap
+alias a_40_swap swap
+alias a_39_swap swap
+alias a_38_swap swap
+alias a_37_swap swap
+alias a_36_swap swap
+alias a_35_swap swap
+alias a_34_swap swap
+alias a_33_swap swap
+alias a_32_swap swap
+alias a_31_swap swap
+alias a_30_swap swap
+alias a_29_swap swap
+alias a_28_swap swap
+alias a_27_swap swap
+alias a_26_swap swap
+alias a_25_swap swap
+alias a_24_swap swap
+alias a_23_swap swap
+alias a_22_swap swap
+alias a_21_swap swap
+alias a_20_swap swap
+alias a_19_swap swap
+alias a_18_swap swap
+alias a_17_swap swap
+alias a_16_swap swap
+alias a_15_swap swap
+alias a_14_swap swap
+alias a_13_swap swap
+alias a_12_swap swap
+alias a_11_swap swap
+alias a_10_swap swap
+alias a_9_swap swap
+alias a_8_swap swap
+alias a_7_swap swap
+alias a_6_swap swap
+alias a_5_swap swap
+alias a_4_swap swap
+alias a_3_swap swap
+alias a_2_swap swap
+alias a_1_swap swap
Added: fcode-utils/testsuite/TokMisc/MinPCIHtst.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/MinPCIHtst.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/MinPCIHtst.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,25 @@
+\ Minimal basic PCI-Header test.
+
+\ Updated Tue, 24 May 2005 at 11:22 by David L. Paktor
+
+hex
+tokenizer[
+
+ c020
+ SET-REV-LEVEL
+ dec1 \ Vendor
+ c0ed \ Device ID
+ a8d2e1 \ Class Code
+ pci-header
+ ]tokenizer
+
+
+fcode-version2
+
+headers
+ : bogo " This is a test." ;
+
+
+fcode-end
+
+pci-header-end
Added: fcode-utils/testsuite/TokMisc/MiscFeatures.DOS.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/MiscFeatures.DOS.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/MiscFeatures.DOS.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,73 @@
+\ Obvious pun intended...
+\ Updated Tue, 31 May 2005 at 12:07 by David L. Paktor
+
+
+alias // \
+fcode-version2
+
+headers
+
+// What is this?
+//
+char G emit
+control G emit
+control [ emit
+: bell
+ [char] G dup
+ control G 3drop
+;
+
+: factl recursive ( n -- n! )
+ ?dup 0= if 1
+ else dup 1- * factl
+ then
+;
+
+: factl ( n -- n! )
+ ?dup 0= if 1 factl
+ else dup 1- recurse *
+ then
+;
+
+variable naught
+defer do-nothing
+20 value twenty
+30 value thirty
+40 buffer: forty
+50 constant fifty
+create three 0 , 00 , h# 000 ,
+struct
+4 field >four
+constant /four
+
+: peril
+ ['] noop is do-nothing
+ 100 is thirty
+ 5 is naught
+ thirty dup - abort" Never Happen"
+;
+
+: thirty ( new-val -- )
+ dup to thirty
+ alias .dec .d \ Should this be allowed?
+ ." Dirty" .dec
+;
+tokenizer[
+alias fliteral1 fliteral // This should be a harmless remark.
+h# deadc0de ]tokenizer fliteral1
+
+: droop ( -- )
+ twenty
+ tokenizer[
+ alias .x .h \ Should this generate a warning?
+ ]tokenizer
+ 0 ?do i .x loop
+;
+: ploop ( -- )
+ fifty 0 do i drop 2 +loop
+;
+
+fcode-end
+
+
+
Added: fcode-utils/testsuite/TokMisc/MiscFeatures.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/MiscFeatures.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/MiscFeatures.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,139 @@
+\ Obvious pun intended...
+\ Updated Fri, 10 Feb 2006 at 15:53 PST by David L. Paktor
+
+alias // \
+fcode-version2
+
+headers
+
+// What is this?
+//
+char G emit
+control G emit
+control [ emit
+global-definitions
+\ Each dev-node will create its own debug-flag and alias it to debug-me?
+\ Each dev-node will create a macro called my-dev-name giving its device-name
+ [macro] .fname&dev [function-name] type ." in " my-dev-name type
+ [macro] name-my-dev my-dev-name device-name
+ [macro] .dbg-enter debug-me? @ if ." Entering " .fname&dev cr then
+ [macro] .dbg-leave debug-me? @ if ." Leaving " .fname&dev cr then
+device-definitions
+
+\ Top-most device, named billy
+[macro] my-dev-name " billy"
+name-my-dev
+
+variable debug-bell? debug-bell? off alias debug-me? debug-bell?
+: bell
+ .dbg-enter
+ [char] G dup
+ control G 3drop
+ .dbg-leave
+;
+
+: factl recursive ( n -- n! )
+ ." Entering First vers. of " [function-name] type cr
+ ?dup 0= if 1
+ else dup 1- factl *
+ then
+ ." Leaving First vers. of " [function-name] type cr
+;
+
+: factl ( n -- n! )
+ ." Entering Second vers. of " [function-name] type cr
+ ?dup 0= if 1 factl
+ else dup 1- recurse *
+ then
+ ." Leaving Second vers. of " [function-name] type cr
+;
+
+variable naught
+defer do-nothing
+20 value twenty
+30 value thirty
+40 buffer: forty
+50 constant fifty
+create three 0 , 00 , h# 000 ,
+struct
+4 field >four
+constant /four
+
+: peril
+ .dbg-enter
+ ['] noop is do-nothing
+ 100 is thirty
+ 5 is naught
+ thirty dup - abort" Never Happen"
+ .dbg-leave
+;
+
+: thirty ( new-val -- )
+ .dbg-enter
+ dup to thirty
+ alias .dec .d \ Should this be allowed?
+ ." Dirty" .dec
+ .dbg-leave
+;
+tokenizer[
+alias fliteral1 fliteral // This should be a harmless remark.
+h# deadc0de ]tokenizer fliteral1
+
+\ First subsidiary device, "child" of billy
+new-device
+ instance variable cheryl
+ [macro] my-dev-name " cheryl"
+ name-my-dev
+
+ instance
+ \ Third-level device, "grandchild" of billy
+ new-device
+ [macro] my-dev-name " meryl"
+ name-my-dev
+
+ variable beryl
+
+ variable debug-meryl? debug-meryl? off
+ alias debug-me? debug-meryl?
+ : meryl
+ .dbg-enter
+ cheryl
+ alias .deck .dec
+ alias feral cheryl
+ alias .heck .h
+ .dbg-leave
+ ;
+ finish-device
+
+ \ Now we're back to "cheryl"
+
+ variable debug-cheryl? debug-cheryl? off
+ alias debug-me? debug-cheryl?
+ : queryl
+ .dbg-enter
+ over rot dup nip drop swap \ Not the most useful code... ;-}
+ .dbg-leave
+ ;
+finish-device
+
+\ And we're back to billy.
+: droop ( -- )
+ .dbg-enter \ This will display Entering droop in billy
+ twenty
+ tokenizer[
+ alias .x .h \ Should this generate a warning?
+ ]tokenizer
+ 0 ?do i .x loop
+ .dbg-leave
+;
+headerless
+: ploop ( -- )
+ .dbg-enter
+ fifty 0 do i drop 2 +loop
+ .dbg-leave
+;
+
+fcode-end
+
+
+
Added: fcode-utils/testsuite/TokMisc/MiscFeaturesCopy.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/MiscFeaturesCopy.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/MiscFeaturesCopy.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,65 @@
+\ Obvious pun intended...
+\ Updated Tue, 19 Apr 2005 at 17:28 by David L. Paktor
+
+fcode-version2
+
+headers
+
+char G emit
+control G emit
+control [ emit
+: bell
+ [char] G dup
+ control G 3drop
+;
+
+: factl recursive ( n -- n! )
+ ?dup 0= if 1
+ else dup 1- * factl
+ then
+;
+
+: factl ( n -- n! )
+ ?dup 0= if 1 factl
+ else dup 1- recurse *
+ then
+;
+
+variable naught
+defer do-nothing
+20 value twenty
+30 value thirty
+40 buffer: forty
+50 constant fifty
+create three 0 , 00 , h# 000 ,
+struct
+4 field >four
+constant /four
+
+: peril
+ ['] noop is do-nothing
+ 100 is thirty
+ 5 is naught
+;
+
+: thirty ( new-val -- )
+ dup to thirty
+ alias .dec .d \ Should this be allowed?
+ ." Dirty" .dec
+;
+
+: droop ( -- )
+ twenty
+ tokenizer[
+ alias .x .h \ Should this generate a warning?
+ ]tokenizer
+ 0 ?do i .x loop
+;
+: ploop ( -- )
+ fifty 0 do i drop 2 +loop
+;
+
+fcode-end
+
+
+
Added: fcode-utils/testsuite/TokMisc/MiscFeaturesXtra.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/MiscFeaturesXtra.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/MiscFeaturesXtra.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,15 @@
+\ See if names from a previous tokenization linger in a subsequent one.
+
+\ Updated Wed, 06 Apr 2005 at 11:32 by David L. Paktor
+
+fcode-version2
+
+headers
+: peril ( new-val -- )
+ dup to twenty
+ ['] peril is do-nothing
+ d# 17 is naught
+;
+
+
+fcode-end
Added: fcode-utils/testsuite/TokMisc/MulDev.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/MulDev.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/MulDev.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,40 @@
+\ Test creating multiple device-nodes
+\ Let's contrive this to (almost...) pass the "Original" tokenizer as well,
+\ and display the contrast.
+\ Updated Mon, 30 May 2005 at 19:44 by David L. Paktor
+
+alias // \
+// Funny kind of comment. What? C-Plus style? Not even a "B"...
+
+fcode-version2
+
+headers
+
+create (sis 6 c, 8 c, 12 c,
+: err-shoot) ( -- 0 ) h# defeca8e .h ;
+: eatit( h# feedface .h cr ;
+: open ( -- success )
+ err-shoot)
+ ." No dice, Cholly." cr
+ eatit(
+ false
+;
+
+" sis" encode-string " name" property
+
+finish-device
+new-device
+
+: eatit( h# 900df00d .h cr ; \ This should be a new definition
+
+: open ( -- success )
+ err-shoot) \ This should be an "Unknown Word"
+ ." I'm sorry, Dave. I can't do that." cr
+ eatit( \ This should be the above
+ \ new definition in any case.
+ false
+;
+
+" boombah" encode-string " name" property
+
+fcode-end
Added: fcode-utils/testsuite/TokMisc/MulDev_01.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/MulDev_01.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/MulDev_01.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,69 @@
+\ Test multiple device-nodes with injected erorrs... ;-}
+
+\ Updated Thu, 04 Aug 2005 at 16:42 by David L. Paktor
+
+
+fcode-version2
+
+headers
+
+alias rc! rb!
+
+[message] Top-Level (root) device-node
+create achin 12 c, 13 c, 14 c,
+: breakin achin 3 bounds do i c@ . loop ;
+: creakin 0 if breakin then ;
+: deacon achin creakin drop breakin ;
+
+[message] Subsidiary (child) device-node
+new-device
+create eek! 18 c, 17 c, 80 c, 79 c,
+: freek eek! 4 bounds ?do i c@ . 1 +loop ;
+: greek -1 if freek then ;
+[message] About to access method from parent node
+: hierareek
+ eek!
+ freek
+ achin
+ greek
+;
+: ikey hierareek freek greek ;
+[message] about to end child node
+finish-device
+[message] We can access methods from the root node now
+: jeeky
+ achin
+ 3 type
+;
+[message] create sibling node
+new-device
+0 value inky
+: kinky
+ " "( \
+ \ value offset
+ 03 22 \ Comm Params (offset 22) = parity check (bit 0) even (bit 1)
+ 4 17 \ Plex (offs 17) = full (bit 2)
+ b7 0e \ Bells (offs 0e) = Bits 7,6,4,2,1,0 (No church or Gamelon)
+ 7f 0f \ Bell volume (offs 0f) = Just under halfway
+ 89 10 \ Whistles (offs 10) = Foghorn, Train, Piccolo (Bits 7,3,0)
+ ff 18 \ Foghorn duration (offs 18) = maximum
+ 22 14 \ Train-whistle (offs 14) = two short blasts
+ 03 11 \ Piccolo = mercifully short
+ )"
+ bounds do i c@ i 1+ c@ inky + rc! 2 +loop
+;
+
+[message] creating nephew node
+new-device
+
+: open kinky true ;
+
+[message] creating great-nephew node
+new-device
+
+: open
+ jeeky
+ kinky
+ true ;
+
+fcode-end
Added: fcode-utils/testsuite/TokMisc/MulDev_02.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/MulDev_02.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/MulDev_02.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,71 @@
+\ Test multiple device-nodes with injected erorrs... ;-}
+\ MulDev_02.fth -- slight variant relative to MulDev_01.fth
+
+\ Updated Thu, 12 Jan 2006 at 15:36 PST by David L. Paktor
+
+global-definitions
+ alias rc! rb!
+device-definitions
+
+fcode-version2
+
+headers
+
+[message] Top-Level (root) device-node
+create achin 12 c, 13 c, 14 c,
+: breakin achin 3 bounds do i c@ . loop ;
+: creakin 0 if breakin then ;
+: deacon achin creakin drop breakin ;
+
+[message] Subsidiary (child) device-node
+new-device
+create eek! 18 c, 17 c, 80 c, 79 c,
+: freek eek! 4 bounds ?do i c@ . 1 +loop ;
+: greek -1 if freek then ;
+[message] About to access method from parent node
+: hierareek
+ eek!
+ freek
+ achin
+ greek
+;
+: ikey hierareek freek greek ;
+[message] about to end child node
+finish-device
+[message] We can access methods from the root node now
+: jeeky
+ achin
+ 3 type
+;
+[message] create sibling node
+new-device
+0 value inky
+: kinky
+ " "( \
+ \ value offset
+ 03 22 \ Comm Params (offset 22) = parity check (bit 0) even (bit 1)
+ 4 17 \ Plex (offs 17) = full (bit 2)
+ b7 0e \ Bells (offs 0e) = Bits 7,6,4,2,1,0 (No church or Gamelon)
+ 7f 0f \ Bell volume (offs 0f) = Just under halfway
+ 89 10 \ Whistles (offs 10) = Foghorn, Train, Piccolo (Bits 7,3,0)
+ ff 18 \ Foghorn duration (offs 18) = maximum
+ 22 14 \ Train-whistle (offs 14) = two short blasts
+ 03 11 \ Piccolo = mercifully short
+ )"
+ bounds do i c@ i 1+ c@ inky + rc! 2 +loop
+;
+
+[message] creating nephew node
+new-device
+
+: open kinky true ;
+
+[message] creating great-nephew node
+new-device
+
+: open
+ jeeky
+ kinky
+ true ;
+
+fcode-end
Added: fcode-utils/testsuite/TokMisc/No_Beer.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/No_Beer.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/No_Beer.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,3 @@
+." How dry I am! How dry I am!" cr
+." No body knows how dry I am." cr
+." How ... Dry I ... Aaaammm." cr
Added: fcode-utils/testsuite/TokMisc/OldTkzr/ContErr0.OldTkzr.DeTok
===================================================================
--- fcode-utils/testsuite/TokMisc/OldTkzr/ContErr0.OldTkzr.DeTok (rev 0)
+++ fcode-utils/testsuite/TokMisc/OldTkzr/ContErr0.OldTkzr.DeTok 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,195 @@
+\ Welcome to the OpenBIOS detokenizer v0.6.1
+\ detok Copyright(c) 2001-2005 by Stefan Reinauer.
+\ Written by Stefan Reinauer, <stepan(a)openbios.org>
+\ This program is free software; you may redistribute it under the terms of
+\ the GNU General Public License. This program has absolutely no warranty.
+\
+\ (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ 0: start1 ( 0x0f1 ) ( 16-bit offsets)
+ 1: format: 0x08
+ 2: checksum: 0xf891 (Ok)
+ 4: len: 0x0302 ( 770 bytes)
+ 8: named-token ( 0x0b6 ) garfield 0x800
+ 20: b(:) ( 0x0b7 )
+ 21: b(") ( 0x012 ) ( len=2 )
+ " if"
+ 25: type ( 0x090 )
+ 26: b?branch ( 0x014 ) 0x004e ( =dec 78 dest = 105 )
+ 29: b(") ( 0x012 ) ( len=5 )
+ " begin"
+ 36: type ( 0x090 )
+ 37: b(<mark) ( 0x0b1 )
+ 38: b(") ( 0x012 ) ( len=0x15 [21 bytes] )
+ " 0 if unloop exit then"
+ 61: type ( 0x090 )
+ 62: 0 ( 0x0a5 )
+ 63: b?branch ( 0x014 ) 0x0005 ( dest = 69 )
+ 66: unloop ( 0x089 )
+ 67: exit ( 0x033 )
+ 68: b(>resolve) ( 0x0b2 )
+ 69: b(") ( 0x012 ) ( len=0x15 [21 bytes] )
+ " Would you be leave..."
+ 92: type ( 0x090 )
+ 93: b(leave) ( 0x01b )
+ 94: b(") ( 0x012 ) ( len=5 )
+ " loop?"
+ 101: type ( 0x090 )
+ 102: b(loop) ( 0x015 ) 0xffbf ( =dec -65 dest = 38 )
+ 105: b(") ( 0x012 ) ( len=0x12 [18 bytes] )
+ " Done with garfield"
+ 125: type ( 0x090 )
+ 126: b(;) ( 0x0c2 )
+ 127: named-token ( 0x0b6 ) odie 0x801
+ 135: b(:) ( 0x0b7 )
+ 136: b(") ( 0x012 ) ( len=7 )
+ " 0 0 ?do"
+ 145: type ( 0x090 )
+ 146: 0 ( 0x0a5 )
+ 147: 0 ( 0x0a5 )
+ 148: b(?do) ( 0x018 ) 0x005b ( =dec 91 dest = 240 )
+ 151: b(") ( 0x012 ) ( len=6 )
+ " i drop"
+ 159: type ( 0x090 )
+ 160: i ( 0x019 )
+ 161: drop ( 0x046 )
+ 162: b(") ( 0x012 ) ( len=0x18 [24 bytes] )
+ " zero if unloop exit then"
+ 188: type ( 0x090 )
+ 189: 0 ( 0x0a5 )
+ 190: b?branch ( 0x014 ) 0x0005 ( dest = 196 )
+ 193: unloop ( 0x089 )
+ 194: exit ( 0x033 )
+ 195: b(>resolve) ( 0x0b2 )
+ 196: b(") ( 0x012 ) ( len=0x15 [21 bytes] )
+ " Who would be leave..."
+ 219: type ( 0x090 )
+ 220: b(leave) ( 0x01b )
+ 221: b(") ( 0x012 ) ( len=5 )
+ " again"
+ 228: type ( 0x090 )
+ 229: bbranch ( 0x013 ) 0xffb1 ( =dec -79 dest = 151 )
+ 232: b(") ( 0x012 ) ( len=4 )
+ " then"
+ 238: type ( 0x090 )
+ 239: b(>resolve) ( 0x0b2 )
+ 240: b(") ( 0x012 ) ( len=0xe [14 bytes] )
+ " Done with odie"
+ 256: type ( 0x090 )
+ 257: b(;) ( 0x0c2 )
+ 258: b(") ( 0x012 ) ( len=0x11 [17 bytes] )
+ " Outside of colon"
+ 277: type ( 0x090 )
+ 278: b(") ( 0x012 ) ( len=6 )
+ " 1 0 do"
+ 286: type ( 0x090 )
+ 287: 1 ( 0x0a6 )
+ 288: 0 ( 0x0a5 )
+ 289: b(do) ( 0x017 ) 0x004b ( =dec 75 dest = 365 )
+ 292: i ( 0x019 )
+ 293: named-token ( 0x0b6 ) what? 0x802
+ 302: b(constant) ( 0x0ba )
+ 303: b(") ( 0x012 ) ( len=0x28 [40 bytes] )
+ " This is actually supposed to be legit..."
+ 345: type ( 0x090 )
+ 346: b(") ( 0x012 ) ( len=5 )
+ " again"
+ 353: type ( 0x090 )
+ 354: bbranch ( 0x013 ) 0xffc1 ( =dec -63 dest = 292 )
+ 357: b(") ( 0x012 ) ( len=4 )
+ " then"
+ 363: type ( 0x090 )
+ 364: b(>resolve) ( 0x0b2 )
+ 365: b(") ( 0x012 ) ( len=0x17 [23 bytes] )
+ " Was that awful or what?"
+ 390: type ( 0x090 )
+ 391: b(lit) ( 0x010 ) 0x5000
+ 396: named-token ( 0x0b6 ) /DHCP-SCRATCH 0x803
+ 413: b(constant) ( 0x0ba )
+ 414: /DHCP-SCRATCH ( 0x803 )
+ 416: b(') ( 0x011 ) alloc-mem ( 0x08b )
+ 418: b(") ( 0x012 ) ( len=0x16 [22 bytes] )
+ " dhcp-scratch alloc-mem"
+ 442: type ( 0x090 )
+ 443: cr ( 0x092 )
+ 444: .s ( 0x09f )
+ 445: cr ( 0x092 )
+ 446: catch ( 0x217 )
+ 448: b(") ( 0x012 ) ( len=0x1c [28 bytes] )
+ " catch dhcp-scratch alloc-mem"
+ 478: type ( 0x090 )
+ 479: cr ( 0x092 )
+ 480: .s ( 0x09f )
+ 481: cr ( 0x092 )
+ 482: ?dup ( 0x050 )
+ 483: b?branch ( 0x014 ) 0x003b ( =dec 59 dest = 543 )
+ 486: b(") ( 0x012 ) ( len=0x13 [19 bytes] )
+ " alloc-mem Failed!!!"
+ 507: type ( 0x090 )
+ 508: cr ( 0x092 )
+ 509: .s ( 0x09f )
+ 510: cr ( 0x092 )
+ 511: throw ( 0x218 )
+ 513: b(") ( 0x012 ) ( len=0x16 [22 bytes] )
+ " This is also worng..."
+ 537: type ( 0x090 )
+ 538: exit ( 0x033 )
+ 539: bbranch ( 0x013 ) 0x0029 ( =dec 41 dest = 581 )
+ 542: b(>resolve) ( 0x0b2 )
+ 543: b(") ( 0x012 ) ( len=0xf [15 bytes] )
+ " alloc-mem okay."
+ 560: type ( 0x090 )
+ 561: .s ( 0x09f )
+ 562: cr ( 0x092 )
+ 563: named-token ( 0x0b6 ) DHCP-SCRATCH 0x804
+ 579: b(constant) ( 0x0ba )
+ 580: b(>resolve) ( 0x0b2 )
+ 581: named-token ( 0x0b6 ) crazy-aces 0x805
+ 595: b(:) ( 0x0b7 )
+ 596: b(case) ( 0x0c4 )
+ 597: 0 ( 0x0a5 )
+ 598: b(of) ( 0x01c ) 0x0000 ( dest = 599 )
+\ Error: Unresolved offset.
+ 601: b(") ( 0x012 ) ( len=0xd [13 bytes] )
+ " And a-nutt'n'"
+ 616: type ( 0x090 )
+ 617: 1 ( 0x0a6 )
+ 618: b(of) ( 0x01c ) 0x0000 ( dest = 619 )
+\ Error: Unresolved offset.
+ 621: b(") ( 0x012 ) ( len=9 )
+ " And a-won"
+ 632: type ( 0x090 )
+ 633: 2 ( 0x0a7 )
+ 634: b(of) ( 0x01c ) 0x0000 ( dest = 635 )
+\ Error: Unresolved offset.
+ 637: b(") ( 0x012 ) ( len=9 )
+ " And a-too"
+ 648: type ( 0x090 )
+ 649: 3 ( 0x0a8 )
+ 650: b(of) ( 0x01c ) 0x0000 ( dest = 651 )
+\ Error: Unresolved offset.
+ 653: b(") ( 0x012 ) ( len=0xa [10 bytes] )
+ " And a-tree"
+ 665: type ( 0x090 )
+ 666: b(lit) ( 0x010 ) 0x4
+ 671: b(of) ( 0x01c ) 0x0000 ( dest = 672 )
+\ Error: Unresolved offset.
+ 674: b(") ( 0x012 ) ( len=0xa [10 bytes] )
+ " and afford"
+ 686: type ( 0x090 )
+ 687: b(lit) ( 0x010 ) 0x5
+ 692: b(of) ( 0x01c ) 0x0028 ( =dec 40 dest = 733 )
+ 695: b(") ( 0x012 ) ( len=0xb [11 bytes] )
+ " Dat's enuff"
+ 708: type ( 0x090 )
+ 709: b(") ( 0x012 ) ( len=0x14 [20 bytes] )
+ " It's not my default!"
+ 731: type ( 0x090 )
+ 732: b(endcase) ( 0x0c5 )
+ 733: b(") ( 0x012 ) ( len=0x20 [32 bytes] )
+ " Just in case you end up here..."
+ 767: type ( 0x090 )
+ 768: b(;) ( 0x0c2 )
+ 769: end0 ( 0x000 )
+\ Detokenization finished normally after 770 bytes.
+End of file.
+
Added: fcode-utils/testsuite/TokMisc/OldTkzr/ContErr0.OldTkzr.Log
===================================================================
--- fcode-utils/testsuite/TokMisc/OldTkzr/ContErr0.OldTkzr.Log (rev 0)
+++ fcode-utils/testsuite/TokMisc/OldTkzr/ContErr0.OldTkzr.Log 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,7 @@
+Welcome to toke - OpenBIOS tokenizer v0.6.8
+Copyright (c) 2001-2005 by Stefan Reinauer <stepan(a)openbios.org>
+This program is free software; you may redistribute it under the terms of
+the GNU General Public License. This program has absolutely no warranty.
+
+toke: checksum is 0xf891 (770 bytes)
+toke: wrote 770 bytes to bytecode file 'ContErr0.OldTkzr.fc'
Added: fcode-utils/testsuite/TokMisc/OldTkzr/ContErr0.OldTkzr.fc
===================================================================
(Binary files differ)
Property changes on: fcode-utils/testsuite/TokMisc/OldTkzr/ContErr0.OldTkzr.fc
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: fcode-utils/testsuite/TokMisc/OldTkzr/ContErr0.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/OldTkzr/ContErr0.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/OldTkzr/ContErr0.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,73 @@
+\ Test Erroneous Control Constructs, cunningly contrived
+\ to pass the "Old" tokenizer, which doesn't have the
+\ check for Control-Structure matching.
+
+\ Updated Thu, 29 Jun 2006 at 14:52 PDT by David L. Paktor
+
+
+fcode-version2
+
+headers
+
+: garfield
+ ." if" if
+ ." begin" begin
+ \ \ Leave this out because Old tokenizer duzzent dew it rite....
+ \ ." Question-Leave?" ?leave
+ ." 0 if unloop exit then" 0 if unloop exit then
+ ." Would you be leave..." leave
+ ." loop?" loop
+ ." Done with garfield"
+;
+
+: odie
+ ." 0 0 ?do" 0 0 ?do
+ ." i drop" i drop
+ ." zero if unloop exit then" 0 if unloop exit then
+ ." Who would be leave..." leave
+ ." again" again
+ ." then" then
+ ." Done with odie"
+;
+
+." Outside of colon"
+." 1 0 do" 1 0 do
+ i constant what? ." This is actually supposed to be legit..."
+." again" again
+." then" then
+." Was that awful or what?"
+
+\ Snippet similar to something in Firmworks manual
+
+h# 5000 constant /DHCP-SCRATCH
+
+/DHCP-SCRATCH ( size ) ['] alloc-mem
+." dhcp-scratch alloc-mem" cr .s cr
+catch
+." catch dhcp-scratch alloc-mem" cr .s cr
+?dup if
+ ." alloc-mem Failed!!!" cr .s cr
+ throw
+ ." This is also worng..." exit
+else
+ ." alloc-mem okay." .s cr
+ ( vaddr )
+ ( vaddr ) constant DHCP-SCRATCH
+then
+
+\ A CASE statement where the ENDOFs are missing
+\ still passes the "Old" tokenizer.
+
+: crazy-aces ( n -- )
+ case
+ 0 of ." And a-nutt'n'"
+ 1 of ." And a-won"
+ 2 of ." And a-too"
+ 3 of ." And a-tree"
+ 4 of ." and afford"
+ 5 of ." Dat's enuff"
+ ( default ) ." It's not my default!"
+ endcase ." Just in case you end up here..."
+;
+
+fcode-end
Added: fcode-utils/testsuite/TokMisc/OldTkzr/SimplStrEscs.OldTkzr.DeTok
===================================================================
--- fcode-utils/testsuite/TokMisc/OldTkzr/SimplStrEscs.OldTkzr.DeTok (rev 0)
+++ fcode-utils/testsuite/TokMisc/OldTkzr/SimplStrEscs.OldTkzr.DeTok 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,42 @@
+\ Welcome to the OpenBIOS detokenizer v0.6.1
+\ detok Copyright(c) 2001-2005 by Stefan Reinauer.
+\ Written by Stefan Reinauer, <stepan(a)openbios.org>
+\ This program is free software; you may redistribute it under the terms of
+\ the GNU General Public License. This program has absolutely no warranty.
+\
+\ (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ 0: start1 ( 0x0f1 ) ( 16-bit offsets)
+ 1: format: 0x08
+ 2: checksum: 0x8805 (Ok)
+ 4: len: 0x0187 ( 391 bytes)
+ 8: b(") ( 0x012 ) ( len=0x2e [46 bytes] )
+ " Let's also test a few string-escape sequences:"
+ 56: type ( 0x090 )
+ 57: b(") ( 0x012 ) ( len=0x2c [44 bytes] )
+ " "( 09 )ab"( 0a )ew-line""uote"( 0d )eturn"( 0c )orm-feed"( 08 )ackspace"( 07 )ell"
+ 103: type ( 0x090 )
+ 104: b(") ( 0x012 ) ( len=0x20 [32 bytes] )
+ " "( 03 )ontrol-D:ontrol-brace is Escape"
+ 138: type ( 0x090 )
+ 139: b(") ( 0x012 ) ( len=0x1c [28 bytes] )
+ " First try these two in hex:"
+ 169: type ( 0x090 )
+ 170: b(") ( 0x012 ) ( len=0x2b [43 bytes] )
+ " Backslash-n"( 0a )NewLine"( 09 )TabJd-a-OneTwoThreeFour"
+ 215: type ( 0x090 )
+ 216: b(") ( 0x012 ) ( len=0x29 [41 bytes] )
+ " Backslashes on both ends:4OneTwoThreeFour"
+ 259: type ( 0x090 )
+ 260: b(") ( 0x012 ) ( len=0x24 [36 bytes] )
+ " Try them again, but now in decimal:"
+ 298: type ( 0x090 )
+ 299: b(") ( 0x012 ) ( len=0x2c [44 bytes] )
+ " Backslash-n"( 0a )NewLine"( 09 )Tab"( d2 )nd-a-OneTwoThreeFour"
+ 345: type ( 0x090 )
+ 346: b(") ( 0x012 ) ( len=0x29 [41 bytes] )
+ " Backslashes on both ends:"( d2 )OneTwoThreeFour"
+ 389: type ( 0x090 )
+ 390: end0 ( 0x000 )
+\ Detokenization finished normally after 391 bytes.
+End of file.
+
Added: fcode-utils/testsuite/TokMisc/OldTkzr/SimplStrEscs.OldTkzr.Log
===================================================================
--- fcode-utils/testsuite/TokMisc/OldTkzr/SimplStrEscs.OldTkzr.Log (rev 0)
+++ fcode-utils/testsuite/TokMisc/OldTkzr/SimplStrEscs.OldTkzr.Log 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,7 @@
+Welcome to toke - OpenBIOS tokenizer v0.6.8
+Copyright (c) 2001-2005 by Stefan Reinauer <stepan(a)openbios.org>
+This program is free software; you may redistribute it under the terms of
+the GNU General Public License. This program has absolutely no warranty.
+
+toke: checksum is 0x8805 (391 bytes)
+toke: wrote 391 bytes to bytecode file 'SimplStrEscs.OldTkzr.fc'
Added: fcode-utils/testsuite/TokMisc/OldTkzr/SimplStrEscs.OldTkzr.fc
===================================================================
(Binary files differ)
Property changes on: fcode-utils/testsuite/TokMisc/OldTkzr/SimplStrEscs.OldTkzr.fc
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: fcode-utils/testsuite/TokMisc/OldTkzr/SimplStrEscs.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/OldTkzr/SimplStrEscs.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/OldTkzr/SimplStrEscs.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,22 @@
+\ A few simple string-escape sequences.
+\ See which ones the "Old" tokenizer handles differently...
+
+
+fcode-version2
+
+." Let's also test a few string-escape sequences:"
+." "ttab"nnew-line""quote"rreturn"fform-feed"bbackspace"!bell"
+." "^Dcontrol-D"^{Control-brace is Escape"
+
+." First try these two in hex:"
+hex
+
+." Backslash-n\nNewLine\tTab\1234And-a-OneTwoThreeFour"
+." Backslashes on both ends:\1234\OneTwoThreeFour"
+
+." Try them again, but now in decimal:"
+decimal
+." Backslash-n\nNewLine\tTab\1234And-a-OneTwoThreeFour"
+." Backslashes on both ends:\1234\OneTwoThreeFour"
+
+fcode-end
Added: fcode-utils/testsuite/TokMisc/OneBeer.fc
===================================================================
Added: fcode-utils/testsuite/TokMisc/StrAtEof.fld.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/StrAtEof.fld.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/StrAtEof.fld.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,11 @@
+\ We seem to have stumbled on another bug, manifested by
+\ a string at the end of an "floaded" file, i.e.,
+\ no blank line after a string at the end of that file.
+\
+\ This is the "floadable" file.
+\
+\ Updated Tue, 12 Apr 2005 at 16:34 by David L. Paktor
+
+
+\ Make sure there's no blank line after this next line:
+." Hi!"
Added: fcode-utils/testsuite/TokMisc/StrAtEof.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/StrAtEof.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/StrAtEof.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,18 @@
+\ We seem to have stumbled on another bug, manifested by
+\ a string at the end of an "floaded" file, i.e.,
+\ no blank line after a string at the end of that file.
+\
+\ Main file to test it
+\
+\ Updated Tue, 12 Apr 2005 at 17:50 by David L. Paktor
+
+
+fcode-version2
+
+headers
+
+fload StrAtEof.fld.fth
+
+." Try "^a"^b"^c"^d"^[ and "^aand"^band"^cetc.?"
+." Are we still processing strings okay?"
+fcode-end
Added: fcode-utils/testsuite/TokMisc/StrEscs.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/StrEscs.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/StrEscs.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,19 @@
+\ String-Escapes test...
+
+\ Updated Mon, 11 Jul 2005 at 16:44 by David L. Paktor
+
+
+fcode-version2
+
+headers hex
+
+." What about "( 1c cd e6 \ The rest of this line should be a comment
+ c7 )?"
+." Is "\ the rest of this line a comment?"
+X and a new start " \ This should do it.
+0 is my-self \ Is it still keeping line numbers straight?
+." Or a way to get a "\ backslash?"
+ Y not " \ Or not...
+0 is my-self \ Is it still keeping line numbers straight?
+
+fcode-end
Added: fcode-utils/testsuite/TokMisc/StrEscs_01.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/StrEscs_01.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/StrEscs_01.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,11 @@
+\ It's not about the unterminated String
+\ it's about the lack of fcode-end
+
+\ Updated Tue, 12 Jul 2005 at 09:58 by David L. Paktor
+
+fcode-version2
+
+headers hex
+
+\ What if we don't have an fcode-end here?
+." Why not?"
Added: fcode-utils/testsuite/TokMisc/StringsGenl.DOS.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/StringsGenl.DOS.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/StringsGenl.DOS.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,43 @@
+\ Test of various formats of strings
+
+\ Updated Tue, 12 Jul 2005 at 17:19 by David L. Paktor
+
+fcode-version2
+
+headers hex
+
+."
+Empty string next."
+." "
+." BSlashes: \t\1fea9\abdc\n\1f\\fece"
+decimal
+." BSlashes: \t\a7\c01a"
+hex
+." BSlashes: \n\a7\c01a"
+." BSlashes: \t\a7\\c0\\1a"
+." BSlashes: \t\a7\\c0\\1a"( feedface)"
+." 3 BSlashes, then QOpen. \t\Q\n"(090abcdefeca8e beeffece b020)Zoh. "(1 23 4 567 8 9 0 1 2 3 0 a b c 30)"
+.( Dot-Paren-NoSpace)cr cr
+.( Dot-Paren Space) cr cr
+." QEscapes: "p"b"n"zz"
+." QEscapes: ""Q"nn"rr"tt"ff"ll"bb"!!"^[UpBrack"zz"
+0 is my-self \ Is it keeping line numbers straight?
+" Quote"" Quote" type cr
+s" Ess-Quote"type cr
+." Cross
+the
+line.
+Three times."
+0 is my-self \ Is it still keeping line numbers straight?
+." Can I get a \ backslash?"
+." Like this \\ maybe?"
+." What about "( 1c cd e6 \ The rest of this line should be a comment
+ c7 )?"
+." Is "\ the rest of this line a comment?"
+\ " \ This should do it.
+0 is my-self \ Is it still keeping line numbers straight?
+." Or a way to get a "\ backslash?"
+\ " \ Or not...
+0 is my-self \ Is it still keeping line numbers straight?
+
+fcode-end
Added: fcode-utils/testsuite/TokMisc/StringsGenl.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/StringsGenl.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/StringsGenl.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,46 @@
+\ Test of various formats of strings
+
+\ Updated Mon, 06 Mar 2006 at 17:39 PST by David L. Paktor
+
+fcode-version2
+
+headers hex
+
+."
+Empty string next."
+." "
+." BSlashes: \t\1fea9\abdc\n\1f\\fece"
+decimal
+." BSlashes: \t\a7\c01a"
+hex
+." BSlashes: \n\a7\c01a"
+." BSlashes: \t\a7\\c0\\1a"
+." BSlashes: \t\a7\\c0\\1a"( feedface)"
+." 3 BSlashes, then QOpen. \t\Q\n"(090abcdefeca8e beeffece b020)Zoh. "(1 23 4 567 8 9 0 1 2 3 0 a b c 30)"
+.( Dot-Paren-NoSpace)cr cr
+.( Dot-Paren Space) cr cr
+." QEscapes: "p"b"n"zz"
+." QEscapes: ""Q"nn"rr"tt"ff"ll"bb"!!"^[UpBrack"zz"
+0 is my-self \ Is it keeping line numbers straight?
+" Quote"" Quote" type cr
+s" Ess-Quote"type cr
+." Cross
+the
+line.
+Three times."
+0 is my-self \ Is it still keeping line numbers straight?
+." Can I get a \ backslash?"
+." Like this \\ maybe?"
+." What about "( 1c cd e6 \ The rest of this line should be a comment
+ c7 )?"
+." Is "\ the rest of this line a comment?"
+\ " \ This should do it.
+0 is my-self \ Is it still keeping line numbers straight?
+." Or a way to get a "\ backslash?"
+\ " \ Or not...
+0 is my-self \ Is it still keeping line numbers straight?
+
+: glemph!" " glemph!""" evaluate ;
+\ What does the " do?
+
+fcode-end
Added: fcode-utils/testsuite/TokMisc/TestArgs
===================================================================
--- fcode-utils/testsuite/TokMisc/TestArgs (rev 0)
+++ fcode-utils/testsuite/TokMisc/TestArgs 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,71 @@
+# Automated Test Arguments file for TokMisc category
+
+# Valid lines have four comma-separated fields:
+# Test-file base-name
+# Result-file label
+# Extra command-line switches
+# A script-command with arguments (but no commas).
+# Lines that have no label, no switches, and no script
+# do not need any commas.
+
+# Updated Thu, 06 Jul 2006 at 13:16 PDT by David L. Paktor
+
+MiscFeatures , , -i
+MiscFeatures , applabq , -i -f NOSUN-ABORT-Quote
+MiscFeatures , noabrtq , -i -f noABort-quote
+MiscFeatures.DOS , , -i
+EncodTst
+StrAtEof , , -l
+# Script is to help set up for Batch Test at end...
+StringsGenl , , , cp StringsGenl.fth StringsGenl_cpy1.fth ; cp StringsGenl_cpy1.fth StringsGenl_cpy2.fth
+StringsGenl , nocstesc , -f NOC-STYLe-string-escape
+StringsGenl , nohexrmk , -f noHex-remark-escape
+StringsGenl , noqbsrmk , -f NOSTRING-REMARK-ESCAPE
+BasicCont
+ExtCont
+OldTkzr/ContErr0 , , -i
+ContErr1 , , -i
+ContErr2 , , -i
+ContErr3 , , -i
+MulDev , , -i
+MulDev_01 , , -i
+MulDev_02 , , -i -T jeeky -T kinky
+MinPCIHtst
+OldTkzr/SimplStrEscs
+StrEscs
+StrEscs_01
+FlagSet , , -i
+FlagSet , badclf , -i -f McGillicuddy -f ORoark -f NoFrauBlucher
+TooLargeBufferMulPciFcb , , -l
+BranchOverNewBuffer , , -l
+AbrtQuot , , -i
+AbrtQuot , noabrtq , -i -f NOabort-Quote
+AbrtQuot , applabq , -i -f noSUN-abort-QUOte
+AbrtQuot , noabqthrw , -i -f noABORT-Quote-Throw
+HeadrSettings
+HeadrSettings , alwyshdr , -f always-heADERs
+HeadrSettings , alwyextl , -f alwaYS-External
+HeadrSettings , alwaysboth , -f always-headers -f always-external
+FlagsHelp , , -f HELP
+FlagsHelp , Chg , -f noHex-remark-ESCAPE -f Always-Headers -f help
+FlagsHelp , noChg , -f noLocal-Values -f help
+FlagsHelp , chgNoHlp , -f noHex-remark-escape -f Always-Headers -f noHelp
+FlagsHelp , JustNoHlp , -f noHelp
+FlgReset , Solo
+FlgReset FlgReset_1 FlgReset_2
+FlgReset FlgReset_1 FlgReset_2 , AlwExt , -f Always-External
+AllMacros , , , ExamAllMacs.scr
+
+# A little more set-up for Batch Test
+UserMacros , , , cp UserMacros.fth UserMacros_cpy1.fth
+
+BatchTst StringsGenl_cpy1 FlagSet , , -l sub.w.dots/MulDev ../TokeCommon/ZeroLen.bin ../TokeCommon/OneBeer.fth NoBeerAnywhere.fth , if ( "`cmp StringsGenl.fc StringsGenl_cpy1.fc`" != "" ) /bin/ls -l $PWD/StringsGenl.fc $PWD/StringsGenl_cpy1.fc >> BatchTst.Log ; diff StringsGenl.DeTok StringsGenl_cpy1.DeTok >> BatchTst.Log
+
+BatchTst StringsGenl_cpy2 FlagSet UserMacros_cpy1 , wIncLst , -I '' -I. -I../TokeCommon -P -l sub.w.dots/MulDev OneBeer.fth ZeroLen.bin NoBeerAnywhere.fth , if ( "`cmp StringsGenl.fc StringsGenl_cpy2.fc`" != "" ) /bin/ls -l $PWD/StringsGenl.fc $PWD/StringsGenl_cpy2.fc >> BatchTst.wIncLst.Log ; diff StringsGenl.DeTok StringsGenl_cpy2.DeTok >> BatchTst.wIncLst.Log
+
+BatchTst , FHelp , -I. -I../TokeCommon -l -f help , if ( "`cmp UserMacros.fc UserMacros_cpy1.fc`" != "" ) /bin/ls -l $PWD/UserMacros.fc $PWD/UserMacros_cpy1.fc >> BatchTst.FHelp.Log ; diff UserMacros.DeTok UserMacros_cpy1.DeTok >> BatchTst.FHelp.Log
+
+# Script is to clean up the "dross" from the above...
+BatchTst , Help , -I. -I../TokeCommon -l -h , rm *_cpy*
+
+CaseTkns
Added: fcode-utils/testsuite/TokMisc/TooLargeBeerBuffer_body.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/TooLargeBeerBuffer_body.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/TooLargeBeerBuffer_body.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,2587 @@
+[message] Starting out with six hundred and forty-six Bottles of Beer on the wall
+." Oh, six hundred and forty-six Bottles of Beer on the wall," cr
+." six hundred and forty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and forty-five Bottles of Beer on the wall." cr
+." Oh, six hundred and forty-five Bottles of Beer on the wall," cr
+." six hundred and forty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and forty-four Bottles of Beer on the wall." cr
+." Oh, six hundred and forty-four Bottles of Beer on the wall," cr
+." six hundred and forty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and forty-three Bottles of Beer on the wall." cr
+." Oh, six hundred and forty-three Bottles of Beer on the wall," cr
+." six hundred and forty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and forty-two Bottles of Beer on the wall." cr
+." Oh, six hundred and forty-two Bottles of Beer on the wall," cr
+." six hundred and forty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and forty-one Bottles of Beer on the wall." cr
+." Oh, six hundred and forty-one Bottles of Beer on the wall," cr
+." six hundred and forty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and forty Bottles of Beer on the wall." cr
+." Oh, six hundred and forty Bottles of Beer on the wall," cr
+." six hundred and forty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirty-nine Bottles of Beer on the wall." cr
+." Oh, six hundred and thirty-nine Bottles of Beer on the wall," cr
+." six hundred and thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirty-eight Bottles of Beer on the wall." cr
+." Oh, six hundred and thirty-eight Bottles of Beer on the wall," cr
+." six hundred and thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirty-seven Bottles of Beer on the wall." cr
+." Oh, six hundred and thirty-seven Bottles of Beer on the wall," cr
+." six hundred and thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirty-six Bottles of Beer on the wall." cr
+." Oh, six hundred and thirty-six Bottles of Beer on the wall," cr
+." six hundred and thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirty-five Bottles of Beer on the wall." cr
+." Oh, six hundred and thirty-five Bottles of Beer on the wall," cr
+." six hundred and thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirty-four Bottles of Beer on the wall." cr
+." Oh, six hundred and thirty-four Bottles of Beer on the wall," cr
+." six hundred and thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirty-three Bottles of Beer on the wall." cr
+." Oh, six hundred and thirty-three Bottles of Beer on the wall," cr
+." six hundred and thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirty-two Bottles of Beer on the wall." cr
+." Oh, six hundred and thirty-two Bottles of Beer on the wall," cr
+." six hundred and thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirty-one Bottles of Beer on the wall." cr
+." Oh, six hundred and thirty-one Bottles of Beer on the wall," cr
+." six hundred and thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirty Bottles of Beer on the wall." cr
+." Oh, six hundred and thirty Bottles of Beer on the wall," cr
+." six hundred and thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twenty-nine Bottles of Beer on the wall." cr
+." Oh, six hundred and twenty-nine Bottles of Beer on the wall," cr
+." six hundred and twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twenty-eight Bottles of Beer on the wall." cr
+." Oh, six hundred and twenty-eight Bottles of Beer on the wall," cr
+." six hundred and twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twenty-seven Bottles of Beer on the wall." cr
+." Oh, six hundred and twenty-seven Bottles of Beer on the wall," cr
+." six hundred and twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twenty-six Bottles of Beer on the wall." cr
+." Oh, six hundred and twenty-six Bottles of Beer on the wall," cr
+." six hundred and twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twenty-five Bottles of Beer on the wall." cr
+." Oh, six hundred and twenty-five Bottles of Beer on the wall," cr
+." six hundred and twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twenty-four Bottles of Beer on the wall." cr
+." Oh, six hundred and twenty-four Bottles of Beer on the wall," cr
+." six hundred and twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twenty-three Bottles of Beer on the wall." cr
+." Oh, six hundred and twenty-three Bottles of Beer on the wall," cr
+." six hundred and twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twenty-two Bottles of Beer on the wall." cr
+." Oh, six hundred and twenty-two Bottles of Beer on the wall," cr
+." six hundred and twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twenty-one Bottles of Beer on the wall." cr
+." Oh, six hundred and twenty-one Bottles of Beer on the wall," cr
+." six hundred and twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twenty Bottles of Beer on the wall." cr
+." Oh, six hundred and twenty Bottles of Beer on the wall," cr
+." six hundred and twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and nineteen Bottles of Beer on the wall." cr
+." Oh, six hundred and nineteen Bottles of Beer on the wall," cr
+." six hundred and nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and eighteen Bottles of Beer on the wall." cr
+." Oh, six hundred and eighteen Bottles of Beer on the wall," cr
+." six hundred and eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and seventeen Bottles of Beer on the wall." cr
+." Oh, six hundred and seventeen Bottles of Beer on the wall," cr
+." six hundred and seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and sixteen Bottles of Beer on the wall." cr
+." Oh, six hundred and sixteen Bottles of Beer on the wall," cr
+." six hundred and sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and fifteen Bottles of Beer on the wall." cr
+." Oh, six hundred and fifteen Bottles of Beer on the wall," cr
+." six hundred and fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and fourteen Bottles of Beer on the wall." cr
+." Oh, six hundred and fourteen Bottles of Beer on the wall," cr
+." six hundred and fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and thirteen Bottles of Beer on the wall." cr
+." Oh, six hundred and thirteen Bottles of Beer on the wall," cr
+." six hundred and thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and twelve Bottles of Beer on the wall." cr
+." Oh, six hundred and twelve Bottles of Beer on the wall," cr
+." six hundred and twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and eleven Bottles of Beer on the wall." cr
+." Oh, six hundred and eleven Bottles of Beer on the wall," cr
+." six hundred and eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and ten Bottles of Beer on the wall." cr
+." Oh, six hundred and ten Bottles of Beer on the wall," cr
+." six hundred and ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and nine Bottles of Beer on the wall." cr
+." Oh, six hundred and nine Bottles of Beer on the wall," cr
+." six hundred and nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and eight Bottles of Beer on the wall." cr
+." Oh, six hundred and eight Bottles of Beer on the wall," cr
+." six hundred and eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and seven Bottles of Beer on the wall." cr
+." Oh, six hundred and seven Bottles of Beer on the wall," cr
+." six hundred and seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and six Bottles of Beer on the wall." cr
+." Oh, six hundred and six Bottles of Beer on the wall," cr
+." six hundred and six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and five Bottles of Beer on the wall." cr
+." Oh, six hundred and five Bottles of Beer on the wall," cr
+." six hundred and five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and four Bottles of Beer on the wall." cr
+." Oh, six hundred and four Bottles of Beer on the wall," cr
+." six hundred and four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and three Bottles of Beer on the wall." cr
+." Oh, six hundred and three Bottles of Beer on the wall," cr
+." six hundred and three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and two Bottles of Beer on the wall." cr
+." Oh, six hundred and two Bottles of Beer on the wall," cr
+." six hundred and two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred and one Bottles of Beer on the wall." cr
+." Oh, six hundred and one Bottles of Beer on the wall," cr
+." six hundred and one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six hundred Bottles of Beer on the wall." cr
+." Oh, six hundred Bottles of Beer on the wall," cr
+." six hundred Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ninety-nine Bottles of Beer on the wall." cr
+." Oh, five hundred and ninety-nine Bottles of Beer on the wall," cr
+." five hundred and ninety-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ninety-eight Bottles of Beer on the wall." cr
+." Oh, five hundred and ninety-eight Bottles of Beer on the wall," cr
+." five hundred and ninety-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ninety-seven Bottles of Beer on the wall." cr
+." Oh, five hundred and ninety-seven Bottles of Beer on the wall," cr
+." five hundred and ninety-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ninety-six Bottles of Beer on the wall." cr
+." Oh, five hundred and ninety-six Bottles of Beer on the wall," cr
+." five hundred and ninety-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ninety-five Bottles of Beer on the wall." cr
+." Oh, five hundred and ninety-five Bottles of Beer on the wall," cr
+." five hundred and ninety-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ninety-four Bottles of Beer on the wall." cr
+." Oh, five hundred and ninety-four Bottles of Beer on the wall," cr
+." five hundred and ninety-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ninety-three Bottles of Beer on the wall." cr
+." Oh, five hundred and ninety-three Bottles of Beer on the wall," cr
+." five hundred and ninety-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ninety-two Bottles of Beer on the wall." cr
+." Oh, five hundred and ninety-two Bottles of Beer on the wall," cr
+." five hundred and ninety-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ninety-one Bottles of Beer on the wall." cr
+." Oh, five hundred and ninety-one Bottles of Beer on the wall," cr
+." five hundred and ninety-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ninety Bottles of Beer on the wall." cr
+." Oh, five hundred and ninety Bottles of Beer on the wall," cr
+." five hundred and ninety Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighty-nine Bottles of Beer on the wall." cr
+." Oh, five hundred and eighty-nine Bottles of Beer on the wall," cr
+." five hundred and eighty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighty-eight Bottles of Beer on the wall." cr
+." Oh, five hundred and eighty-eight Bottles of Beer on the wall," cr
+." five hundred and eighty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighty-seven Bottles of Beer on the wall." cr
+." Oh, five hundred and eighty-seven Bottles of Beer on the wall," cr
+." five hundred and eighty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighty-six Bottles of Beer on the wall." cr
+." Oh, five hundred and eighty-six Bottles of Beer on the wall," cr
+." five hundred and eighty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighty-five Bottles of Beer on the wall." cr
+." Oh, five hundred and eighty-five Bottles of Beer on the wall," cr
+." five hundred and eighty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighty-four Bottles of Beer on the wall." cr
+." Oh, five hundred and eighty-four Bottles of Beer on the wall," cr
+." five hundred and eighty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighty-three Bottles of Beer on the wall." cr
+." Oh, five hundred and eighty-three Bottles of Beer on the wall," cr
+." five hundred and eighty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighty-two Bottles of Beer on the wall." cr
+." Oh, five hundred and eighty-two Bottles of Beer on the wall," cr
+." five hundred and eighty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighty-one Bottles of Beer on the wall." cr
+." Oh, five hundred and eighty-one Bottles of Beer on the wall," cr
+." five hundred and eighty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighty Bottles of Beer on the wall." cr
+." Oh, five hundred and eighty Bottles of Beer on the wall," cr
+." five hundred and eighty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventy-nine Bottles of Beer on the wall." cr
+." Oh, five hundred and seventy-nine Bottles of Beer on the wall," cr
+." five hundred and seventy-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventy-eight Bottles of Beer on the wall." cr
+." Oh, five hundred and seventy-eight Bottles of Beer on the wall," cr
+." five hundred and seventy-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventy-seven Bottles of Beer on the wall." cr
+." Oh, five hundred and seventy-seven Bottles of Beer on the wall," cr
+." five hundred and seventy-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventy-six Bottles of Beer on the wall." cr
+." Oh, five hundred and seventy-six Bottles of Beer on the wall," cr
+." five hundred and seventy-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventy-five Bottles of Beer on the wall." cr
+." Oh, five hundred and seventy-five Bottles of Beer on the wall," cr
+." five hundred and seventy-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventy-four Bottles of Beer on the wall." cr
+." Oh, five hundred and seventy-four Bottles of Beer on the wall," cr
+." five hundred and seventy-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventy-three Bottles of Beer on the wall." cr
+." Oh, five hundred and seventy-three Bottles of Beer on the wall," cr
+." five hundred and seventy-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventy-two Bottles of Beer on the wall." cr
+." Oh, five hundred and seventy-two Bottles of Beer on the wall," cr
+." five hundred and seventy-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventy-one Bottles of Beer on the wall." cr
+." Oh, five hundred and seventy-one Bottles of Beer on the wall," cr
+." five hundred and seventy-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventy Bottles of Beer on the wall." cr
+." Oh, five hundred and seventy Bottles of Beer on the wall," cr
+." five hundred and seventy Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixty-nine Bottles of Beer on the wall." cr
+." Oh, five hundred and sixty-nine Bottles of Beer on the wall," cr
+." five hundred and sixty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixty-eight Bottles of Beer on the wall." cr
+." Oh, five hundred and sixty-eight Bottles of Beer on the wall," cr
+." five hundred and sixty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixty-seven Bottles of Beer on the wall." cr
+." Oh, five hundred and sixty-seven Bottles of Beer on the wall," cr
+." five hundred and sixty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixty-six Bottles of Beer on the wall." cr
+." Oh, five hundred and sixty-six Bottles of Beer on the wall," cr
+." five hundred and sixty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixty-five Bottles of Beer on the wall." cr
+." Oh, five hundred and sixty-five Bottles of Beer on the wall," cr
+." five hundred and sixty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixty-four Bottles of Beer on the wall." cr
+." Oh, five hundred and sixty-four Bottles of Beer on the wall," cr
+." five hundred and sixty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixty-three Bottles of Beer on the wall." cr
+." Oh, five hundred and sixty-three Bottles of Beer on the wall," cr
+." five hundred and sixty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixty-two Bottles of Beer on the wall." cr
+." Oh, five hundred and sixty-two Bottles of Beer on the wall," cr
+." five hundred and sixty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixty-one Bottles of Beer on the wall." cr
+." Oh, five hundred and sixty-one Bottles of Beer on the wall," cr
+." five hundred and sixty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixty Bottles of Beer on the wall." cr
+." Oh, five hundred and sixty Bottles of Beer on the wall," cr
+." five hundred and sixty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifty-nine Bottles of Beer on the wall." cr
+." Oh, five hundred and fifty-nine Bottles of Beer on the wall," cr
+." five hundred and fifty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifty-eight Bottles of Beer on the wall." cr
+." Oh, five hundred and fifty-eight Bottles of Beer on the wall," cr
+." five hundred and fifty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifty-seven Bottles of Beer on the wall." cr
+." Oh, five hundred and fifty-seven Bottles of Beer on the wall," cr
+." five hundred and fifty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifty-six Bottles of Beer on the wall." cr
+." Oh, five hundred and fifty-six Bottles of Beer on the wall," cr
+." five hundred and fifty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifty-five Bottles of Beer on the wall." cr
+." Oh, five hundred and fifty-five Bottles of Beer on the wall," cr
+." five hundred and fifty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifty-four Bottles of Beer on the wall." cr
+." Oh, five hundred and fifty-four Bottles of Beer on the wall," cr
+." five hundred and fifty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifty-three Bottles of Beer on the wall." cr
+." Oh, five hundred and fifty-three Bottles of Beer on the wall," cr
+." five hundred and fifty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifty-two Bottles of Beer on the wall." cr
+." Oh, five hundred and fifty-two Bottles of Beer on the wall," cr
+." five hundred and fifty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifty-one Bottles of Beer on the wall." cr
+." Oh, five hundred and fifty-one Bottles of Beer on the wall," cr
+." five hundred and fifty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifty Bottles of Beer on the wall." cr
+." Oh, five hundred and fifty Bottles of Beer on the wall," cr
+." five hundred and fifty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and forty-nine Bottles of Beer on the wall." cr
+." Oh, five hundred and forty-nine Bottles of Beer on the wall," cr
+." five hundred and forty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and forty-eight Bottles of Beer on the wall." cr
+." Oh, five hundred and forty-eight Bottles of Beer on the wall," cr
+." five hundred and forty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and forty-seven Bottles of Beer on the wall." cr
+." Oh, five hundred and forty-seven Bottles of Beer on the wall," cr
+." five hundred and forty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and forty-six Bottles of Beer on the wall." cr
+." Oh, five hundred and forty-six Bottles of Beer on the wall," cr
+." five hundred and forty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and forty-five Bottles of Beer on the wall." cr
+." Oh, five hundred and forty-five Bottles of Beer on the wall," cr
+." five hundred and forty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and forty-four Bottles of Beer on the wall." cr
+." Oh, five hundred and forty-four Bottles of Beer on the wall," cr
+." five hundred and forty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and forty-three Bottles of Beer on the wall." cr
+." Oh, five hundred and forty-three Bottles of Beer on the wall," cr
+." five hundred and forty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and forty-two Bottles of Beer on the wall." cr
+." Oh, five hundred and forty-two Bottles of Beer on the wall," cr
+." five hundred and forty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and forty-one Bottles of Beer on the wall." cr
+." Oh, five hundred and forty-one Bottles of Beer on the wall," cr
+." five hundred and forty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and forty Bottles of Beer on the wall." cr
+." Oh, five hundred and forty Bottles of Beer on the wall," cr
+." five hundred and forty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirty-nine Bottles of Beer on the wall." cr
+." Oh, five hundred and thirty-nine Bottles of Beer on the wall," cr
+." five hundred and thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirty-eight Bottles of Beer on the wall." cr
+." Oh, five hundred and thirty-eight Bottles of Beer on the wall," cr
+." five hundred and thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirty-seven Bottles of Beer on the wall." cr
+." Oh, five hundred and thirty-seven Bottles of Beer on the wall," cr
+." five hundred and thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirty-six Bottles of Beer on the wall." cr
+." Oh, five hundred and thirty-six Bottles of Beer on the wall," cr
+." five hundred and thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirty-five Bottles of Beer on the wall." cr
+." Oh, five hundred and thirty-five Bottles of Beer on the wall," cr
+." five hundred and thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirty-four Bottles of Beer on the wall." cr
+." Oh, five hundred and thirty-four Bottles of Beer on the wall," cr
+." five hundred and thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirty-three Bottles of Beer on the wall." cr
+." Oh, five hundred and thirty-three Bottles of Beer on the wall," cr
+." five hundred and thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirty-two Bottles of Beer on the wall." cr
+." Oh, five hundred and thirty-two Bottles of Beer on the wall," cr
+." five hundred and thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirty-one Bottles of Beer on the wall." cr
+." Oh, five hundred and thirty-one Bottles of Beer on the wall," cr
+." five hundred and thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirty Bottles of Beer on the wall." cr
+." Oh, five hundred and thirty Bottles of Beer on the wall," cr
+." five hundred and thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twenty-nine Bottles of Beer on the wall." cr
+." Oh, five hundred and twenty-nine Bottles of Beer on the wall," cr
+." five hundred and twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twenty-eight Bottles of Beer on the wall." cr
+." Oh, five hundred and twenty-eight Bottles of Beer on the wall," cr
+." five hundred and twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twenty-seven Bottles of Beer on the wall." cr
+." Oh, five hundred and twenty-seven Bottles of Beer on the wall," cr
+." five hundred and twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twenty-six Bottles of Beer on the wall." cr
+." Oh, five hundred and twenty-six Bottles of Beer on the wall," cr
+." five hundred and twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twenty-five Bottles of Beer on the wall." cr
+." Oh, five hundred and twenty-five Bottles of Beer on the wall," cr
+." five hundred and twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twenty-four Bottles of Beer on the wall." cr
+." Oh, five hundred and twenty-four Bottles of Beer on the wall," cr
+." five hundred and twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twenty-three Bottles of Beer on the wall." cr
+." Oh, five hundred and twenty-three Bottles of Beer on the wall," cr
+." five hundred and twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twenty-two Bottles of Beer on the wall." cr
+." Oh, five hundred and twenty-two Bottles of Beer on the wall," cr
+." five hundred and twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twenty-one Bottles of Beer on the wall." cr
+." Oh, five hundred and twenty-one Bottles of Beer on the wall," cr
+." five hundred and twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twenty Bottles of Beer on the wall." cr
+." Oh, five hundred and twenty Bottles of Beer on the wall," cr
+." five hundred and twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and nineteen Bottles of Beer on the wall." cr
+." Oh, five hundred and nineteen Bottles of Beer on the wall," cr
+." five hundred and nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eighteen Bottles of Beer on the wall." cr
+." Oh, five hundred and eighteen Bottles of Beer on the wall," cr
+." five hundred and eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seventeen Bottles of Beer on the wall." cr
+." Oh, five hundred and seventeen Bottles of Beer on the wall," cr
+." five hundred and seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and sixteen Bottles of Beer on the wall." cr
+." Oh, five hundred and sixteen Bottles of Beer on the wall," cr
+." five hundred and sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fifteen Bottles of Beer on the wall." cr
+." Oh, five hundred and fifteen Bottles of Beer on the wall," cr
+." five hundred and fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and fourteen Bottles of Beer on the wall." cr
+." Oh, five hundred and fourteen Bottles of Beer on the wall," cr
+." five hundred and fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and thirteen Bottles of Beer on the wall." cr
+." Oh, five hundred and thirteen Bottles of Beer on the wall," cr
+." five hundred and thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and twelve Bottles of Beer on the wall." cr
+." Oh, five hundred and twelve Bottles of Beer on the wall," cr
+." five hundred and twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eleven Bottles of Beer on the wall." cr
+." Oh, five hundred and eleven Bottles of Beer on the wall," cr
+." five hundred and eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and ten Bottles of Beer on the wall." cr
+." Oh, five hundred and ten Bottles of Beer on the wall," cr
+." five hundred and ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and nine Bottles of Beer on the wall." cr
+." Oh, five hundred and nine Bottles of Beer on the wall," cr
+." five hundred and nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and eight Bottles of Beer on the wall." cr
+." Oh, five hundred and eight Bottles of Beer on the wall," cr
+." five hundred and eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and seven Bottles of Beer on the wall." cr
+." Oh, five hundred and seven Bottles of Beer on the wall," cr
+." five hundred and seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and six Bottles of Beer on the wall." cr
+." Oh, five hundred and six Bottles of Beer on the wall," cr
+." five hundred and six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and five Bottles of Beer on the wall." cr
+." Oh, five hundred and five Bottles of Beer on the wall," cr
+." five hundred and five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and four Bottles of Beer on the wall." cr
+." Oh, five hundred and four Bottles of Beer on the wall," cr
+." five hundred and four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and three Bottles of Beer on the wall." cr
+." Oh, five hundred and three Bottles of Beer on the wall," cr
+." five hundred and three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and two Bottles of Beer on the wall." cr
+." Oh, five hundred and two Bottles of Beer on the wall," cr
+." five hundred and two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred and one Bottles of Beer on the wall." cr
+." Oh, five hundred and one Bottles of Beer on the wall," cr
+." five hundred and one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five hundred Bottles of Beer on the wall." cr
+." Oh, five hundred Bottles of Beer on the wall," cr
+." five hundred Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ninety-nine Bottles of Beer on the wall." cr
+." Oh, four hundred and ninety-nine Bottles of Beer on the wall," cr
+." four hundred and ninety-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ninety-eight Bottles of Beer on the wall." cr
+." Oh, four hundred and ninety-eight Bottles of Beer on the wall," cr
+." four hundred and ninety-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ninety-seven Bottles of Beer on the wall." cr
+." Oh, four hundred and ninety-seven Bottles of Beer on the wall," cr
+." four hundred and ninety-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ninety-six Bottles of Beer on the wall." cr
+." Oh, four hundred and ninety-six Bottles of Beer on the wall," cr
+." four hundred and ninety-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ninety-five Bottles of Beer on the wall." cr
+." Oh, four hundred and ninety-five Bottles of Beer on the wall," cr
+." four hundred and ninety-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ninety-four Bottles of Beer on the wall." cr
+." Oh, four hundred and ninety-four Bottles of Beer on the wall," cr
+." four hundred and ninety-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ninety-three Bottles of Beer on the wall." cr
+." Oh, four hundred and ninety-three Bottles of Beer on the wall," cr
+." four hundred and ninety-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ninety-two Bottles of Beer on the wall." cr
+." Oh, four hundred and ninety-two Bottles of Beer on the wall," cr
+." four hundred and ninety-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ninety-one Bottles of Beer on the wall." cr
+." Oh, four hundred and ninety-one Bottles of Beer on the wall," cr
+." four hundred and ninety-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ninety Bottles of Beer on the wall." cr
+." Oh, four hundred and ninety Bottles of Beer on the wall," cr
+." four hundred and ninety Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighty-nine Bottles of Beer on the wall." cr
+." Oh, four hundred and eighty-nine Bottles of Beer on the wall," cr
+." four hundred and eighty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighty-eight Bottles of Beer on the wall." cr
+." Oh, four hundred and eighty-eight Bottles of Beer on the wall," cr
+." four hundred and eighty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighty-seven Bottles of Beer on the wall." cr
+." Oh, four hundred and eighty-seven Bottles of Beer on the wall," cr
+." four hundred and eighty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighty-six Bottles of Beer on the wall." cr
+." Oh, four hundred and eighty-six Bottles of Beer on the wall," cr
+." four hundred and eighty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighty-five Bottles of Beer on the wall." cr
+." Oh, four hundred and eighty-five Bottles of Beer on the wall," cr
+." four hundred and eighty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighty-four Bottles of Beer on the wall." cr
+." Oh, four hundred and eighty-four Bottles of Beer on the wall," cr
+." four hundred and eighty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighty-three Bottles of Beer on the wall." cr
+." Oh, four hundred and eighty-three Bottles of Beer on the wall," cr
+." four hundred and eighty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighty-two Bottles of Beer on the wall." cr
+." Oh, four hundred and eighty-two Bottles of Beer on the wall," cr
+." four hundred and eighty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighty-one Bottles of Beer on the wall." cr
+." Oh, four hundred and eighty-one Bottles of Beer on the wall," cr
+." four hundred and eighty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighty Bottles of Beer on the wall." cr
+." Oh, four hundred and eighty Bottles of Beer on the wall," cr
+." four hundred and eighty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventy-nine Bottles of Beer on the wall." cr
+." Oh, four hundred and seventy-nine Bottles of Beer on the wall," cr
+." four hundred and seventy-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventy-eight Bottles of Beer on the wall." cr
+." Oh, four hundred and seventy-eight Bottles of Beer on the wall," cr
+." four hundred and seventy-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventy-seven Bottles of Beer on the wall." cr
+." Oh, four hundred and seventy-seven Bottles of Beer on the wall," cr
+." four hundred and seventy-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventy-six Bottles of Beer on the wall." cr
+." Oh, four hundred and seventy-six Bottles of Beer on the wall," cr
+." four hundred and seventy-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventy-five Bottles of Beer on the wall." cr
+." Oh, four hundred and seventy-five Bottles of Beer on the wall," cr
+." four hundred and seventy-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventy-four Bottles of Beer on the wall." cr
+." Oh, four hundred and seventy-four Bottles of Beer on the wall," cr
+." four hundred and seventy-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventy-three Bottles of Beer on the wall." cr
+." Oh, four hundred and seventy-three Bottles of Beer on the wall," cr
+." four hundred and seventy-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventy-two Bottles of Beer on the wall." cr
+." Oh, four hundred and seventy-two Bottles of Beer on the wall," cr
+." four hundred and seventy-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventy-one Bottles of Beer on the wall." cr
+." Oh, four hundred and seventy-one Bottles of Beer on the wall," cr
+." four hundred and seventy-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventy Bottles of Beer on the wall." cr
+." Oh, four hundred and seventy Bottles of Beer on the wall," cr
+." four hundred and seventy Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixty-nine Bottles of Beer on the wall." cr
+." Oh, four hundred and sixty-nine Bottles of Beer on the wall," cr
+." four hundred and sixty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixty-eight Bottles of Beer on the wall." cr
+." Oh, four hundred and sixty-eight Bottles of Beer on the wall," cr
+." four hundred and sixty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixty-seven Bottles of Beer on the wall." cr
+." Oh, four hundred and sixty-seven Bottles of Beer on the wall," cr
+." four hundred and sixty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixty-six Bottles of Beer on the wall." cr
+." Oh, four hundred and sixty-six Bottles of Beer on the wall," cr
+." four hundred and sixty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixty-five Bottles of Beer on the wall." cr
+." Oh, four hundred and sixty-five Bottles of Beer on the wall," cr
+." four hundred and sixty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixty-four Bottles of Beer on the wall." cr
+." Oh, four hundred and sixty-four Bottles of Beer on the wall," cr
+." four hundred and sixty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixty-three Bottles of Beer on the wall." cr
+." Oh, four hundred and sixty-three Bottles of Beer on the wall," cr
+." four hundred and sixty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixty-two Bottles of Beer on the wall." cr
+." Oh, four hundred and sixty-two Bottles of Beer on the wall," cr
+." four hundred and sixty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixty-one Bottles of Beer on the wall." cr
+." Oh, four hundred and sixty-one Bottles of Beer on the wall," cr
+." four hundred and sixty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixty Bottles of Beer on the wall." cr
+." Oh, four hundred and sixty Bottles of Beer on the wall," cr
+." four hundred and sixty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifty-nine Bottles of Beer on the wall." cr
+." Oh, four hundred and fifty-nine Bottles of Beer on the wall," cr
+." four hundred and fifty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifty-eight Bottles of Beer on the wall." cr
+." Oh, four hundred and fifty-eight Bottles of Beer on the wall," cr
+." four hundred and fifty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifty-seven Bottles of Beer on the wall." cr
+." Oh, four hundred and fifty-seven Bottles of Beer on the wall," cr
+." four hundred and fifty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifty-six Bottles of Beer on the wall." cr
+." Oh, four hundred and fifty-six Bottles of Beer on the wall," cr
+." four hundred and fifty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifty-five Bottles of Beer on the wall." cr
+." Oh, four hundred and fifty-five Bottles of Beer on the wall," cr
+." four hundred and fifty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifty-four Bottles of Beer on the wall." cr
+." Oh, four hundred and fifty-four Bottles of Beer on the wall," cr
+." four hundred and fifty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifty-three Bottles of Beer on the wall." cr
+." Oh, four hundred and fifty-three Bottles of Beer on the wall," cr
+." four hundred and fifty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifty-two Bottles of Beer on the wall." cr
+." Oh, four hundred and fifty-two Bottles of Beer on the wall," cr
+." four hundred and fifty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifty-one Bottles of Beer on the wall." cr
+." Oh, four hundred and fifty-one Bottles of Beer on the wall," cr
+." four hundred and fifty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifty Bottles of Beer on the wall." cr
+." Oh, four hundred and fifty Bottles of Beer on the wall," cr
+." four hundred and fifty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and forty-nine Bottles of Beer on the wall." cr
+." Oh, four hundred and forty-nine Bottles of Beer on the wall," cr
+." four hundred and forty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and forty-eight Bottles of Beer on the wall." cr
+." Oh, four hundred and forty-eight Bottles of Beer on the wall," cr
+." four hundred and forty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and forty-seven Bottles of Beer on the wall." cr
+." Oh, four hundred and forty-seven Bottles of Beer on the wall," cr
+." four hundred and forty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and forty-six Bottles of Beer on the wall." cr
+." Oh, four hundred and forty-six Bottles of Beer on the wall," cr
+." four hundred and forty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and forty-five Bottles of Beer on the wall." cr
+." Oh, four hundred and forty-five Bottles of Beer on the wall," cr
+." four hundred and forty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and forty-four Bottles of Beer on the wall." cr
+." Oh, four hundred and forty-four Bottles of Beer on the wall," cr
+." four hundred and forty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and forty-three Bottles of Beer on the wall." cr
+." Oh, four hundred and forty-three Bottles of Beer on the wall," cr
+." four hundred and forty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and forty-two Bottles of Beer on the wall." cr
+." Oh, four hundred and forty-two Bottles of Beer on the wall," cr
+." four hundred and forty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and forty-one Bottles of Beer on the wall." cr
+." Oh, four hundred and forty-one Bottles of Beer on the wall," cr
+." four hundred and forty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and forty Bottles of Beer on the wall." cr
+." Oh, four hundred and forty Bottles of Beer on the wall," cr
+." four hundred and forty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirty-nine Bottles of Beer on the wall." cr
+." Oh, four hundred and thirty-nine Bottles of Beer on the wall," cr
+." four hundred and thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirty-eight Bottles of Beer on the wall." cr
+." Oh, four hundred and thirty-eight Bottles of Beer on the wall," cr
+." four hundred and thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirty-seven Bottles of Beer on the wall." cr
+." Oh, four hundred and thirty-seven Bottles of Beer on the wall," cr
+." four hundred and thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirty-six Bottles of Beer on the wall." cr
+." Oh, four hundred and thirty-six Bottles of Beer on the wall," cr
+." four hundred and thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirty-five Bottles of Beer on the wall." cr
+." Oh, four hundred and thirty-five Bottles of Beer on the wall," cr
+." four hundred and thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirty-four Bottles of Beer on the wall." cr
+." Oh, four hundred and thirty-four Bottles of Beer on the wall," cr
+." four hundred and thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirty-three Bottles of Beer on the wall." cr
+." Oh, four hundred and thirty-three Bottles of Beer on the wall," cr
+." four hundred and thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirty-two Bottles of Beer on the wall." cr
+." Oh, four hundred and thirty-two Bottles of Beer on the wall," cr
+." four hundred and thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirty-one Bottles of Beer on the wall." cr
+." Oh, four hundred and thirty-one Bottles of Beer on the wall," cr
+." four hundred and thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirty Bottles of Beer on the wall." cr
+." Oh, four hundred and thirty Bottles of Beer on the wall," cr
+." four hundred and thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twenty-nine Bottles of Beer on the wall." cr
+." Oh, four hundred and twenty-nine Bottles of Beer on the wall," cr
+." four hundred and twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twenty-eight Bottles of Beer on the wall." cr
+." Oh, four hundred and twenty-eight Bottles of Beer on the wall," cr
+." four hundred and twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twenty-seven Bottles of Beer on the wall." cr
+." Oh, four hundred and twenty-seven Bottles of Beer on the wall," cr
+." four hundred and twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twenty-six Bottles of Beer on the wall." cr
+." Oh, four hundred and twenty-six Bottles of Beer on the wall," cr
+." four hundred and twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twenty-five Bottles of Beer on the wall." cr
+." Oh, four hundred and twenty-five Bottles of Beer on the wall," cr
+." four hundred and twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twenty-four Bottles of Beer on the wall." cr
+." Oh, four hundred and twenty-four Bottles of Beer on the wall," cr
+." four hundred and twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twenty-three Bottles of Beer on the wall." cr
+." Oh, four hundred and twenty-three Bottles of Beer on the wall," cr
+." four hundred and twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twenty-two Bottles of Beer on the wall." cr
+." Oh, four hundred and twenty-two Bottles of Beer on the wall," cr
+." four hundred and twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twenty-one Bottles of Beer on the wall." cr
+." Oh, four hundred and twenty-one Bottles of Beer on the wall," cr
+." four hundred and twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twenty Bottles of Beer on the wall." cr
+." Oh, four hundred and twenty Bottles of Beer on the wall," cr
+." four hundred and twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and nineteen Bottles of Beer on the wall." cr
+." Oh, four hundred and nineteen Bottles of Beer on the wall," cr
+." four hundred and nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eighteen Bottles of Beer on the wall." cr
+." Oh, four hundred and eighteen Bottles of Beer on the wall," cr
+." four hundred and eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seventeen Bottles of Beer on the wall." cr
+." Oh, four hundred and seventeen Bottles of Beer on the wall," cr
+." four hundred and seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and sixteen Bottles of Beer on the wall." cr
+." Oh, four hundred and sixteen Bottles of Beer on the wall," cr
+." four hundred and sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fifteen Bottles of Beer on the wall." cr
+." Oh, four hundred and fifteen Bottles of Beer on the wall," cr
+." four hundred and fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and fourteen Bottles of Beer on the wall." cr
+." Oh, four hundred and fourteen Bottles of Beer on the wall," cr
+." four hundred and fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and thirteen Bottles of Beer on the wall." cr
+." Oh, four hundred and thirteen Bottles of Beer on the wall," cr
+." four hundred and thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and twelve Bottles of Beer on the wall." cr
+." Oh, four hundred and twelve Bottles of Beer on the wall," cr
+." four hundred and twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eleven Bottles of Beer on the wall." cr
+." Oh, four hundred and eleven Bottles of Beer on the wall," cr
+." four hundred and eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and ten Bottles of Beer on the wall." cr
+." Oh, four hundred and ten Bottles of Beer on the wall," cr
+." four hundred and ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and nine Bottles of Beer on the wall." cr
+." Oh, four hundred and nine Bottles of Beer on the wall," cr
+." four hundred and nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and eight Bottles of Beer on the wall." cr
+." Oh, four hundred and eight Bottles of Beer on the wall," cr
+." four hundred and eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and seven Bottles of Beer on the wall." cr
+." Oh, four hundred and seven Bottles of Beer on the wall," cr
+." four hundred and seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and six Bottles of Beer on the wall." cr
+." Oh, four hundred and six Bottles of Beer on the wall," cr
+." four hundred and six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and five Bottles of Beer on the wall." cr
+." Oh, four hundred and five Bottles of Beer on the wall," cr
+." four hundred and five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and four Bottles of Beer on the wall." cr
+." Oh, four hundred and four Bottles of Beer on the wall," cr
+." four hundred and four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and three Bottles of Beer on the wall." cr
+." Oh, four hundred and three Bottles of Beer on the wall," cr
+." four hundred and three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and two Bottles of Beer on the wall." cr
+." Oh, four hundred and two Bottles of Beer on the wall," cr
+." four hundred and two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred and one Bottles of Beer on the wall." cr
+." Oh, four hundred and one Bottles of Beer on the wall," cr
+." four hundred and one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four hundred Bottles of Beer on the wall." cr
+." Oh, four hundred Bottles of Beer on the wall," cr
+." four hundred Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ninety-nine Bottles of Beer on the wall." cr
+." Oh, three hundred and ninety-nine Bottles of Beer on the wall," cr
+." three hundred and ninety-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ninety-eight Bottles of Beer on the wall." cr
+." Oh, three hundred and ninety-eight Bottles of Beer on the wall," cr
+." three hundred and ninety-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ninety-seven Bottles of Beer on the wall." cr
+." Oh, three hundred and ninety-seven Bottles of Beer on the wall," cr
+." three hundred and ninety-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ninety-six Bottles of Beer on the wall." cr
+." Oh, three hundred and ninety-six Bottles of Beer on the wall," cr
+." three hundred and ninety-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ninety-five Bottles of Beer on the wall." cr
+." Oh, three hundred and ninety-five Bottles of Beer on the wall," cr
+." three hundred and ninety-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ninety-four Bottles of Beer on the wall." cr
+." Oh, three hundred and ninety-four Bottles of Beer on the wall," cr
+." three hundred and ninety-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ninety-three Bottles of Beer on the wall." cr
+." Oh, three hundred and ninety-three Bottles of Beer on the wall," cr
+." three hundred and ninety-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ninety-two Bottles of Beer on the wall." cr
+." Oh, three hundred and ninety-two Bottles of Beer on the wall," cr
+." three hundred and ninety-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ninety-one Bottles of Beer on the wall." cr
+." Oh, three hundred and ninety-one Bottles of Beer on the wall," cr
+." three hundred and ninety-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ninety Bottles of Beer on the wall." cr
+." Oh, three hundred and ninety Bottles of Beer on the wall," cr
+." three hundred and ninety Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighty-nine Bottles of Beer on the wall." cr
+." Oh, three hundred and eighty-nine Bottles of Beer on the wall," cr
+." three hundred and eighty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighty-eight Bottles of Beer on the wall." cr
+." Oh, three hundred and eighty-eight Bottles of Beer on the wall," cr
+." three hundred and eighty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighty-seven Bottles of Beer on the wall." cr
+." Oh, three hundred and eighty-seven Bottles of Beer on the wall," cr
+." three hundred and eighty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighty-six Bottles of Beer on the wall." cr
+." Oh, three hundred and eighty-six Bottles of Beer on the wall," cr
+." three hundred and eighty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighty-five Bottles of Beer on the wall." cr
+." Oh, three hundred and eighty-five Bottles of Beer on the wall," cr
+." three hundred and eighty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighty-four Bottles of Beer on the wall." cr
+." Oh, three hundred and eighty-four Bottles of Beer on the wall," cr
+." three hundred and eighty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighty-three Bottles of Beer on the wall." cr
+." Oh, three hundred and eighty-three Bottles of Beer on the wall," cr
+." three hundred and eighty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighty-two Bottles of Beer on the wall." cr
+." Oh, three hundred and eighty-two Bottles of Beer on the wall," cr
+." three hundred and eighty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighty-one Bottles of Beer on the wall." cr
+." Oh, three hundred and eighty-one Bottles of Beer on the wall," cr
+." three hundred and eighty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighty Bottles of Beer on the wall." cr
+." Oh, three hundred and eighty Bottles of Beer on the wall," cr
+." three hundred and eighty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventy-nine Bottles of Beer on the wall." cr
+." Oh, three hundred and seventy-nine Bottles of Beer on the wall," cr
+." three hundred and seventy-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventy-eight Bottles of Beer on the wall." cr
+." Oh, three hundred and seventy-eight Bottles of Beer on the wall," cr
+." three hundred and seventy-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventy-seven Bottles of Beer on the wall." cr
+." Oh, three hundred and seventy-seven Bottles of Beer on the wall," cr
+." three hundred and seventy-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventy-six Bottles of Beer on the wall." cr
+." Oh, three hundred and seventy-six Bottles of Beer on the wall," cr
+." three hundred and seventy-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventy-five Bottles of Beer on the wall." cr
+." Oh, three hundred and seventy-five Bottles of Beer on the wall," cr
+." three hundred and seventy-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventy-four Bottles of Beer on the wall." cr
+." Oh, three hundred and seventy-four Bottles of Beer on the wall," cr
+." three hundred and seventy-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventy-three Bottles of Beer on the wall." cr
+." Oh, three hundred and seventy-three Bottles of Beer on the wall," cr
+." three hundred and seventy-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventy-two Bottles of Beer on the wall." cr
+." Oh, three hundred and seventy-two Bottles of Beer on the wall," cr
+." three hundred and seventy-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventy-one Bottles of Beer on the wall." cr
+." Oh, three hundred and seventy-one Bottles of Beer on the wall," cr
+." three hundred and seventy-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventy Bottles of Beer on the wall." cr
+." Oh, three hundred and seventy Bottles of Beer on the wall," cr
+." three hundred and seventy Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixty-nine Bottles of Beer on the wall." cr
+." Oh, three hundred and sixty-nine Bottles of Beer on the wall," cr
+." three hundred and sixty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixty-eight Bottles of Beer on the wall." cr
+." Oh, three hundred and sixty-eight Bottles of Beer on the wall," cr
+." three hundred and sixty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixty-seven Bottles of Beer on the wall." cr
+." Oh, three hundred and sixty-seven Bottles of Beer on the wall," cr
+." three hundred and sixty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixty-six Bottles of Beer on the wall." cr
+." Oh, three hundred and sixty-six Bottles of Beer on the wall," cr
+." three hundred and sixty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixty-five Bottles of Beer on the wall." cr
+." Oh, three hundred and sixty-five Bottles of Beer on the wall," cr
+." three hundred and sixty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixty-four Bottles of Beer on the wall." cr
+." Oh, three hundred and sixty-four Bottles of Beer on the wall," cr
+." three hundred and sixty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixty-three Bottles of Beer on the wall." cr
+." Oh, three hundred and sixty-three Bottles of Beer on the wall," cr
+." three hundred and sixty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixty-two Bottles of Beer on the wall." cr
+." Oh, three hundred and sixty-two Bottles of Beer on the wall," cr
+." three hundred and sixty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixty-one Bottles of Beer on the wall." cr
+." Oh, three hundred and sixty-one Bottles of Beer on the wall," cr
+." three hundred and sixty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixty Bottles of Beer on the wall." cr
+." Oh, three hundred and sixty Bottles of Beer on the wall," cr
+." three hundred and sixty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifty-nine Bottles of Beer on the wall." cr
+." Oh, three hundred and fifty-nine Bottles of Beer on the wall," cr
+." three hundred and fifty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifty-eight Bottles of Beer on the wall." cr
+." Oh, three hundred and fifty-eight Bottles of Beer on the wall," cr
+." three hundred and fifty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifty-seven Bottles of Beer on the wall." cr
+." Oh, three hundred and fifty-seven Bottles of Beer on the wall," cr
+." three hundred and fifty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifty-six Bottles of Beer on the wall." cr
+." Oh, three hundred and fifty-six Bottles of Beer on the wall," cr
+." three hundred and fifty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifty-five Bottles of Beer on the wall." cr
+." Oh, three hundred and fifty-five Bottles of Beer on the wall," cr
+." three hundred and fifty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifty-four Bottles of Beer on the wall." cr
+." Oh, three hundred and fifty-four Bottles of Beer on the wall," cr
+." three hundred and fifty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifty-three Bottles of Beer on the wall." cr
+." Oh, three hundred and fifty-three Bottles of Beer on the wall," cr
+." three hundred and fifty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifty-two Bottles of Beer on the wall." cr
+." Oh, three hundred and fifty-two Bottles of Beer on the wall," cr
+." three hundred and fifty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifty-one Bottles of Beer on the wall." cr
+." Oh, three hundred and fifty-one Bottles of Beer on the wall," cr
+." three hundred and fifty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifty Bottles of Beer on the wall." cr
+." Oh, three hundred and fifty Bottles of Beer on the wall," cr
+." three hundred and fifty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and forty-nine Bottles of Beer on the wall." cr
+." Oh, three hundred and forty-nine Bottles of Beer on the wall," cr
+." three hundred and forty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and forty-eight Bottles of Beer on the wall." cr
+." Oh, three hundred and forty-eight Bottles of Beer on the wall," cr
+." three hundred and forty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and forty-seven Bottles of Beer on the wall." cr
+." Oh, three hundred and forty-seven Bottles of Beer on the wall," cr
+." three hundred and forty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and forty-six Bottles of Beer on the wall." cr
+." Oh, three hundred and forty-six Bottles of Beer on the wall," cr
+." three hundred and forty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and forty-five Bottles of Beer on the wall." cr
+." Oh, three hundred and forty-five Bottles of Beer on the wall," cr
+." three hundred and forty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and forty-four Bottles of Beer on the wall." cr
+." Oh, three hundred and forty-four Bottles of Beer on the wall," cr
+." three hundred and forty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and forty-three Bottles of Beer on the wall." cr
+." Oh, three hundred and forty-three Bottles of Beer on the wall," cr
+." three hundred and forty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and forty-two Bottles of Beer on the wall." cr
+." Oh, three hundred and forty-two Bottles of Beer on the wall," cr
+." three hundred and forty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and forty-one Bottles of Beer on the wall." cr
+." Oh, three hundred and forty-one Bottles of Beer on the wall," cr
+." three hundred and forty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and forty Bottles of Beer on the wall." cr
+." Oh, three hundred and forty Bottles of Beer on the wall," cr
+." three hundred and forty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirty-nine Bottles of Beer on the wall." cr
+." Oh, three hundred and thirty-nine Bottles of Beer on the wall," cr
+." three hundred and thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirty-eight Bottles of Beer on the wall." cr
+." Oh, three hundred and thirty-eight Bottles of Beer on the wall," cr
+." three hundred and thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirty-seven Bottles of Beer on the wall." cr
+." Oh, three hundred and thirty-seven Bottles of Beer on the wall," cr
+." three hundred and thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirty-six Bottles of Beer on the wall." cr
+." Oh, three hundred and thirty-six Bottles of Beer on the wall," cr
+." three hundred and thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirty-five Bottles of Beer on the wall." cr
+." Oh, three hundred and thirty-five Bottles of Beer on the wall," cr
+." three hundred and thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirty-four Bottles of Beer on the wall." cr
+." Oh, three hundred and thirty-four Bottles of Beer on the wall," cr
+." three hundred and thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirty-three Bottles of Beer on the wall." cr
+." Oh, three hundred and thirty-three Bottles of Beer on the wall," cr
+." three hundred and thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirty-two Bottles of Beer on the wall." cr
+." Oh, three hundred and thirty-two Bottles of Beer on the wall," cr
+." three hundred and thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirty-one Bottles of Beer on the wall." cr
+." Oh, three hundred and thirty-one Bottles of Beer on the wall," cr
+." three hundred and thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirty Bottles of Beer on the wall." cr
+." Oh, three hundred and thirty Bottles of Beer on the wall," cr
+." three hundred and thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twenty-nine Bottles of Beer on the wall." cr
+." Oh, three hundred and twenty-nine Bottles of Beer on the wall," cr
+." three hundred and twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twenty-eight Bottles of Beer on the wall." cr
+." Oh, three hundred and twenty-eight Bottles of Beer on the wall," cr
+." three hundred and twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twenty-seven Bottles of Beer on the wall." cr
+." Oh, three hundred and twenty-seven Bottles of Beer on the wall," cr
+." three hundred and twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twenty-six Bottles of Beer on the wall." cr
+." Oh, three hundred and twenty-six Bottles of Beer on the wall," cr
+." three hundred and twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twenty-five Bottles of Beer on the wall." cr
+." Oh, three hundred and twenty-five Bottles of Beer on the wall," cr
+." three hundred and twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twenty-four Bottles of Beer on the wall." cr
+." Oh, three hundred and twenty-four Bottles of Beer on the wall," cr
+." three hundred and twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twenty-three Bottles of Beer on the wall." cr
+." Oh, three hundred and twenty-three Bottles of Beer on the wall," cr
+." three hundred and twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twenty-two Bottles of Beer on the wall." cr
+." Oh, three hundred and twenty-two Bottles of Beer on the wall," cr
+." three hundred and twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twenty-one Bottles of Beer on the wall." cr
+." Oh, three hundred and twenty-one Bottles of Beer on the wall," cr
+." three hundred and twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twenty Bottles of Beer on the wall." cr
+." Oh, three hundred and twenty Bottles of Beer on the wall," cr
+." three hundred and twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and nineteen Bottles of Beer on the wall." cr
+." Oh, three hundred and nineteen Bottles of Beer on the wall," cr
+." three hundred and nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eighteen Bottles of Beer on the wall." cr
+." Oh, three hundred and eighteen Bottles of Beer on the wall," cr
+." three hundred and eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seventeen Bottles of Beer on the wall." cr
+." Oh, three hundred and seventeen Bottles of Beer on the wall," cr
+." three hundred and seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and sixteen Bottles of Beer on the wall." cr
+." Oh, three hundred and sixteen Bottles of Beer on the wall," cr
+." three hundred and sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fifteen Bottles of Beer on the wall." cr
+." Oh, three hundred and fifteen Bottles of Beer on the wall," cr
+." three hundred and fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and fourteen Bottles of Beer on the wall." cr
+." Oh, three hundred and fourteen Bottles of Beer on the wall," cr
+." three hundred and fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and thirteen Bottles of Beer on the wall." cr
+." Oh, three hundred and thirteen Bottles of Beer on the wall," cr
+." three hundred and thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and twelve Bottles of Beer on the wall." cr
+." Oh, three hundred and twelve Bottles of Beer on the wall," cr
+." three hundred and twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eleven Bottles of Beer on the wall." cr
+." Oh, three hundred and eleven Bottles of Beer on the wall," cr
+." three hundred and eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and ten Bottles of Beer on the wall." cr
+." Oh, three hundred and ten Bottles of Beer on the wall," cr
+." three hundred and ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and nine Bottles of Beer on the wall." cr
+." Oh, three hundred and nine Bottles of Beer on the wall," cr
+." three hundred and nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and eight Bottles of Beer on the wall." cr
+." Oh, three hundred and eight Bottles of Beer on the wall," cr
+." three hundred and eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and seven Bottles of Beer on the wall." cr
+." Oh, three hundred and seven Bottles of Beer on the wall," cr
+." three hundred and seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and six Bottles of Beer on the wall." cr
+." Oh, three hundred and six Bottles of Beer on the wall," cr
+." three hundred and six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and five Bottles of Beer on the wall." cr
+." Oh, three hundred and five Bottles of Beer on the wall," cr
+." three hundred and five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and four Bottles of Beer on the wall." cr
+." Oh, three hundred and four Bottles of Beer on the wall," cr
+." three hundred and four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and three Bottles of Beer on the wall." cr
+." Oh, three hundred and three Bottles of Beer on the wall," cr
+." three hundred and three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and two Bottles of Beer on the wall." cr
+." Oh, three hundred and two Bottles of Beer on the wall," cr
+." three hundred and two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred and one Bottles of Beer on the wall." cr
+." Oh, three hundred and one Bottles of Beer on the wall," cr
+." three hundred and one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three hundred Bottles of Beer on the wall." cr
+." Oh, three hundred Bottles of Beer on the wall," cr
+." three hundred Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ninety-nine Bottles of Beer on the wall." cr
+." Oh, two hundred and ninety-nine Bottles of Beer on the wall," cr
+." two hundred and ninety-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ninety-eight Bottles of Beer on the wall." cr
+." Oh, two hundred and ninety-eight Bottles of Beer on the wall," cr
+." two hundred and ninety-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ninety-seven Bottles of Beer on the wall." cr
+." Oh, two hundred and ninety-seven Bottles of Beer on the wall," cr
+." two hundred and ninety-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ninety-six Bottles of Beer on the wall." cr
+." Oh, two hundred and ninety-six Bottles of Beer on the wall," cr
+." two hundred and ninety-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ninety-five Bottles of Beer on the wall." cr
+." Oh, two hundred and ninety-five Bottles of Beer on the wall," cr
+." two hundred and ninety-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ninety-four Bottles of Beer on the wall." cr
+." Oh, two hundred and ninety-four Bottles of Beer on the wall," cr
+." two hundred and ninety-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ninety-three Bottles of Beer on the wall." cr
+." Oh, two hundred and ninety-three Bottles of Beer on the wall," cr
+." two hundred and ninety-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ninety-two Bottles of Beer on the wall." cr
+." Oh, two hundred and ninety-two Bottles of Beer on the wall," cr
+." two hundred and ninety-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ninety-one Bottles of Beer on the wall." cr
+." Oh, two hundred and ninety-one Bottles of Beer on the wall," cr
+." two hundred and ninety-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ninety Bottles of Beer on the wall." cr
+." Oh, two hundred and ninety Bottles of Beer on the wall," cr
+." two hundred and ninety Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighty-nine Bottles of Beer on the wall." cr
+." Oh, two hundred and eighty-nine Bottles of Beer on the wall," cr
+." two hundred and eighty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighty-eight Bottles of Beer on the wall." cr
+." Oh, two hundred and eighty-eight Bottles of Beer on the wall," cr
+." two hundred and eighty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighty-seven Bottles of Beer on the wall." cr
+." Oh, two hundred and eighty-seven Bottles of Beer on the wall," cr
+." two hundred and eighty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighty-six Bottles of Beer on the wall." cr
+." Oh, two hundred and eighty-six Bottles of Beer on the wall," cr
+." two hundred and eighty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighty-five Bottles of Beer on the wall." cr
+." Oh, two hundred and eighty-five Bottles of Beer on the wall," cr
+." two hundred and eighty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighty-four Bottles of Beer on the wall." cr
+." Oh, two hundred and eighty-four Bottles of Beer on the wall," cr
+." two hundred and eighty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighty-three Bottles of Beer on the wall." cr
+." Oh, two hundred and eighty-three Bottles of Beer on the wall," cr
+." two hundred and eighty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighty-two Bottles of Beer on the wall." cr
+." Oh, two hundred and eighty-two Bottles of Beer on the wall," cr
+." two hundred and eighty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighty-one Bottles of Beer on the wall." cr
+." Oh, two hundred and eighty-one Bottles of Beer on the wall," cr
+." two hundred and eighty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighty Bottles of Beer on the wall." cr
+." Oh, two hundred and eighty Bottles of Beer on the wall," cr
+." two hundred and eighty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventy-nine Bottles of Beer on the wall." cr
+." Oh, two hundred and seventy-nine Bottles of Beer on the wall," cr
+." two hundred and seventy-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventy-eight Bottles of Beer on the wall." cr
+." Oh, two hundred and seventy-eight Bottles of Beer on the wall," cr
+." two hundred and seventy-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventy-seven Bottles of Beer on the wall." cr
+." Oh, two hundred and seventy-seven Bottles of Beer on the wall," cr
+." two hundred and seventy-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventy-six Bottles of Beer on the wall." cr
+." Oh, two hundred and seventy-six Bottles of Beer on the wall," cr
+." two hundred and seventy-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventy-five Bottles of Beer on the wall." cr
+." Oh, two hundred and seventy-five Bottles of Beer on the wall," cr
+." two hundred and seventy-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventy-four Bottles of Beer on the wall." cr
+." Oh, two hundred and seventy-four Bottles of Beer on the wall," cr
+." two hundred and seventy-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventy-three Bottles of Beer on the wall." cr
+." Oh, two hundred and seventy-three Bottles of Beer on the wall," cr
+." two hundred and seventy-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventy-two Bottles of Beer on the wall." cr
+." Oh, two hundred and seventy-two Bottles of Beer on the wall," cr
+." two hundred and seventy-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventy-one Bottles of Beer on the wall." cr
+." Oh, two hundred and seventy-one Bottles of Beer on the wall," cr
+." two hundred and seventy-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventy Bottles of Beer on the wall." cr
+." Oh, two hundred and seventy Bottles of Beer on the wall," cr
+." two hundred and seventy Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixty-nine Bottles of Beer on the wall." cr
+." Oh, two hundred and sixty-nine Bottles of Beer on the wall," cr
+." two hundred and sixty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixty-eight Bottles of Beer on the wall." cr
+." Oh, two hundred and sixty-eight Bottles of Beer on the wall," cr
+." two hundred and sixty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixty-seven Bottles of Beer on the wall." cr
+." Oh, two hundred and sixty-seven Bottles of Beer on the wall," cr
+." two hundred and sixty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixty-six Bottles of Beer on the wall." cr
+." Oh, two hundred and sixty-six Bottles of Beer on the wall," cr
+." two hundred and sixty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixty-five Bottles of Beer on the wall." cr
+." Oh, two hundred and sixty-five Bottles of Beer on the wall," cr
+." two hundred and sixty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixty-four Bottles of Beer on the wall." cr
+." Oh, two hundred and sixty-four Bottles of Beer on the wall," cr
+." two hundred and sixty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixty-three Bottles of Beer on the wall." cr
+." Oh, two hundred and sixty-three Bottles of Beer on the wall," cr
+." two hundred and sixty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixty-two Bottles of Beer on the wall." cr
+." Oh, two hundred and sixty-two Bottles of Beer on the wall," cr
+." two hundred and sixty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixty-one Bottles of Beer on the wall." cr
+." Oh, two hundred and sixty-one Bottles of Beer on the wall," cr
+." two hundred and sixty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixty Bottles of Beer on the wall." cr
+." Oh, two hundred and sixty Bottles of Beer on the wall," cr
+." two hundred and sixty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifty-nine Bottles of Beer on the wall." cr
+." Oh, two hundred and fifty-nine Bottles of Beer on the wall," cr
+." two hundred and fifty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifty-eight Bottles of Beer on the wall." cr
+." Oh, two hundred and fifty-eight Bottles of Beer on the wall," cr
+." two hundred and fifty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifty-seven Bottles of Beer on the wall." cr
+." Oh, two hundred and fifty-seven Bottles of Beer on the wall," cr
+." two hundred and fifty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifty-six Bottles of Beer on the wall." cr
+." Oh, two hundred and fifty-six Bottles of Beer on the wall," cr
+." two hundred and fifty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifty-five Bottles of Beer on the wall." cr
+." Oh, two hundred and fifty-five Bottles of Beer on the wall," cr
+." two hundred and fifty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifty-four Bottles of Beer on the wall." cr
+." Oh, two hundred and fifty-four Bottles of Beer on the wall," cr
+." two hundred and fifty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifty-three Bottles of Beer on the wall." cr
+." Oh, two hundred and fifty-three Bottles of Beer on the wall," cr
+." two hundred and fifty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifty-two Bottles of Beer on the wall." cr
+." Oh, two hundred and fifty-two Bottles of Beer on the wall," cr
+." two hundred and fifty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifty-one Bottles of Beer on the wall." cr
+." Oh, two hundred and fifty-one Bottles of Beer on the wall," cr
+." two hundred and fifty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifty Bottles of Beer on the wall." cr
+." Oh, two hundred and fifty Bottles of Beer on the wall," cr
+." two hundred and fifty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and forty-nine Bottles of Beer on the wall." cr
+." Oh, two hundred and forty-nine Bottles of Beer on the wall," cr
+." two hundred and forty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and forty-eight Bottles of Beer on the wall." cr
+." Oh, two hundred and forty-eight Bottles of Beer on the wall," cr
+." two hundred and forty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and forty-seven Bottles of Beer on the wall." cr
+." Oh, two hundred and forty-seven Bottles of Beer on the wall," cr
+." two hundred and forty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and forty-six Bottles of Beer on the wall." cr
+." Oh, two hundred and forty-six Bottles of Beer on the wall," cr
+." two hundred and forty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and forty-five Bottles of Beer on the wall." cr
+." Oh, two hundred and forty-five Bottles of Beer on the wall," cr
+." two hundred and forty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and forty-four Bottles of Beer on the wall." cr
+." Oh, two hundred and forty-four Bottles of Beer on the wall," cr
+." two hundred and forty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and forty-three Bottles of Beer on the wall." cr
+." Oh, two hundred and forty-three Bottles of Beer on the wall," cr
+." two hundred and forty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and forty-two Bottles of Beer on the wall." cr
+." Oh, two hundred and forty-two Bottles of Beer on the wall," cr
+." two hundred and forty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and forty-one Bottles of Beer on the wall." cr
+." Oh, two hundred and forty-one Bottles of Beer on the wall," cr
+." two hundred and forty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and forty Bottles of Beer on the wall." cr
+." Oh, two hundred and forty Bottles of Beer on the wall," cr
+." two hundred and forty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirty-nine Bottles of Beer on the wall." cr
+." Oh, two hundred and thirty-nine Bottles of Beer on the wall," cr
+." two hundred and thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirty-eight Bottles of Beer on the wall." cr
+." Oh, two hundred and thirty-eight Bottles of Beer on the wall," cr
+." two hundred and thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirty-seven Bottles of Beer on the wall." cr
+." Oh, two hundred and thirty-seven Bottles of Beer on the wall," cr
+." two hundred and thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirty-six Bottles of Beer on the wall." cr
+." Oh, two hundred and thirty-six Bottles of Beer on the wall," cr
+." two hundred and thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirty-five Bottles of Beer on the wall." cr
+." Oh, two hundred and thirty-five Bottles of Beer on the wall," cr
+." two hundred and thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirty-four Bottles of Beer on the wall." cr
+." Oh, two hundred and thirty-four Bottles of Beer on the wall," cr
+." two hundred and thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirty-three Bottles of Beer on the wall." cr
+." Oh, two hundred and thirty-three Bottles of Beer on the wall," cr
+." two hundred and thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirty-two Bottles of Beer on the wall." cr
+." Oh, two hundred and thirty-two Bottles of Beer on the wall," cr
+." two hundred and thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirty-one Bottles of Beer on the wall." cr
+." Oh, two hundred and thirty-one Bottles of Beer on the wall," cr
+." two hundred and thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirty Bottles of Beer on the wall." cr
+." Oh, two hundred and thirty Bottles of Beer on the wall," cr
+." two hundred and thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twenty-nine Bottles of Beer on the wall." cr
+." Oh, two hundred and twenty-nine Bottles of Beer on the wall," cr
+." two hundred and twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twenty-eight Bottles of Beer on the wall." cr
+." Oh, two hundred and twenty-eight Bottles of Beer on the wall," cr
+." two hundred and twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twenty-seven Bottles of Beer on the wall." cr
+." Oh, two hundred and twenty-seven Bottles of Beer on the wall," cr
+." two hundred and twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twenty-six Bottles of Beer on the wall." cr
+." Oh, two hundred and twenty-six Bottles of Beer on the wall," cr
+." two hundred and twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twenty-five Bottles of Beer on the wall." cr
+." Oh, two hundred and twenty-five Bottles of Beer on the wall," cr
+." two hundred and twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twenty-four Bottles of Beer on the wall." cr
+." Oh, two hundred and twenty-four Bottles of Beer on the wall," cr
+." two hundred and twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twenty-three Bottles of Beer on the wall." cr
+." Oh, two hundred and twenty-three Bottles of Beer on the wall," cr
+." two hundred and twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twenty-two Bottles of Beer on the wall." cr
+." Oh, two hundred and twenty-two Bottles of Beer on the wall," cr
+." two hundred and twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twenty-one Bottles of Beer on the wall." cr
+." Oh, two hundred and twenty-one Bottles of Beer on the wall," cr
+." two hundred and twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twenty Bottles of Beer on the wall." cr
+." Oh, two hundred and twenty Bottles of Beer on the wall," cr
+." two hundred and twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and nineteen Bottles of Beer on the wall." cr
+." Oh, two hundred and nineteen Bottles of Beer on the wall," cr
+." two hundred and nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eighteen Bottles of Beer on the wall." cr
+." Oh, two hundred and eighteen Bottles of Beer on the wall," cr
+." two hundred and eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seventeen Bottles of Beer on the wall." cr
+." Oh, two hundred and seventeen Bottles of Beer on the wall," cr
+." two hundred and seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and sixteen Bottles of Beer on the wall." cr
+." Oh, two hundred and sixteen Bottles of Beer on the wall," cr
+." two hundred and sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fifteen Bottles of Beer on the wall." cr
+." Oh, two hundred and fifteen Bottles of Beer on the wall," cr
+." two hundred and fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and fourteen Bottles of Beer on the wall." cr
+." Oh, two hundred and fourteen Bottles of Beer on the wall," cr
+." two hundred and fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and thirteen Bottles of Beer on the wall." cr
+." Oh, two hundred and thirteen Bottles of Beer on the wall," cr
+." two hundred and thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and twelve Bottles of Beer on the wall." cr
+." Oh, two hundred and twelve Bottles of Beer on the wall," cr
+." two hundred and twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eleven Bottles of Beer on the wall." cr
+." Oh, two hundred and eleven Bottles of Beer on the wall," cr
+." two hundred and eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and ten Bottles of Beer on the wall." cr
+." Oh, two hundred and ten Bottles of Beer on the wall," cr
+." two hundred and ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and nine Bottles of Beer on the wall." cr
+." Oh, two hundred and nine Bottles of Beer on the wall," cr
+." two hundred and nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and eight Bottles of Beer on the wall." cr
+." Oh, two hundred and eight Bottles of Beer on the wall," cr
+." two hundred and eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and seven Bottles of Beer on the wall." cr
+." Oh, two hundred and seven Bottles of Beer on the wall," cr
+." two hundred and seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and six Bottles of Beer on the wall." cr
+." Oh, two hundred and six Bottles of Beer on the wall," cr
+." two hundred and six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and five Bottles of Beer on the wall." cr
+." Oh, two hundred and five Bottles of Beer on the wall," cr
+." two hundred and five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and four Bottles of Beer on the wall." cr
+." Oh, two hundred and four Bottles of Beer on the wall," cr
+." two hundred and four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and three Bottles of Beer on the wall." cr
+." Oh, two hundred and three Bottles of Beer on the wall," cr
+." two hundred and three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and two Bottles of Beer on the wall." cr
+." Oh, two hundred and two Bottles of Beer on the wall," cr
+." two hundred and two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred and one Bottles of Beer on the wall." cr
+." Oh, two hundred and one Bottles of Beer on the wall," cr
+." two hundred and one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two hundred Bottles of Beer on the wall." cr
+." Oh, two hundred Bottles of Beer on the wall," cr
+." two hundred Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ninety-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and ninety-nine Bottles of Beer on the wall," cr
+." one hundred and ninety-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ninety-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and ninety-eight Bottles of Beer on the wall," cr
+." one hundred and ninety-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ninety-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and ninety-seven Bottles of Beer on the wall," cr
+." one hundred and ninety-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ninety-six Bottles of Beer on the wall." cr
+." Oh, one hundred and ninety-six Bottles of Beer on the wall," cr
+." one hundred and ninety-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ninety-five Bottles of Beer on the wall." cr
+." Oh, one hundred and ninety-five Bottles of Beer on the wall," cr
+." one hundred and ninety-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ninety-four Bottles of Beer on the wall." cr
+." Oh, one hundred and ninety-four Bottles of Beer on the wall," cr
+." one hundred and ninety-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ninety-three Bottles of Beer on the wall." cr
+." Oh, one hundred and ninety-three Bottles of Beer on the wall," cr
+." one hundred and ninety-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ninety-two Bottles of Beer on the wall." cr
+." Oh, one hundred and ninety-two Bottles of Beer on the wall," cr
+." one hundred and ninety-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ninety-one Bottles of Beer on the wall." cr
+." Oh, one hundred and ninety-one Bottles of Beer on the wall," cr
+." one hundred and ninety-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ninety Bottles of Beer on the wall." cr
+." Oh, one hundred and ninety Bottles of Beer on the wall," cr
+." one hundred and ninety Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and eighty-nine Bottles of Beer on the wall," cr
+." one hundred and eighty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and eighty-eight Bottles of Beer on the wall," cr
+." one hundred and eighty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and eighty-seven Bottles of Beer on the wall," cr
+." one hundred and eighty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and eighty-six Bottles of Beer on the wall," cr
+." one hundred and eighty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and eighty-five Bottles of Beer on the wall," cr
+." one hundred and eighty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and eighty-four Bottles of Beer on the wall," cr
+." one hundred and eighty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and eighty-three Bottles of Beer on the wall," cr
+." one hundred and eighty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and eighty-two Bottles of Beer on the wall," cr
+." one hundred and eighty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and eighty-one Bottles of Beer on the wall," cr
+." one hundred and eighty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighty Bottles of Beer on the wall." cr
+." Oh, one hundred and eighty Bottles of Beer on the wall," cr
+." one hundred and eighty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-nine Bottles of Beer on the wall," cr
+." one hundred and seventy-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-eight Bottles of Beer on the wall," cr
+." one hundred and seventy-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-seven Bottles of Beer on the wall," cr
+." one hundred and seventy-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-six Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-six Bottles of Beer on the wall," cr
+." one hundred and seventy-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-five Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-five Bottles of Beer on the wall," cr
+." one hundred and seventy-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-four Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-four Bottles of Beer on the wall," cr
+." one hundred and seventy-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-three Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-three Bottles of Beer on the wall," cr
+." one hundred and seventy-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-two Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-two Bottles of Beer on the wall," cr
+." one hundred and seventy-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-one Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-one Bottles of Beer on the wall," cr
+." one hundred and seventy-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy Bottles of Beer on the wall," cr
+." one hundred and seventy Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-nine Bottles of Beer on the wall," cr
+." one hundred and sixty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-eight Bottles of Beer on the wall," cr
+." one hundred and sixty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-seven Bottles of Beer on the wall," cr
+." one hundred and sixty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-six Bottles of Beer on the wall," cr
+." one hundred and sixty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-five Bottles of Beer on the wall," cr
+." one hundred and sixty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-four Bottles of Beer on the wall," cr
+." one hundred and sixty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-three Bottles of Beer on the wall," cr
+." one hundred and sixty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-two Bottles of Beer on the wall," cr
+." one hundred and sixty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-one Bottles of Beer on the wall," cr
+." one hundred and sixty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty Bottles of Beer on the wall," cr
+." one hundred and sixty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-nine Bottles of Beer on the wall," cr
+." one hundred and fifty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-eight Bottles of Beer on the wall," cr
+." one hundred and fifty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-seven Bottles of Beer on the wall," cr
+." one hundred and fifty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-six Bottles of Beer on the wall," cr
+." one hundred and fifty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-five Bottles of Beer on the wall," cr
+." one hundred and fifty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-four Bottles of Beer on the wall," cr
+." one hundred and fifty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-three Bottles of Beer on the wall," cr
+." one hundred and fifty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-two Bottles of Beer on the wall," cr
+." one hundred and fifty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-one Bottles of Beer on the wall," cr
+." one hundred and fifty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty Bottles of Beer on the wall," cr
+." one hundred and fifty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-nine Bottles of Beer on the wall," cr
+." one hundred and forty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-eight Bottles of Beer on the wall," cr
+." one hundred and forty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-seven Bottles of Beer on the wall," cr
+." one hundred and forty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-six Bottles of Beer on the wall," cr
+." one hundred and forty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-five Bottles of Beer on the wall," cr
+." one hundred and forty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-four Bottles of Beer on the wall," cr
+." one hundred and forty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-three Bottles of Beer on the wall," cr
+." one hundred and forty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-two Bottles of Beer on the wall," cr
+." one hundred and forty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-one Bottles of Beer on the wall," cr
+." one hundred and forty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty Bottles of Beer on the wall." cr
+." Oh, one hundred and forty Bottles of Beer on the wall," cr
+." one hundred and forty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-nine Bottles of Beer on the wall," cr
+." one hundred and thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-eight Bottles of Beer on the wall," cr
+." one hundred and thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-seven Bottles of Beer on the wall," cr
+." one hundred and thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-six Bottles of Beer on the wall," cr
+." one hundred and thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-five Bottles of Beer on the wall," cr
+." one hundred and thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-four Bottles of Beer on the wall," cr
+." one hundred and thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-three Bottles of Beer on the wall," cr
+." one hundred and thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-two Bottles of Beer on the wall," cr
+." one hundred and thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-one Bottles of Beer on the wall," cr
+." one hundred and thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty Bottles of Beer on the wall," cr
+." one hundred and thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-nine Bottles of Beer on the wall," cr
+." one hundred and twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-eight Bottles of Beer on the wall," cr
+." one hundred and twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-seven Bottles of Beer on the wall," cr
+." one hundred and twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-six Bottles of Beer on the wall," cr
+." one hundred and twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-five Bottles of Beer on the wall," cr
+." one hundred and twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-four Bottles of Beer on the wall," cr
+." one hundred and twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-three Bottles of Beer on the wall," cr
+." one hundred and twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-two Bottles of Beer on the wall," cr
+." one hundred and twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-one Bottles of Beer on the wall," cr
+." one hundred and twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty Bottles of Beer on the wall," cr
+." one hundred and twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and nineteen Bottles of Beer on the wall." cr
+." Oh, one hundred and nineteen Bottles of Beer on the wall," cr
+." one hundred and nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighteen Bottles of Beer on the wall." cr
+." Oh, one hundred and eighteen Bottles of Beer on the wall," cr
+." one hundred and eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventeen Bottles of Beer on the wall." cr
+." Oh, one hundred and seventeen Bottles of Beer on the wall," cr
+." one hundred and seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixteen Bottles of Beer on the wall." cr
+." Oh, one hundred and sixteen Bottles of Beer on the wall," cr
+." one hundred and sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifteen Bottles of Beer on the wall." cr
+." Oh, one hundred and fifteen Bottles of Beer on the wall," cr
+." one hundred and fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fourteen Bottles of Beer on the wall." cr
+." Oh, one hundred and fourteen Bottles of Beer on the wall," cr
+." one hundred and fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirteen Bottles of Beer on the wall." cr
+." Oh, one hundred and thirteen Bottles of Beer on the wall," cr
+." one hundred and thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twelve Bottles of Beer on the wall." cr
+." Oh, one hundred and twelve Bottles of Beer on the wall," cr
+." one hundred and twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eleven Bottles of Beer on the wall." cr
+." Oh, one hundred and eleven Bottles of Beer on the wall," cr
+." one hundred and eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ten Bottles of Beer on the wall." cr
+." Oh, one hundred and ten Bottles of Beer on the wall," cr
+." one hundred and ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and nine Bottles of Beer on the wall." cr
+." Oh, one hundred and nine Bottles of Beer on the wall," cr
+." one hundred and nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eight Bottles of Beer on the wall." cr
+." Oh, one hundred and eight Bottles of Beer on the wall," cr
+." one hundred and eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seven Bottles of Beer on the wall." cr
+." Oh, one hundred and seven Bottles of Beer on the wall," cr
+." one hundred and seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and six Bottles of Beer on the wall." cr
+." Oh, one hundred and six Bottles of Beer on the wall," cr
+." one hundred and six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and five Bottles of Beer on the wall." cr
+." Oh, one hundred and five Bottles of Beer on the wall," cr
+." one hundred and five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and four Bottles of Beer on the wall." cr
+." Oh, one hundred and four Bottles of Beer on the wall," cr
+." one hundred and four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and three Bottles of Beer on the wall." cr
+." Oh, one hundred and three Bottles of Beer on the wall," cr
+." one hundred and three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and two Bottles of Beer on the wall." cr
+." Oh, one hundred and two Bottles of Beer on the wall," cr
+." one hundred and two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and one Bottles of Beer on the wall." cr
+." Oh, one hundred and one Bottles of Beer on the wall," cr
+." one hundred and one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred Bottles of Beer on the wall." cr
+." Oh, one hundred Bottles of Beer on the wall," cr
+." one hundred Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-nine Bottles of Beer on the wall." cr
+." Oh, ninety-nine Bottles of Beer on the wall," cr
+." ninety-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-eight Bottles of Beer on the wall." cr
+." Oh, ninety-eight Bottles of Beer on the wall," cr
+." ninety-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-seven Bottles of Beer on the wall." cr
+." Oh, ninety-seven Bottles of Beer on the wall," cr
+." ninety-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-six Bottles of Beer on the wall." cr
+." Oh, ninety-six Bottles of Beer on the wall," cr
+." ninety-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-five Bottles of Beer on the wall." cr
+." Oh, ninety-five Bottles of Beer on the wall," cr
+." ninety-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-four Bottles of Beer on the wall." cr
+." Oh, ninety-four Bottles of Beer on the wall," cr
+." ninety-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-three Bottles of Beer on the wall." cr
+." Oh, ninety-three Bottles of Beer on the wall," cr
+." ninety-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-two Bottles of Beer on the wall." cr
+." Oh, ninety-two Bottles of Beer on the wall," cr
+." ninety-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-one Bottles of Beer on the wall." cr
+." Oh, ninety-one Bottles of Beer on the wall," cr
+." ninety-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety Bottles of Beer on the wall." cr
+." Oh, ninety Bottles of Beer on the wall," cr
+." ninety Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-nine Bottles of Beer on the wall." cr
+." Oh, eighty-nine Bottles of Beer on the wall," cr
+." eighty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-eight Bottles of Beer on the wall." cr
+." Oh, eighty-eight Bottles of Beer on the wall," cr
+." eighty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-seven Bottles of Beer on the wall." cr
+." Oh, eighty-seven Bottles of Beer on the wall," cr
+." eighty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-six Bottles of Beer on the wall." cr
+." Oh, eighty-six Bottles of Beer on the wall," cr
+." eighty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-five Bottles of Beer on the wall." cr
+." Oh, eighty-five Bottles of Beer on the wall," cr
+." eighty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-four Bottles of Beer on the wall." cr
+." Oh, eighty-four Bottles of Beer on the wall," cr
+." eighty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-three Bottles of Beer on the wall." cr
+." Oh, eighty-three Bottles of Beer on the wall," cr
+." eighty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-two Bottles of Beer on the wall." cr
+." Oh, eighty-two Bottles of Beer on the wall," cr
+." eighty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-one Bottles of Beer on the wall." cr
+." Oh, eighty-one Bottles of Beer on the wall," cr
+." eighty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty Bottles of Beer on the wall." cr
+." Oh, eighty Bottles of Beer on the wall," cr
+." eighty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-nine Bottles of Beer on the wall." cr
+." Oh, seventy-nine Bottles of Beer on the wall," cr
+." seventy-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-eight Bottles of Beer on the wall." cr
+." Oh, seventy-eight Bottles of Beer on the wall," cr
+." seventy-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-seven Bottles of Beer on the wall." cr
+." Oh, seventy-seven Bottles of Beer on the wall," cr
+." seventy-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-six Bottles of Beer on the wall." cr
+." Oh, seventy-six Bottles of Beer on the wall," cr
+." seventy-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-five Bottles of Beer on the wall." cr
+." Oh, seventy-five Bottles of Beer on the wall," cr
+." seventy-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-four Bottles of Beer on the wall." cr
+." Oh, seventy-four Bottles of Beer on the wall," cr
+." seventy-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-three Bottles of Beer on the wall." cr
+." Oh, seventy-three Bottles of Beer on the wall," cr
+." seventy-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-two Bottles of Beer on the wall." cr
+." Oh, seventy-two Bottles of Beer on the wall," cr
+." seventy-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-one Bottles of Beer on the wall." cr
+." Oh, seventy-one Bottles of Beer on the wall," cr
+." seventy-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy Bottles of Beer on the wall." cr
+." Oh, seventy Bottles of Beer on the wall," cr
+." seventy Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-nine Bottles of Beer on the wall." cr
+." Oh, sixty-nine Bottles of Beer on the wall," cr
+." sixty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-eight Bottles of Beer on the wall." cr
+." Oh, sixty-eight Bottles of Beer on the wall," cr
+." sixty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-seven Bottles of Beer on the wall." cr
+." Oh, sixty-seven Bottles of Beer on the wall," cr
+." sixty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-six Bottles of Beer on the wall." cr
+." Oh, sixty-six Bottles of Beer on the wall," cr
+." sixty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-five Bottles of Beer on the wall." cr
+." Oh, sixty-five Bottles of Beer on the wall," cr
+." sixty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-four Bottles of Beer on the wall." cr
+." Oh, sixty-four Bottles of Beer on the wall," cr
+." sixty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-three Bottles of Beer on the wall." cr
+." Oh, sixty-three Bottles of Beer on the wall," cr
+." sixty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-two Bottles of Beer on the wall." cr
+." Oh, sixty-two Bottles of Beer on the wall," cr
+." sixty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-one Bottles of Beer on the wall." cr
+." Oh, sixty-one Bottles of Beer on the wall," cr
+." sixty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty Bottles of Beer on the wall." cr
+." Oh, sixty Bottles of Beer on the wall," cr
+." sixty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-nine Bottles of Beer on the wall." cr
+." Oh, fifty-nine Bottles of Beer on the wall," cr
+." fifty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-eight Bottles of Beer on the wall." cr
+." Oh, fifty-eight Bottles of Beer on the wall," cr
+." fifty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-seven Bottles of Beer on the wall." cr
+." Oh, fifty-seven Bottles of Beer on the wall," cr
+." fifty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-six Bottles of Beer on the wall." cr
+." Oh, fifty-six Bottles of Beer on the wall," cr
+." fifty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-five Bottles of Beer on the wall." cr
+." Oh, fifty-five Bottles of Beer on the wall," cr
+." fifty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-four Bottles of Beer on the wall." cr
+." Oh, fifty-four Bottles of Beer on the wall," cr
+." fifty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-three Bottles of Beer on the wall." cr
+." Oh, fifty-three Bottles of Beer on the wall," cr
+." fifty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-two Bottles of Beer on the wall." cr
+." Oh, fifty-two Bottles of Beer on the wall," cr
+." fifty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-one Bottles of Beer on the wall." cr
+." Oh, fifty-one Bottles of Beer on the wall," cr
+." fifty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty Bottles of Beer on the wall." cr
+." Oh, fifty Bottles of Beer on the wall," cr
+." fifty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-nine Bottles of Beer on the wall." cr
+." Oh, forty-nine Bottles of Beer on the wall," cr
+." forty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-eight Bottles of Beer on the wall." cr
+." Oh, forty-eight Bottles of Beer on the wall," cr
+." forty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-seven Bottles of Beer on the wall." cr
+." Oh, forty-seven Bottles of Beer on the wall," cr
+." forty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-six Bottles of Beer on the wall." cr
+." Oh, forty-six Bottles of Beer on the wall," cr
+." forty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-five Bottles of Beer on the wall." cr
+." Oh, forty-five Bottles of Beer on the wall," cr
+." forty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-four Bottles of Beer on the wall." cr
+." Oh, forty-four Bottles of Beer on the wall," cr
+." forty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-three Bottles of Beer on the wall." cr
+." Oh, forty-three Bottles of Beer on the wall," cr
+." forty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-two Bottles of Beer on the wall." cr
+." Oh, forty-two Bottles of Beer on the wall," cr
+." forty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-one Bottles of Beer on the wall." cr
+." Oh, forty-one Bottles of Beer on the wall," cr
+." forty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty Bottles of Beer on the wall." cr
+." Oh, forty Bottles of Beer on the wall," cr
+." forty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-nine Bottles of Beer on the wall." cr
+." Oh, thirty-nine Bottles of Beer on the wall," cr
+." thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-eight Bottles of Beer on the wall." cr
+." Oh, thirty-eight Bottles of Beer on the wall," cr
+." thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-seven Bottles of Beer on the wall." cr
+." Oh, thirty-seven Bottles of Beer on the wall," cr
+." thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-six Bottles of Beer on the wall." cr
+." Oh, thirty-six Bottles of Beer on the wall," cr
+." thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-five Bottles of Beer on the wall." cr
+." Oh, thirty-five Bottles of Beer on the wall," cr
+." thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-four Bottles of Beer on the wall." cr
+." Oh, thirty-four Bottles of Beer on the wall," cr
+." thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-three Bottles of Beer on the wall." cr
+." Oh, thirty-three Bottles of Beer on the wall," cr
+." thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-two Bottles of Beer on the wall." cr
+." Oh, thirty-two Bottles of Beer on the wall," cr
+." thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-one Bottles of Beer on the wall." cr
+." Oh, thirty-one Bottles of Beer on the wall," cr
+." thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty Bottles of Beer on the wall." cr
+." Oh, thirty Bottles of Beer on the wall," cr
+." thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-nine Bottles of Beer on the wall." cr
+." Oh, twenty-nine Bottles of Beer on the wall," cr
+." twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-eight Bottles of Beer on the wall." cr
+." Oh, twenty-eight Bottles of Beer on the wall," cr
+." twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-seven Bottles of Beer on the wall." cr
+." Oh, twenty-seven Bottles of Beer on the wall," cr
+." twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-six Bottles of Beer on the wall." cr
+." Oh, twenty-six Bottles of Beer on the wall," cr
+." twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-five Bottles of Beer on the wall." cr
+." Oh, twenty-five Bottles of Beer on the wall," cr
+." twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-four Bottles of Beer on the wall." cr
+." Oh, twenty-four Bottles of Beer on the wall," cr
+." twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-three Bottles of Beer on the wall." cr
+." Oh, twenty-three Bottles of Beer on the wall," cr
+." twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-two Bottles of Beer on the wall." cr
+." Oh, twenty-two Bottles of Beer on the wall," cr
+." twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-one Bottles of Beer on the wall." cr
+." Oh, twenty-one Bottles of Beer on the wall," cr
+." twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty Bottles of Beer on the wall." cr
+." Oh, twenty Bottles of Beer on the wall," cr
+." twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." nineteen Bottles of Beer on the wall." cr
+." Oh, nineteen Bottles of Beer on the wall," cr
+." nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighteen Bottles of Beer on the wall." cr
+." Oh, eighteen Bottles of Beer on the wall," cr
+." eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventeen Bottles of Beer on the wall." cr
+." Oh, seventeen Bottles of Beer on the wall," cr
+." seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixteen Bottles of Beer on the wall." cr
+." Oh, sixteen Bottles of Beer on the wall," cr
+." sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifteen Bottles of Beer on the wall." cr
+." Oh, fifteen Bottles of Beer on the wall," cr
+." fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fourteen Bottles of Beer on the wall." cr
+." Oh, fourteen Bottles of Beer on the wall," cr
+." fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirteen Bottles of Beer on the wall." cr
+." Oh, thirteen Bottles of Beer on the wall," cr
+." thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twelve Bottles of Beer on the wall." cr
+." Oh, twelve Bottles of Beer on the wall," cr
+." twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eleven Bottles of Beer on the wall." cr
+." Oh, eleven Bottles of Beer on the wall," cr
+." eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ten Bottles of Beer on the wall." cr
+." Oh, ten Bottles of Beer on the wall," cr
+." ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." nine Bottles of Beer on the wall." cr
+." Oh, nine Bottles of Beer on the wall," cr
+." nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eight Bottles of Beer on the wall." cr
+." Oh, eight Bottles of Beer on the wall," cr
+." eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seven Bottles of Beer on the wall." cr
+." Oh, seven Bottles of Beer on the wall," cr
+." seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six Bottles of Beer on the wall." cr
+." Oh, six Bottles of Beer on the wall," cr
+." six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five Bottles of Beer on the wall." cr
+." Oh, five Bottles of Beer on the wall," cr
+." five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four Bottles of Beer on the wall." cr
+." Oh, four Bottles of Beer on the wall," cr
+." four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three Bottles of Beer on the wall." cr
+." Oh, three Bottles of Beer on the wall," cr
+." three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two Bottles of Beer on the wall." cr
+." Oh, two Bottles of Beer on the wall," cr
+." two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one Bottle of Beer on the wall." cr
+." Oh, one Bottle of Beer on the wall," cr
+." one Bottle of Beer!," cr
+." Take it down and pass it around..." cr
+." How dry I am! How dry I am!" cr
+." No body knows how dry I am." cr
+." How ... Dry I ... Aaaammm." cr
Added: fcode-utils/testsuite/TokMisc/TooLargeBufferMulPciFcb.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/TooLargeBufferMulPciFcb.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/TooLargeBufferMulPciFcb.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,107 @@
+\ Test case of overflowing the output buffer
+\ and multiple PCI Headers and FCode blocks
+\ Body generated by the "Verbal Bottles of Beer" script,
+\ (Argument of 646 just does it.)
+
+tokenizer[
+
+ c020
+ SET-REV-LEVEL
+ dec1 \ Vendor
+ c0ed \ Device ID
+ 80201 \ Class Code (ISA system timer. Denver Colorado )
+
+ ]tokenizer
+
+ pci-header
+
+fcode-version2 \ Sixteen-bit offsets.
+
+headers
+
+: a-lot-of-beer
+
+fload TooLargeBeerBuffer_body.fth
+
+;
+
+
+fcode-end
+
+fcode-version2 \ Sixteen-bit offsets.
+
+: and-a-lot-more-beer
+
+fload TooLargeBeerBuffer_body.fth
+
+;
+
+fcode-end
+
+not-last-image
+
+pci-header-end
+
+
+tokenizer[
+
+ b020
+ SET-REV-LEVEL
+ fece \ Vendor
+ d00d \ Device ID
+ 90210 \ Class Code (Unknown. Beverly Hills )
+
+ ]tokenizer
+
+ pci-header
+
+fcode-version2 \ Sixteen-bit offsets.
+
+: What?Still-more-beer?
+
+fload TooLargeBeerBuffer_body.fth
+
+;
+
+: What-the-hey!More-beer
+
+fload TooLargeBeerBuffer_body.fth
+
+;
+
+: Keep-the-beer-comin',-Mate!
+
+fload TooLargeBeerBuffer_body.fth
+
+;
+
+: Let's-have-one-for-Cliffie
+
+fload TooLargeBeerBuffer_body.fth
+
+;
+
+
+: And-TWO-for-Norm
+
+fload TooLargeBeerBuffer_body.fth
+
+fload TooLargeBeerBuffer_body.fth
+
+;
+
+: What-Does-Carla-Have-To-Say?
+
+ LET's-have-ONE-for-CLIFfie
+ and-Two-for-nORM
+ WHAT?Still-more-BEER?
+ Keep-the-BEER-Comin',-MATE!
+;
+
+fcode-end
+
+last-image
+
+pci-header-end
+
+headers
Added: fcode-utils/testsuite/TokMisc/UserMacros.fth
===================================================================
--- fcode-utils/testsuite/TokMisc/UserMacros.fth (rev 0)
+++ fcode-utils/testsuite/TokMisc/UserMacros.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,53 @@
+\ Test of user-defined macros and other new features,
+\ needed for compatibility with internal sources.
+
+
+[macro] lookma .( Look, Ma! No hands! Ooooops! )
+[macro] lookpa .( Hey, Pa! Hands! HaHa! )
+[macro] f[lookout f[ .( Look out, look out look out! ##Crash!# )
+[macro] f[lookquote f[ ." I'll never forget you #Leader of the Pack!#"
+
+fcode-version2
+headers
+
+lookma
+lookpa
+f[lookout ]f
+f[lookquote ]f
+
+[macro] 4+ 4 +
+[macro] 3+ 3 +
+
+f[ h# 800 next-fcode ]f
+
+: surplus
+ 4+
+ 3+
+ 2+
+ 1+
+;
+[message] Now for some fun
+: sourpuss
+ a# CPU
+ al# CPU
+ a# ICUP
+ al# ICUP
+ a# IPEEINACUP
+ al# IPEEINACUP
+;
+
+a# CPU constant a#CPU
+al# CPU constant al#CPU
+a# ICUP constant a#ICUP
+al# ICUP constant al#ICUP
+a# IPEEINACUP constant a#IPEEINACUP
+al# IPEEINACUP constant al#IPEEINACUP
+
+fcode-push
+f[ h# 800 next-fcode ]f
+fcode-pop
+
+
+fcode-end
+
+
Added: fcode-utils/testsuite/TokMisc/sub.w.dots/MulDev
===================================================================
--- fcode-utils/testsuite/TokMisc/sub.w.dots/MulDev (rev 0)
+++ fcode-utils/testsuite/TokMisc/sub.w.dots/MulDev 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,40 @@
+\ Test creating multiple device-nodes
+\ Let's contrive this to (almost...) pass the "Original" tokenizer as well,
+\ and display the contrast.
+\ Updated Mon, 30 May 2005 at 19:44 by David L. Paktor
+
+alias // \
+// Funny kind of comment. What? C-Plus style? Not even a "B"...
+
+fcode-version2
+
+headers
+
+create (sis 6 c, 8 c, 12 c,
+: err-shoot) ( -- 0 ) h# defeca8e .h ;
+: eatit( h# feedface .h cr ;
+: open ( -- success )
+ err-shoot)
+ ." No dice, Cholly." cr
+ eatit(
+ false
+;
+
+" sis" encode-string " name" property
+
+finish-device
+new-device
+
+: eatit( h# 900df00d .h cr ; \ This should be a new definition
+
+: open ( -- success )
+ err-shoot) \ This should be an "Unknown Word"
+ ." I'm sorry, Dave. I can't do that." cr
+ eatit( \ This should be the above
+ \ new definition in any case.
+ false
+;
+
+" boombah" encode-string " name" property
+
+fcode-end
Added: fcode-utils/testsuite/TokeCommon/BinData.bin
===================================================================
--- fcode-utils/testsuite/TokeCommon/BinData.bin (rev 0)
+++ fcode-utils/testsuite/TokeCommon/BinData.bin 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,3 @@
+U������0@��t��}��E�%����f�E��E�
+?f�E��m��$P@��Ð��������������U��������������E��E����E��}�$ @���$���E ����D$�$ @���E ����D$�$ @��D$( @�E ����$�|�E��D$+ @�E ����$�a�E��}�t�}�u�$. @�f�$�J�E��$� �E��E��@ �� ��t��}�t܋E��D$�E��$���NjE��$�ƋE��$��$��������������Q���=r��� -��)�� ���̋�@�����U1�����u��u�]��D$�4$賃���t
+�$��@@����\$�����\$�4$考�� $�Ӑ��������%�@@���%�@@���%�@@���%�@@���%�@@�����������%�@@���%�@@��U1���S���] �����C�1ɺ��C����C �������C,�@�C0�@�C0@����@@�C�Cx�E�CH�@�CL�@�C(�E�CP�@�CT�@�C$0@��Cp@�C `@�C P@�CD@@�$��C|���C4 @�C8 @�C<0@�C@@0@蛸�]��������@@��^����$�!��1����t҉Ӹ������������������%�@@���%�@@��U��MV�uS�] � �Q����9�r�[^]Í���U�@��P @�� �T$�D$�$P @�����Ð����������%�@@���%�@@���%�@@���%�@@��U��]Ð����������U��]Ð����������U��]Ð����������U��]Ð�����������%�@@���%�@@����������
\ No newline at end of file
Added: fcode-utils/testsuite/TokeCommon/MyBeerAndYouCannotHaveIt.fth
===================================================================
--- fcode-utils/testsuite/TokeCommon/MyBeerAndYouCannotHaveIt.fth (rev 0)
+++ fcode-utils/testsuite/TokeCommon/MyBeerAndYouCannotHaveIt.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,7 @@
+[message] Starting out with one Bottle of Beer on the wall
+." Oh, one Bottle of Beer on the wall," cr
+." one Bottle of Beer!," cr
+." Take it down and pass it around..." cr
+." How dry I am! How dry I am!" cr
+." No body knows how dry I am." cr
+." How ... Dry I ... Aaaammm." cr
Added: fcode-utils/testsuite/TokeCommon/NoRead.bin
===================================================================
--- fcode-utils/testsuite/TokeCommon/NoRead.bin (rev 0)
+++ fcode-utils/testsuite/TokeCommon/NoRead.bin 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,3 @@
+U������0@��t��}��E�%����f�E��E�
+?f�E��m��$P@��Ð��������������U��������������E��E����E��}�$ @���$���E ����D$�$ @���E ����D$�$ @��D$( @�E ����$�|�E��D$+ @�E ����$�a�E��}�t�}�u�$. @�f�$�J�E��$� �E��E��@ �� ��t��}�t܋E��D$�E��$���NjE��$�ƋE��$��$��������������Q���=r��� -��)�� ���̋�@�����U1�����u��u�]��D$�4$賃���t
+�$��@@����\$�����\$�4$考�� $�Ӑ��������%�@@���%�@@���%�@@���%�@@���%�@@�����������%�@@���%�@@��U1���S���] �����C�1ɺ��C����C �������C,�@�C0�@�C0@����@@�C�Cx�E�CH�@�CL�@�C(�E�CP�@�CT�@�C$0@��Cp@�C `@�C P@�CD@@�$��C|���C4 @�C8 @�C<0@�C@@0@蛸�]��������@@��^����$�!��1����t҉Ӹ������������������%�@@���%�@@��U��MV�uS�] � �Q����9�r�[^]Í���U�@��P @�� �T$�D$�$P @�����Ð����������%�@@���%�@@���%�@@���%�@@��U��]Ð����������U��]Ð����������U��]Ð����������U��]Ð�����������%�@@���%�@@����������
\ No newline at end of file
Added: fcode-utils/testsuite/TokeCommon/OneBeer.fl
===================================================================
Added: fcode-utils/testsuite/TokeCommon/OneBeer.fth
===================================================================
--- fcode-utils/testsuite/TokeCommon/OneBeer.fth (rev 0)
+++ fcode-utils/testsuite/TokeCommon/OneBeer.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,7 @@
+[message] Starting out with one Bottle of Beer on the wall
+." Oh, one Bottle of Beer on the wall," cr
+." one Bottle of Beer!," cr
+." Take it down and pass it around..." cr
+." How dry I am! How dry I am!" cr
+." No body knows how dry I am." cr
+." How ... Dry I ... Aaaammm." cr
Added: fcode-utils/testsuite/TokeCommon/ZeroLen.bin
===================================================================
Added: fcode-utils/testsuite/TokeErrs/AbrtWQuotStr.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/AbrtWQuotStr.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/AbrtWQuotStr.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,26 @@
+\ Abort-quote with embedded quote in the string.
+
+\ Updated Tue, 16 May 2006 at 17:57 PDT by David L. Paktor
+
+
+
+fcode-version2
+hex
+headers
+
+: sunny-de-light
+ abort" Oh, this is the Sun-Style abort"" with a "\
+ built-in quote and multi-line! Cool..."
+;
+
+
+[flag] noSun-ABORT-Quote
+
+: apple-pi-alamo
+ if abort" And this is the Apple-Style abort"" with "\
+ also a multi-line and built-in quote. Ho, hum."
+ then
+;
+
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/CStrEscOvflw.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/CStrEscOvflw.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/CStrEscOvflw.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,23 @@
+\ Test case of a C-String-Escape clause that overflows the source-file
+
+[flag] C-Style-string-escape
+
+fcode-version2
+
+headers
+hex
+
+: funky-string
+ ." Normal string" cr
+ ." Funky but ok \ab\\b0\\7\\7\and\c0\\5\\7\\e1\\10\" cr
+ ." Body 1" cr
+fload CStrEscOvflw_body_1.fth
+ ." Body 2" cr
+fload CStrEscOvflw_body_2.fth
+ ." Body 3" cr
+fload CStrEscOvflw_body_3.fth
+
+ ." I don't know." cr ." Shortstop!" cr
+;
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/CStrEscOvflw_body_1.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/CStrEscOvflw_body_1.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/CStrEscOvflw_body_1.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,5 @@
+\ Body 1 for test of string with c-string-escaped hex byte that ends abruptly.
+\ This ends with no hex value after the last backslash, and a quote
+\ and a new-line.
+
+." What's on s\e\ \c0\n\db\\a5\\"
Added: fcode-utils/testsuite/TokeErrs/CStrEscOvflw_body_2.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/CStrEscOvflw_body_2.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/CStrEscOvflw_body_2.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,10 @@
+\ Body 2 for test of string with c-string-escaped hex byte that ends abruptly.
+\ This ends with no hex value after the last backslash, and a new-line.
+\
+\ Body 3 is made from this by using dd to truncate the new-line.
+\ The c-shell command sequence goes like this:
+\ set len = `cat CStrEscOvflw_body_2.fth | wc -c`
+\ @ len--
+\ dd if=CStrEscOvflw_body_2.fth of=CStrEscOvflw_body_3.fth count=1 bs=$len
+
+." What's on s\e\ \c0\n\db\\a5\\
Added: fcode-utils/testsuite/TokeErrs/CStrEscOvflw_body_3.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/CStrEscOvflw_body_3.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/CStrEscOvflw_body_3.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,10 @@
+\ Body 2 for test of string with c-string-escaped hex byte that ends abruptly.
+\ This ends with no hex value after the last backslash, and a new-line.
+\
+\ Body 3 is made from this by using dd to truncate the new-line.
+\ The c-shell command sequence goes like this:
+\ set len = `cat CStrEscOvflw_body_2.fth | wc -c`
+\ @ len--
+\ dd if=CStrEscOvflw_body_2.fth of=CStrEscOvflw_body_3.fth count=1 bs=$len
+
+." What's on s\e\ \c0\n\db\\a5\\
\ No newline at end of file
Added: fcode-utils/testsuite/TokeErrs/CommOvrRun.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/CommOvrRun.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/CommOvrRun.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,26 @@
+\ Error-check comment and string over-runs
+
+\ Updated Wed, 06 Jul 2005 at 18:19 by David L. Paktor
+
+
+fcode-version2
+
+headers
+
+fload CommOvrRun_01.fth
+
+fload CommOvrRun_02.fth
+
+; \ Finish-up colon-def'n started in prev file.
+
+[message] About to load file w/ no e-o-l
+fload CommOvrRun_03.fth
+[message] Back to the main file.
+
+fload CommOvrRun_04.fth
+
+ tokenizer[
+fload CommOvrRun_05.fth
+ ]tokenizer
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/CommOvrRun_01.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/CommOvrRun_01.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/CommOvrRun_01.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,12 @@
+\ First inclusion file for comment and string over-runs Error-check test
+
+
+\ Bum string
+[message] Collecting bum string
+
+" Starts Out okay "( 09 5
+ \ Goes to numbers
+ 12 13 ) And then what? "( 00 07 \ Never concludes for three lines
+
+
+
Added: fcode-utils/testsuite/TokeErrs/CommOvrRun_02.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/CommOvrRun_02.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/CommOvrRun_02.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,9 @@
+\ Second inclusion file for comment and string over-runs Error-check test
+
+
+[message] Stack Diagram w/o conclusion
+: fuddy ( stack diagram
+ ." but where does it end?"
+ ." Does it end?"
+ ." No, it does not..."
+;
Added: fcode-utils/testsuite/TokeErrs/CommOvrRun_03.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/CommOvrRun_03.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/CommOvrRun_03.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,4 @@
+\ Third inclusion file for comment over-runs and string Error-check test
+
+
+\ Remark w/out terminating end-of-line here
\ No newline at end of file
Added: fcode-utils/testsuite/TokeErrs/CommOvrRun_04.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/CommOvrRun_04.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/CommOvrRun_04.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,8 @@
+\ Fourth inclusion file for comment over-runs and string Error-check test
+
+[message] String w/o conclusion
+: duddy ( -- stack diagram )
+ ." but where does it end?"
+ ." Does it end?"
+ ." No, it does not...
+;
Added: fcode-utils/testsuite/TokeErrs/CommOvrRun_05.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/CommOvrRun_05.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/CommOvrRun_05.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,7 @@
+\ Fifth inclusion file for comment over-runs and string Error-check test
+
+
+[message] Unconcluded dot-quote
+.( Is everybody having a good time? I don't know if I am...
+
+3700 constant sig_freq \ Signal Freak-went-sea
Added: fcode-utils/testsuite/TokeErrs/CondlDefn.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/CondlDefn.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/CondlDefn.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,27 @@
+\ Definitions inside a conditional -- a definite no-no!
+\ Updated Fri, 28 Jul 2006 at 10:12 PDT by David L. Paktor
+
+fcode-version2
+headers
+
+false value de-bug
+
+de-bug if h# 273 constant ugh-muck-a-luck-a
+ 3 0 do i constant bug-off
+ i 4 * constant bug-bug
+ ugh-muck-a-luck-a bug-bug bug-off * - .
+ loop
+else
+ d# 273 constant ugh-muck-a-luck-a
+then
+
+: shakshuka
+ de-bug if ." Bugging me" then
+ bug-bug
+ ugh-muck-a-luck-a
+ o# 273 constant ugh-muck-a-luck-a
+ de-bug if : ugh-muck-b-luck-b then
+ bug-off * - .
+;
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/ControlMismatch.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/ControlMismatch.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/ControlMismatch.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,76 @@
+\ Control-Structures Mismatch Error-Detection test.
+
+\ Updated Wed, 16 Nov 2005 at 09:46 PST by David L. Paktor
+
+fcode-version2
+hex
+headers
+2
+begin 1- dup while 4 c, repeat
+
+repeat
+
+until
+
+: anawanna
+ 123
+ else \ This used to cause a "Fatal"
+ 456
+ then
+;
+
+: granada
+ 789 begin
+ 0 1 2 3
+ 1011 begin 2 1 0 3 2swap swap rot
+ else 3 1 0 2 2swap -rot
+ loop 2 3 0 1
+;
+
+: obknoxin
+ 678 begin
+ 0 1 2 3
+ 910 begin 2 1 0 3
+ else 3 1 0 2 2512
+ loop 2 3 0 1
+;
+
+: tixon
+ 987 0 do 0 1 2 3
+ 654 begin 3 2 1 0
+ 0ace
+ else 3 0 1 2
+ 0feed
+ then
+ repeat
+;
+
+: spew-agnu
+ 5417
+ then
+;
+: bunk
+ 543 if
+ 345 else
+ 789
+;
+
+: junk
+ h# ace
+ then
+;
+: clunk
+ 0=
+ begin 1- ?dup if
+ endcase
+ then
+ until
+;
+
+: skunk
+ endof
+;
+;
+
+tokenizer[ tokenizer[ ]tokenizer ]tokenizer
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/DevImbal.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/DevImbal.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/DevImbal.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,53 @@
+\ Test an imbalanced control statement before a device-node change
+
+
+fcode-version2
+hex
+headers
+
+alias rc! rb!
+
+[message] Top-Level (root) device-node
+create achin 12 c, 13 c, 14 c,
+: breakin achin 3 bounds do i c@ . loop ;
+: creakin 0 if breakin then ;
+: deacon achin creakin drop breakin ;
+
+[message] Control structure starts here
+3 0 do
+ i ." loop number" .
+[message] Forgot the "loop" here.
+
+[message] Subsidiary (child) device-node
+new-device
+create eek! 18 c, 17 c, 80 c, 79 c,
+: freek eek! 4 bounds ?do i c@ . 1 +loop ;
+: greek -1 if freek then ;
+[message] About to access method from parent node
+: hierareek
+ eek!
+ freek
+ achin
+ greek
+;
+: ikey hierareek freek greek ;
+[message] about to end child node
+[message] But first a bogus incomplete control structure
+false if
+ ." This should not be happening"
+[message] "Forgot" the then here...
+finish-device
+[message] We can access methods from the root node now
+: jeeky
+ achin
+ 3 type
+;
+[message] Proved our point I think.
+
+[message] Another bogo-crol
+ begin ." What the hey?" 0 while
+ ." Forgot it again..."
+[message] Missing repeat...
+
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/DevNodAli.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/DevNodAli.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/DevNodAli.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,147 @@
+\ Test scope of "aliased" name in device-node
+\ along w/ excess of "finish-device"
+
+\ Updated Mon, 31 Oct 2005 at 13:19 PST by David L. Paktor
+\
+
+[flag] Local-Values
+show-flags
+
+fcode-version2
+
+fload LocalValuesSupport.fth
+
+headers
+
+\ Should an alias to a core-function be local to the device-node
+\ in which it was made, or global to the whole tokenization?
+\ After talking w/ Jim L., answer is: Global.
+\ An alias to a core-function goes into the core vocab.
+
+\ But! When new-device or finish-device is used inside a
+\ colon-definition, it should not change the tok'z'n-time vocab...
+
+alias foop dup \ Here's a classic case
+alias pelf my-self \ Here's another
+
+\ And here are two just to screw you up!
+alias >> lshift
+alias << rshift
+
+: troop ." Dup to my-self" foop to pelf ;
+
+alias snoop troop
+
+: croup foop snoop ;
+
+: make-rope-name ( slip-number -- )
+ { _slip }
+ " roper_" encode-string
+ _slip (.) encode-string encode+ name
+;
+
+: slip-prop ( slip-number -- )
+ { _slip }
+ _slip not d# 24 >>
+ _slip d# 16 >> +
+ _slip not 1 << h# 0ff and 8 >> +
+ _slip +
+ encode-int " slipknot" property
+;
+
+hex
+create achin \ Table of slip-numbers for each device
+ 12 c, 13 c, 14 c,
+ 56 c, 43 c, 50 c, 54 c,
+0 c, \ 0-byte is list-terminator
+
+: make-name-and-prop ( slip-number -- )
+ foop
+ make-rope-name
+ slip-prop
+;
+
+: tie-one-on ( slip-number -- )
+ new-device make-name-and-prop
+;
+
+[message] Define a method that creates subsidiaries...
+: spawn-offspring ( -- )
+ achin
+ begin ( addr )
+ dup c@ ?dup while ( addr slip )
+ tie-one-on
+ finish-device
+ 1+ \ Bump to next entry
+ repeat drop
+;
+
+: more-offs ( -- addr count )
+ " "( \ Another table of offsprings' slip-numbers
+ )YUMA"( \ Some of them are letters
+ 85 92 13 \ Some are not
+ )" \ That is all
+;
+
+: tap-it-out ( n -- n+1 )
+ finish-device
+ 1+
+;
+
+: spawn-more
+ 0 more-offs bounds do
+ new-device i c@
+ make-name-and-prop
+ tap-it-out
+ loop
+ encode-int " num-offs" property
+;
+
+[message] Subsidiary (child) device-node
+new-device
+create eek! 18 c, 17 c, 80 c, 79 c,
+: freek eek! 4 bounds ?do i c@ . 1 +loop ;
+: greek -1 if freek then ;
+[message] About to access method from parent node
+: hierareek
+ eek!
+ freek
+ achin
+ greek
+;
+: ikey hierareek freek greek ;
+\ Does (Should) the new device know about its parent's aliases?
+: bad-refs
+ croup
+ foop
+ snoop
+ foop
+ to pelf
+;
+
+[message] end child node
+finish-device
+
+[message] Access methods from the root node again
+: refs-good-again
+ croup
+ foop
+ snoop
+ foop
+ to pelf
+;
+
+[message] An extra finish-device
+finish-device
+[message] Are we still here?
+
+: spoof
+ bad-refs
+ foop
+ refs-good-again
+;
+
+\ That is all...
+
+fcode-end
+
Added: fcode-utils/testsuite/TokeErrs/DevNodAli_01.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/DevNodAli_01.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/DevNodAli_01.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,159 @@
+\ Test scope of "aliased" name in device-node
+\ along w/ excess of "finish-device"
+\ DevNodAli_01.fth -- slight variant relative to DevNodAli.fth
+
+\ Updated Thu, 12 Jan 2006 at 15:36 PST by David L. Paktor
+\
+
+[flag] Local-Values
+show-flags
+
+fcode-version2
+
+fload LocalValuesSupport.fth
+
+headers
+
+\ Should an alias to a core-function be local to the device-node
+\ in which it was made, or global to the whole tokenization?
+\ After talking w/ Jim L., answer is: Global.
+\ An alias to a core-function goes into the core vocab.
+
+\ But! When new-device or finish-device is used inside a
+\ colon-definition, it should not change the tok'z'n-time vocab...
+
+\ I gave some further thought to the question of
+\ the scope of a alias to a core-function.
+\ A true FORTH-based tokenizer would place an alias-created definition
+\ into the "current" vocabulary, regardless of where the target of
+\ the alias was found. I now believe we should do the same, also.
+\ If the user intends to define an alias with global scope, then
+\ that intention should be expressed explicitly.
+\ Like this:
+
+global-definitions
+ alias foop dup \ Here's a classic case
+ alias pelf my-self \ Here's another
+
+ \ And here are two just to screw you up!
+ alias >> lshift
+ alias << rshift
+device-definitions
+
+: troop ." Dup to my-self" foop to pelf ;
+
+alias snoop troop
+
+: croup foop snoop ;
+
+: make-rope-name ( slip-number -- )
+ { _slip }
+ " roper_" encode-string
+ _slip (.) encode-string encode+ name
+;
+
+: slip-prop ( slip-number -- )
+ { _slip }
+ _slip not d# 24 >>
+ _slip d# 16 >> +
+ _slip not 1 << h# 0ff and 8 >> +
+ _slip +
+ encode-int " slipknot" property
+;
+
+hex
+create achin \ Table of slip-numbers for each device
+ 12 c, 13 c, 14 c,
+ 56 c, 43 c, 50 c, 54 c,
+0 c, \ 0-byte is list-terminator
+
+: make-name-and-prop ( slip-number -- )
+ foop
+ make-rope-name
+ slip-prop
+;
+
+: tie-one-on ( slip-number -- )
+ new-device make-name-and-prop
+;
+
+[message] Define a method that creates subsidiaries...
+: spawn-offspring ( -- )
+ achin
+ begin ( addr )
+ dup c@ ?dup while ( addr slip )
+ tie-one-on
+ finish-device
+ 1+ \ Bump to next entry
+ repeat drop
+;
+
+: more-offs ( -- addr count )
+ " "( \ Another table of offsprings' slip-numbers
+ )YUMA"( \ Some of them are letters
+ 85 92 13 \ Some are not
+ )" \ That is all
+;
+
+: tap-it-out ( n -- n+1 )
+ finish-device
+ 1+
+;
+
+: spawn-more
+ 0 more-offs bounds do
+ new-device i c@
+ make-name-and-prop
+ tap-it-out
+ loop
+ encode-int " num-offs" property
+;
+
+[message] Subsidiary (child) device-node
+new-device
+create eek! 18 c, 17 c, 80 c, 79 c,
+: freek eek! 4 bounds ?do i c@ . 1 +loop ;
+: greek -1 if freek then ;
+[message] About to access method from parent node
+: hierareek
+ eek!
+ freek
+ achin
+ greek
+;
+: ikey hierareek freek greek ;
+\ Does (Should) the new device know about its parent's aliases?
+: bad-refs
+ croup
+ foop
+ snoop
+ foop
+ to pelf
+;
+
+[message] end child node
+finish-device
+
+[message] Access methods from the root node again
+: refs-good-again
+ croup
+ foop
+ snoop
+ foop
+ to pelf
+;
+
+[message] An extra finish-device
+finish-device
+[message] Are we still here?
+
+: spoof
+ bad-refs
+ foop
+ refs-good-again
+;
+
+\ That is all...
+
+fcode-end
+
Added: fcode-utils/testsuite/TokeErrs/DupNams.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/DupNams.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/DupNams.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,81 @@
+\ Let's make a batch of duplicate definitions in various scopes...
+
+\ Updated Fri, 02 Jun 2006 at 09:48 PDT by David L. Paktor
+
+alias foop dup
+
+[macro] croop foop message" Using FOOP "
+
+alias dup croop
+
+\ Stubs.
+\ These should be global.
+\ But, then, we _are_ injecting errors for this test....
+
+[macro] _{local} noop #message" I got yer ""Local"" right here, chum!"
+
+alias {pop-locals} 3drop
+
+f[ h# a5519e constant {push-locals} ]f
+
+
+global-definitions
+
+alias flop drop
+[macro] floop flop message" Using FLOOP "
+alias drop floop
+
+device-definitions
+
+f[ false constant o'ryan ]f
+
+fcode-version2
+
+: noop ." Op? No!" ;
+[macro] zoop noop message" I Care."
+: poop h# defeca8e ;
+
+ new-device
+ : zoop ." Nothing like the other zoop" croop ;
+ : croop ." Sort of like F-Troop with a higher GPA..."
+ foop
+ ;
+ : foop ." Shop bop-a-looma, a-lop bam boom!" ;
+ : floop ." Oh, Jiggly!" ;
+ : boop { _harpo | _cheeko }
+ f[ 127 constant _harpo ]f
+ poop -> _cheeko
+ f[ _cheeko constant a__gent ]f
+ ;
+
+ alias droop drop
+ alias drupe 2drop
+
+ boop f[ true constant o'ryan ]f
+ foop 03 constant 3
+
+ new-device
+ : moop
+ _harpo
+ droop
+ drupe
+ ;
+ alias shoop encode-int
+
+ f[
+ 7a63 constant octal
+ boop
+ char-height
+ eval
+ moop
+ shoop
+ ]f
+
+ finish-device
+
+ finish-device
+
+fcode-end
+
+\ Let's just stick in an extra...
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/ExpPath.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/ExpPath.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/ExpPath.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,63 @@
+\ Test FLOADing and ENCODing-a-File with embedded Env't V'bles in pathnames
+\ Let's not add any requirements on the environment. We'll expect the
+\ existence of a sibling-directory called TokeCommon
+\ and the non-existence of anything with "NonExist" in its name.
+
+
+fcode-version2
+hex
+headers
+
+\ Constructs like :h don't work because the path-string
+\ gets interpreted by Bourne Shell syntax.
+." ${PWD:h}/TokeCommon/OneBeer.fth"
+fload ${PWD:h}/TokeCommon/OneBeer.fth
+
+\ This works.
+." ${PWD}/../TokeCommon/OneBeer.fth"
+fload ${PWD}/../TokeCommon/OneBeer.fth
+
+\ \ Fuggedabout these...
+\ ." $PWD:h/TokeCommon/OneBeer.fth"
+\ fload $PWD:h/TokeCommon/OneBeer.fth
+\ fload $PWD:h/TokeCommon/NonExist.fth
+\ ." ../../$PWD:h:t/TokeCommon/BinData.bin"
+\ encode-file ../../$PWD:h:t/TokeCommon/BinData.bin
+\ ." ../../$PWD:h:t/TokeCommon/ZeroLen.bin"
+\ encode-file ../../$PWD:h:t/TokeCommon/ZeroLen.bin
+
+\ Intended not to work
+fload $PWD/../NonExist/NonExist.fth
+[message] Fload an Unreadable file (No read Permissions)
+fload ${PWD}/../TokeCommon/MyBeerAndYouCannotHaveIt.fth
+[message] Fload a Zero-Length file (extension doesn't matter...)
+fload ${PWD}/../TokeCommon/ZeroLen.bin
+
+[message] FLoad with intentional syntax error
+fload ${PWD/../TokeCommon/OneBeer.fth
+
+\ This works.
+." $PWD/../TokeCommon/BinData.bin"
+encode-file $PWD/../TokeCommon/BinData.bin
+" $PWD/../TokeCommon/BinData.bin" property
+
+\ Intended not to work
+[message] Encode a NonExistent file
+encode-file $PWD/../NonExist/NonExist.bin
+[message] Encode an Unreadable file (No read Permissions)
+encode-file $PWD/../TokeCommon/NoRead.bin
+
+[message] Encode with intentional syntax error
+encode-file ${PWD/../TokeCommon/BinData.bin
+
+[message] Is this a syntax error? On some O/S'es but not others...
+." $PWD}/../TokeCommon/BinData.bin"
+encode-file $PWD}/../TokeCommon/BinData.bin
+
+[message] Encode a Zero length data file
+." $PWD/../TokeCommon/ZeroLen.bin"
+encode-file $PWD/../TokeCommon/ZeroLen.bin
+
+." That is all..."
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/FCShdrErrs.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/FCShdrErrs.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/FCShdrErrs.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,18 @@
+\ Basic FCODE Start Errors test.
+
+\ Updated Thu, 08 Sep 2005 at 17:27 by David L. Paktor
+
+
+hex
+
+." What is this?"
+
+
+fcode-version2
+
+headers
+ : bogo " This is a test." ;
+
+
+fcode-end
+
Added: fcode-utils/testsuite/TokeErrs/Frinstnce.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/Frinstnce.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/Frinstnce.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,89 @@
+\ Erorrrs involving "instance"
+
+\ Updated Thu, 19 Jan 2006 at 15:14 PST by David L. Paktor
+
+
+fcode-version2
+
+headers
+
+instance
+
+: goombah dup swap drop ;
+: foosbat over swap nip ;
+: casball dup dup rot rot drop drop ;
+ variable chump
+
+instance
+
+instance
+
+new-device
+ : what-the-heck ." What now?" ;
+ : how-now? ." Now what?" ;
+ 0 value sclump
+
+instance
+
+finish-device
+
+global-definitions
+ 237 buffer: mugwump
+
+device-definitions
+
+global-definitions
+ 880 buffer: nimnump
+ " madmirable_" count
+ dup nimnump c!
+ dup constant nimbasesiz
+ 0 do dup i + c@ nimnump 1+ i + c! loop
+ drop
+ [macro] (u.h) base @ hex swap (u.) rot base !
+ [macro] nimnumprop numnim nimnump count encode-string " nimnum" property
+ : numnim
+ nimnump nimbasesiz +
+ my-address (u.h)
+ dup >r
+ 0 do
+ 2dup i + c@ swap i + c!
+ loop 2drop
+ r> nimbasesiz + nimnump c!
+ ;
+
+ : gummink
+ dup
+ instance
+ numnim
+ ;
+
+ instance
+
+device-definitions
+
+: prumpick
+ dup
+ instance
+ gummink
+;
+
+new-device
+
+instance
+
+ nimnumprop
+
+true instance value hardware-store
+
+: knacknick
+ nimnumprop
+ instance
+;
+
+instance knacknick
+
+finish-device
+
+instance
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/GlobScopErrTst.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/GlobScopErrTst.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/GlobScopErrTst.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,91 @@
+\ Test the Global-Scope directive and a few of its effects.
+\ Updated Wed, 14 Dec 2005 at 09:59 PST by David L. Paktor
+\ Inject a few erorrs...
+
+fcode-version2
+
+headers
+
+[ifexists] coconuts
+ [message] Why a duck?
+[endif]
+
+alias [testdict] [ifexists]
+
+[testdict] coconuts
+ [message] Boy, can you get stucco!
+[else]
+ [message] Why a fence?
+[endif]
+
+\ Bypass warning about Instance without altering LocalValuesSupport file
+alias generic-instance instance
+overload [macro] instance f[ noop .( Shminstance!) f] noop
+
+\ This isn't right. The "bypass" only has scope in the top-level device-node
+
+global-definitions
+
+fload LocalValuesSupport.fth
+
+\ Replace normal meaning of Instance
+overload alias instance generic-instance
+
+: $CAT ( _max _str1 _len1 _str2 _len2 -- _max _str1 _len1' )
+ { _max _str1 _len1 _str2 _len2 }
+ _len1 _max < if \ there is room
+ _str2 _str1 _len1 + _len2 _max _len1 - min move
+ then
+ _max _str1 _len1 _len2 + _max min \ always leave total length
+;
+
+instance variable fussel [message] Expected error; scope is still global.
+h# 3afe fussel !
+
+device-definitions
+
+h# 5afe instance value dumont [message] Device scope in effect. SB Legit.
+: ducksoup ( n1 n2 n3 n4 -- m1 m2 )
+ { \ Declare some locals
+ _harpo ( the quiet one) _chico
+ _groucho | \ He's funny, right?
+ _zeppo ( who? ) _karl \ Is he part of the act?
+ }
+ d# 64 _groucho dup count dup -> _zeppo
+ _harpo dup count $cat
+ dup -> _karl
+ rot _karl = if type exit then
+ _groucho + swap _zeppo +
+;
+
+global-definitions
+
+: garbanzo
+ ." Should be unrecognized." cr
+ ducksoup
+;
+
+new-device [message] Missing a finish-device
+
+: fazooule!
+ ." Lima enter tain you..." cr
+ ducksoup
+ garbanzo
+;
+
+h# deadc0de instance value quaack [message] Instance should be legit here.
+
+global-definitions
+
+: frijoles
+ ." Holy ... beans?" cr
+ fazooule!
+ garbanzo
+ ducksoup
+;
+
+finish-device
+
+finish-device
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/GlobScopErrTst_01.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/GlobScopErrTst_01.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/GlobScopErrTst_01.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,91 @@
+\ Test the Global-Scope directive and a few of its effects.
+\ Updated Thu, 12 Jan 2006 at 15:36 PST by David L. Paktor
+\ GlobScopErrTst_01.fth -- very slight variant on GlobScopErrTst.fth
+
+fcode-version2
+
+headers
+
+[ifexists] coconuts
+ [message] Why a duck?
+[endif]
+
+alias [testdict] [ifexists]
+
+[testdict] coconuts
+ [message] Boy, can you get stucco!
+[else]
+ [message] Why a fence?
+[endif]
+
+\ Bypass Instance warning: Not right; only has scope in top-level dev-node
+alias generic-instance instance
+overload [macro] instance f[ noop .( Shminstance!) f] noop
+\ This will only work if user-macros always have "global" scope
+\ I think they should follow the common rules for scope; this should fail
+
+global-definitions
+
+fload LocalValuesSupport.fth
+
+\ Replace normal meaning of Instance
+overload alias instance generic-instance
+
+: $CAT ( _max _str1 _len1 _str2 _len2 -- _max _str1 _len1' )
+ { _max _str1 _len1 _str2 _len2 }
+ _len1 _max < if \ there is room
+ _str2 _str1 _len1 + _len2 _max _len1 - min move
+ then
+ _max _str1 _len1 _len2 + _max min \ always leave total length
+;
+
+instance variable fussel [message] Expected error; scope is still global.
+h# 3afe fussel !
+
+device-definitions
+
+h# 5afe instance value dumont [message] Top Device-node scope. S.b. Legit.
+: ducksoup ( n1 n2 n3 n4 -- m1 m2 )
+ { \ Declare some locals
+ _harpo ( the quiet one) _chico
+ _groucho | \ He's funny, right?
+ _zeppo ( who? ) _karl \ Is he part of the act?
+ }
+ d# 64 _groucho dup count dup -> _zeppo
+ _harpo dup count $cat
+ dup -> _karl
+ rot _karl = if type exit then
+ _groucho + swap _zeppo +
+;
+
+global-definitions
+
+: garbanzo
+ ." Should be unrecognized." cr
+ ducksoup
+;
+
+new-device [message] Missing a finish-device
+
+: fazooule!
+ ." Lima enter tain you..." cr
+ ducksoup
+ garbanzo
+;
+
+h# deadc0de instance value quaack [message] Should be worng "Instance" here.
+
+global-definitions
+
+: frijoles
+ ." Holy ... beans?" cr
+ fazooule!
+ garbanzo
+ ducksoup
+;
+
+finish-device
+
+finish-device
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/GlobScopErrTst_02.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/GlobScopErrTst_02.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/GlobScopErrTst_02.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,91 @@
+\ Test the Global-Scope directive and a few of its effects.
+\ Updated Thu, 12 Jan 2006 at 16:06 PST by David L. Paktor
+\ GlobScopErrTst_02.fth -- Right variant relative to GlobScopErrTst.fth
+
+fcode-version2
+
+headers
+
+[ifexists] coconuts
+ [message] Why a duck?
+[endif]
+
+alias [testdict] [ifexists]
+
+[testdict] coconuts
+ [message] Boy, can you get stucco!
+[else]
+ [message] Why a fence?
+[endif]
+
+global-definitions
+
+\ Bypass warning about Instance without altering LocalValuesSupport file
+alias generic-instance instance
+overload [macro] instance f[ noop .( Shminstance!) f] noop
+
+\ This is right. The "bypass" has Global scope
+
+fload LocalValuesSupport.fth
+
+\ Replace normal meaning of Instance, also in Global scope.
+overload alias instance generic-instance
+
+: $CAT ( _max _str1 _len1 _str2 _len2 -- _max _str1 _len1' )
+ { _max _str1 _len1 _str2 _len2 }
+ _len1 _max < if \ there is room
+ _str2 _str1 _len1 + _len2 _max _len1 - min move
+ then
+ _max _str1 _len1 _len2 + _max min \ always leave total length
+;
+
+instance variable fussel [message] Expected error; scope is still global.
+h# 3afe fussel !
+
+device-definitions
+
+h# 5afe instance value dumont [message] Device scope in effect. SB Legit.
+: ducksoup ( n1 n2 n3 n4 -- m1 m2 )
+ { \ Declare some locals
+ _harpo ( the quiet one) _chico
+ _groucho | \ He's funny, right?
+ _zeppo ( who? ) _karl \ Is he part of the act?
+ }
+ d# 64 _groucho dup count dup -> _zeppo
+ _harpo dup count $cat
+ dup -> _karl
+ rot _karl = if type exit then
+ _groucho + swap _zeppo +
+;
+
+global-definitions
+
+: garbanzo
+ ." Should be unrecognized." cr
+ ducksoup
+;
+
+new-device [message] Missing a finish-device
+
+: fazooule!
+ ." Lima enter tain you..." cr
+ ducksoup
+ garbanzo
+;
+
+h# deadc0de instance value quaack [message] Instance should be legit here.
+
+global-definitions
+
+: frijoles
+ ." Holy ... beans?" cr
+ fazooule!
+ garbanzo
+ ducksoup
+;
+
+finish-device
+
+finish-device
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/GlobScopErrTst_03.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/GlobScopErrTst_03.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/GlobScopErrTst_03.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,91 @@
+\ Test the Global-Scope directive and a few of its effects.
+\ Updated Thu, 12 Jan 2006 at 18:02 PST by David L. Paktor
+\ GlobScopErrTst_03.fth -- Change "bypass" strategy from GlobScopErrTst_01.fth
+
+fcode-version2
+
+headers
+
+[ifexists] coconuts
+ [message] Why a duck?
+[endif]
+
+alias [testdict] [ifexists]
+
+[testdict] coconuts
+ [message] Boy, can you get stucco!
+[else]
+ [message] Why a fence?
+[endif]
+
+\ Bypass warning about Instance without altering LocalValuesSupport file
+alias generic-instance instance
+[macro] bypass-instance f[ noop .( Shminstance!) f] noop
+overload alias instance bypass-instance
+\ This is because user-macros always have "global" scope
+\ This test is to force it into in the top-level device-node
+global-definitions
+
+fload LocalValuesSupport.fth
+
+\ Replace normal meaning of Instance
+overload alias instance generic-instance
+
+: $CAT ( _max _str1 _len1 _str2 _len2 -- _max _str1 _len1' )
+ { _max _str1 _len1 _str2 _len2 }
+ _len1 _max < if \ there is room
+ _str2 _str1 _len1 + _len2 _max _len1 - min move
+ then
+ _max _str1 _len1 _len2 + _max min \ always leave total length
+;
+
+instance variable fussel [message] Expected error; scope is still global.
+h# 3afe fussel !
+
+device-definitions
+
+h# 5afe instance value dumont [message] Device scope in effect. SB Legit.
+: ducksoup ( n1 n2 n3 n4 -- m1 m2 )
+ { \ Declare some locals
+ _harpo ( the quiet one) _chico
+ _groucho | \ He's funny, right?
+ _zeppo ( who? ) _karl \ Is he part of the act?
+ }
+ d# 64 _groucho dup count dup -> _zeppo
+ _harpo dup count $cat
+ dup -> _karl
+ rot _karl = if type exit then
+ _groucho + swap _zeppo +
+;
+
+global-definitions
+
+: garbanzo
+ ." Should be unrecognized." cr
+ ducksoup
+;
+
+new-device [message] Missing a finish-device
+
+: fazooule!
+ ." Lima enter tain you..." cr
+ ducksoup
+ garbanzo
+;
+
+h# deadc0de instance value quaack f[ ." "nInstance should be legit here." ]f
+
+global-definitions
+
+: frijoles
+ ." Holy ... beans?" cr
+ fazooule!
+ garbanzo
+ ducksoup
+;
+
+finish-device
+
+finish-device
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/InclLst.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/InclLst.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/InclLst.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,43 @@
+\ Test FLOADing and ENCODing-a-File with an Include-List
+\ We'll expect the Include-List to include the sibling-directory
+\ called TokeCommon and the non-existence of anything with
+\ "NonExist" in its name.
+
+
+fcode-version2
+hex
+headers
+
+\ This works.
+." OneBeer.fth"
+fload OneBeer.fth
+
+\ Intended not to work
+[message] Fload a NonExistent file
+fload NonExist.fth
+[message] Fload an Unreadable file (No read Permissions)
+fload MyBeerAndYouCannotHaveIt.fth
+[message] Fload a Zero-Length file (extension doesn't matter...)
+fload ZeroLen.bin
+
+\ This works.
+." BinData.bin"
+encode-file BinData.bin
+" BinData.bin" property
+
+\ Intended not to work
+[message] Encode a NonExistent file
+encode-file NonExist.bin
+[message] Encode an Unreadable file (No read Permissions)
+encode-file NoRead.bin
+
+[message] Encode with intentional syntax error
+encode-file ${PWD/../TokeCommon/BinData.bin
+
+[message] Encode a Zero length data file
+." ZeroLen.bin"
+encode-file ZeroLen.bin
+
+." That is all..."
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/LargeTextNoQte.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/LargeTextNoQte.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/LargeTextNoQte.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,55 @@
+\ We tested what happens when a quote or message or string is
+\ not terminated until many lines later, but what happens
+\ when it is not terminated at all and the text until the
+\ end of file exceeds the allowable buffer size?
+\ FLOAD this file into a master, to test the overall effect.
+\ The master must define a Macro or Alias called test-token
+\ which will supply the action for the variant in question.
+
+\ Updated Tue, 09 May 2006 at 09:13 PDT by David L. Paktor
+
+
+test-token \ Okay, kids, here we go!
+
+ Oh, ten Bottles of Beer on the wall, cr
+ ten Bottles of Beer!, cr
+ Take one down and pass it around, cr
+ nine Bottles of Beer on the wall. cr
+ Oh, nine Bottles of Beer on the wall, cr
+ nine Bottles of Beer!, cr
+ Take one down and pass it around, cr
+ eight Bottles of Beer on the wall. cr
+ Oh, eight Bottles of Beer on the wall, cr
+ eight Bottles of Beer!, cr
+ Take one down and pass it around, cr
+ seven Bottles of Beer on the wall. cr
+ Oh, seven Bottles of Beer on the wall, cr
+ seven Bottles of Beer!, cr
+ Take one down and pass it around, cr
+ six Bottles of Beer on the wall. cr
+ Oh, six Bottles of Beer on the wall, cr
+ six Bottles of Beer!, cr
+ Take one down and pass it around, cr
+ five Bottles of Beer on the wall. cr
+ Oh, five Bottles of Beer on the wall, cr
+ five Bottles of Beer!, cr
+ Take one down and pass it around, cr
+ four Bottles of Beer on the wall. cr
+ Oh, four Bottles of Beer on the wall, cr
+ four Bottles of Beer!, cr
+ Take one down and pass it around, cr
+ three Bottles of Beer on the wall. cr
+ Oh, three Bottles of Beer on the wall, cr
+ three Bottles of Beer!, cr
+ Take one down and pass it around, cr
+ two Bottles of Beer on the wall. cr
+ Oh, two Bottles of Beer on the wall, cr
+ two Bottles of Beer!, cr
+ Take one down and pass it around, cr
+ one Bottle of Beer on the wall. cr
+ Oh, one Bottle of Beer on the wall, cr
+ one Bottle of Beer!, cr
+ Take it down and pass it around... cr
+ How dry I am! How dry I am! cr
+ No body knows how dry I am. cr
+ How ... Dry I ... Aaaammm. cr
Added: fcode-utils/testsuite/TokeErrs/LitNums.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/LitNums.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/LitNums.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,14 @@
+\ Test whether d# 0 tokenizes the same as without the d#
+\ It's a named constant, you know, needn't be a literal...
+
+fcode-version2
+
+: lit-test ( -- )
+ d# 0 0 = if ." Zero" then
+ d# 10 10 = if ." Ten" then
+ d# 3 3 = if ." Three" then
+ d# 2 2 = if ." Two" then
+ d# 1 1 = if ." One" then
+;
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/LocOvrRun.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/LocOvrRun.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/LocOvrRun.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,32 @@
+\ Pointer-overrun: unterminated Locals Declaration
+
+\ Updated Fri, 08 Jul 2005 at 11:55 by David L. Paktor
+
+fcode-version2
+
+headers
+
+fload LocalValuesSupport.fth
+
+
+fload LocOvrRun_01.fth
+
+\ Supply the lost semicolon:
+;
+
+fload LocOvrRun_02.fth
+
+\ Supply another lost semicolon:
+;
+
+fload LocOvrRun_03.fth
+
+[message] Back to main file
+
+\ Supply yet another lost semicolon:
+;
+
+fload LocOvrRun_04.fth
+
+fcode-end
+
Added: fcode-utils/testsuite/TokeErrs/LocOvrRun_01.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/LocOvrRun_01.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/LocOvrRun_01.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,18 @@
+\ First Local-overrun test
+
+
+: ducksoup ( n1 n2 n3 n4 -- m1 m2 )
+ { \ Declare some locals
+ _harpo ( the quiet one) _chico
+ _groucho | \ He's funny, right?
+ _zeppo ( who? ) _karl \ Is he part of the act?
+ \ Look Ma, no close-curly brace!
+ ( Unterminated comment
+ } \ Even if there were a close-curly brace,
+ \ the unterminated comment masks it.
+ _groucho _harpo *
+ _chico +
+ _groucho _zeppo = if swap exit then
+ _groucho + swap _zeppo +
+;
+
Added: fcode-utils/testsuite/TokeErrs/LocOvrRun_02.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/LocOvrRun_02.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/LocOvrRun_02.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,24 @@
+\ Second Local-overrun test
+
+
+: miracle ( n3 n2 n1 -- m3 m2 m1 )
+ { _curly \ Curly braces is why we think of these guys
+ _larry
+ _moe
+ ; \ Initted/un-initted separator present
+ _shemp
+ _besser
+ _joe
+ \ How many Three Stooges were there in all?
+ \ six! }
+ ." Nyuk! " _curly .h cr
+ ." Why, you... " _moe .d cr
+ ." Ouch! " _larry .
+ _curly _moe + -> _shemp
+ _larry _moe + -> _besser
+ _besser _curly + -> _joe
+ _joe _besser 8 faber type free-mem
+ _moe _larry 8 faber type free-mem
+ _curly _besser 8 faber type free-mem
+ _larry _shemp
+;
Added: fcode-utils/testsuite/TokeErrs/LocOvrRun_03.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/LocOvrRun_03.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/LocOvrRun_03.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,14 @@
+\ Third Local-overrun test. Unterminated locals decl'n w/ no separator
+
+: coconuts ( m1 m2 -- m3 m4 m5 )
+ {
+ q
+ _gummo
+ _karl
+
+ 2dup < if swap then
+ 2dup / -> _gummo
+ 2dup - -> _karl
+ * -> q
+ _karl _gummo q
+;
Added: fcode-utils/testsuite/TokeErrs/LocOvrRun_04.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/LocOvrRun_04.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/LocOvrRun_04.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,32 @@
+\ Fourth Local-overrun test. Unterminated Mis-placed locals decl'n
+
+
+: cluckpoop ( n1 n2 n3 n4 flag? -- m1 m2 )
+ if ." Freedonia's going to war!" cr then
+ { \ Declare some locals
+ _harpo ( the quiet one) _chico
+ _groucho | \ He's funny, right?
+ _zeppo ( who? ) _karl \ Is he part of the act?
+ _zeppo \ Not again...
+ ; \ What is that?
+ }
+ _groucho _harpo *
+ _chico +
+ _groucho _zeppo = if swap exit then
+ _groucho + swap _zeppo +
+;
+
+: horse-feathers ( n1 n2 n3 n4 flag? -- m1 m2 )
+ if ." I'm against it!" cr then
+
+ { \ Declare some locals
+ _harpo ( the quiet one) _chico
+ _groucho | \ He's funny, right?
+ _zeppo ( who? )
+ _karl \ Is he part of the act?
+ \ No terminating close-curly-brace
+ _groucho _harpo *
+ _chico +
+ _groucho _zeppo = if swap exit then
+ _groucho + swap _zeppo +
+;
Added: fcode-utils/testsuite/TokeErrs/LocalTest.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/LocalTest.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/LocalTest.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,63 @@
+\ LocalTest.fth
+\ Updated Wed, 25 Jan 2006 at 14:33 PST by David L. Paktor
+
+fcode-version2
+
+ \ Optionally omitting inclusion of LocalValuesSupport
+ \ Correct inclusion is in TokoLoco/SupportedLocalTest.fth
+[ifdef] dont_omit_support
+ fload LocalValuesSupport.fth
+[endif]
+
+h# deaf constant dean
+
+: faber ( n3 n2 n1 -- alloc-addr size $addr,len )
+ { _otter _weasel _skunk ; _muskrat _mole }
+ \ _otter is initialized with the value of n3
+ \ _weasel is initialized with the value of n2
+ \ _skunk is initialized with the value of n1
+ \ _muskrat and _mole are uninitialized
+
+ \ Use n1 to determine an amount of memory to allocate, and
+ \ stuff the address into _mole
+ _skunk 40 * -> _muskrat
+ _muskrat alloc-mem -> _mole
+
+f[
+123 456 789 3dup
+ to _otter
+ _otter
+ constant
+ seegammanoo
+ dean constant wenkroy
+ ]f
+
+ _weasel .h type
+ _otter .d type
+ _mole _muskrat _mole count
+;
+
+f[
+
+ ]f
+
+: miracle ( n3 n2 n1 -- m3 m2 m1 )
+ { _curly _larry _moe | _shemp _besser _joe }
+ ." Nyuk! " _curly .h cr
+ ." Why, you... " _moe .d cr
+ ." Ouch! " _larry .
+ _curly _moe + -> _shemp
+ _larry _moe + -> _besser
+ _besser _curly + -> _joe
+ _joe _besser 8 faber type free-mem
+ _moe _larry 8 faber type free-mem
+ _curly _besser 8 faber type free-mem
+ _larry _shemp
+;
+
+: ordinary ( -- )
+ 123 456 789 miracle
+;
+
+fcode-end
+
Added: fcode-utils/testsuite/TokeErrs/LocalTest1.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/LocalTest1.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/LocalTest1.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,24 @@
+\ LocalTest1.fth
+\ Updated Thu, 12 Jan 2006 at 13:35 PST by David L. Paktor
+
+fcode-version2
+ \ Deliberately omitting inclusion of LocalValuesSupport
+ \ Correct inclusion is in TokoLoco/SupportedLocalTest.fth
+: ducksoup ( n1 n2 n3 -- m1 m2 )
+ { _harpo _chico _groucho | _zeppo _karl }
+ _groucho _harpo * -> _zeppo dup
+ _chico _zeppo + -> _karl dup
+ _groucho _zeppo = if swap exit then
+ _groucho + swap _zeppo +
+;
+
+: coconuts ( m1 m2 -- m3 m4 m5 )
+ { ; q _gummo _karl }
+ 2dup < if swap then
+ 2dup / -> _gummo
+ 2dup - -> _karl
+ * -> q
+ _karl _gummo q
+;
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/MacTest.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/MacTest.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/MacTest.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,20 @@
+\ MacTest.fth
+\ Updated Thu, 17 Mar 2005 at 19:24 by David L. Paktor
+
+
+fcode-version2
+
+
+: veber ( n3 n2 n1 -- alloc-addr size $addr,len )
+ 3dup (.) type
+ .d
+ ?dup if exit then
+ spaces
+;
+
+: ordinary ( -- )
+ 123 456 789 veber
+;
+
+fcode-end
+
Added: fcode-utils/testsuite/TokeErrs/MiscFeatErrs.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/MiscFeatErrs.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/MiscFeatErrs.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,170 @@
+\ Obvious pun intended...
+\ Updated Fri, 14 Jul 2006 at 12:50 PDT by David L. Paktor
+
+[flag] Local-Values
+f[ ." This is a test" ]f
+fcode-version2
+
+fload LocalValuesSupport.fth
+
+headers
+
+[char] G emit
+control G emit
+control [ emit
+: bell
+ char G dup
+ control G dup emit 3drop
+;
+ f[
+ [macro] bell #message" Beep"^G-Beep"^G Yu Rass!"
+ ]f
+
+ recursive
+: factl ( n -- n! )
+ ?dup 0= if 1
+ control G to bell
+ else dup 1- factl *
+ then
+;
+ global-definitions
+ [macro] bell f[ bell ]f
+ [macro] swell bell
+ device-definitions
+[macro] yell bell
+
+bell
+: factl ( n -- n! )
+ ?dup 0= if 1 factl
+ control G to bell
+ else dup 1- recurse *
+ then
+;
+recurse
+: bell recursive ( n -- Sigma[n..1] )
+ ?dup if dup 1- bell +
+ else 0 to bell
+ then
+;
+: cussed
+ i
+ j
+;
+
+: mussed 10 0 do i . loop ;
+: sussed 3 0 do 10 0 do i . j . loop loop ;
+: trussed ( a b c -- )
+ { _a _b _c | _d _e }
+ 10 0 do i .
+ _a _b + i * dup -> d
+ _c * to _e
+ j . loop
+;
+
+
+
+: DMA-ALLOC ( n -- vaddr ) " dma-alloc" $call-parent ;
+: HOOBARTH ( n -- vaddr ) " hoobarth" $call-parent ;
+: MY-END0 ( -- n ) ['] end0 ;
+: SETUP-HOOBARTH ( ??? -- ??? )
+ h# 40 ['] dma-alloc catch if
+ ." Fooey!"
+ then
+ h# 50 ['] hoobarth catch if
+ ." Ptooey!"
+ then
+ ['] roll
+ ['] my-end0
+ ['] bogus-case
+;
+ overload alias end0 my-end0
+
+: another-end0 ['] end0 ;
+
+;
+
+new-device
+: hells
+ bells
+ factl
+ yell
+ swell
+ 7 to swell
+;
+finish-device
+
+variable naught
+defer do-nothing
+30 value thirty
+40 buffer: forty
+50 constant fifty
+create three 0 , 0 , 0 ,
+struct
+4 field >four
+constant /four
+f['] do-nothing get-token
+f[']
+f['] noop set-token
+f['] MooGooGaiPan
+#message Just when you thought it couldn't get any wierder...
+: peril
+ ['] noop is do-nothing
+ overload 0 to my-self
+ 100 is thirty
+ 5 is naught
+ 60 to fifty
+ 9 to three
+ 5 is >four
+ 90 to forty
+ 90 to ninety
+ 90 to noop
+ 27
+ ['] 3drop to do-nothing
+ ['] ninety to do-nothing
+;
+
+: thirty ( new-val -- )
+ dup to thirty
+ \ Should alias inside a colon be allowed?
+ alias .dec
+ .d
+ ." Dirty" .dec
+;
+
+: droop ( -- )
+ twenty
+ tokenizer[
+ \ Alias inside a colon should generate a warning.
+ alias
+ .x
+ .h
+ ]tokenizer
+ 0 ?do i .x loop
+;
+: ploop ( -- )
+ fifty 0 do i drop 2 +loop
+ \ Should doing this inside a colon-def'n be allowed?:
+ tokenizer[ h# 517 constant five-seventeen ]tokenizer
+ five-seventeen
+ 127 to ?leave
+ 503 to (.)
+ ['] 3drop
+ to spaces
+ f['] external
+ to abs
+ d# 36
+ to base
+;
+
+f[ [ifexists] emit-date
+ [message] About to tokenize Tokenizer's creation-stamp
+ [then]
+ alias fedt emit-date
+ fedt
+]f
+
+." My parent is " my-parent u. cr
+
+fcode-end
+
+
Added: fcode-utils/testsuite/TokeErrs/MulPCI_LapFC.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/MulPCI_LapFC.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/MulPCI_LapFC.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,74 @@
+\ Combine Multiple PCI headers with overlapping FCodes.
+\ Updated Wed, 14 Jun 2006 at 12:04 PDT by David L. Paktor
+
+\ We already have a source with overlapping FCodes in two FCode blocks
+\ We just have to wrap it in multiple PCI headers.
+\ Also, we have to make sure to define NoCrash as a command-line symbol
+\ While we're at it, let's also create another switchable behavior:
+\ If the command-line symbol RangeTwo is defined, it should have
+\ a value in the form of a hex number (We'll tace care of the "hex")
+\ which will, in a roundabout way, become the starting FCode for
+\ the second loading of the common Source.
+\ We'll save the symbol in a roundabout manner that will test whether
+\ a particular means can be used to preserve the current FCode
+\ assignment counter across PCI blocks, especially when there is
+\ an fcode-reset associated with the end of a PCI block.
+\ Oh, and... We'll control whether the fcode-reset is called by another
+\ command-line symbol: If NoReset is defined, we will bypass
+\ issuing the fcode-reset command. (We expect we'll be making it
+\ automatic and implicit at the end of a PCI block, but we're still
+\ testing the premise...)
+
+
+tokenizer[
+
+h# f2a7 \ Bogus Rev-Level
+ SET-REV-LEVEL
+
+not-last-image
+
+h# 1fed \ Vendor
+h# 9009 \ Bogus Device ID
+h# 20109 \ Bogus Class Code
+ pci-header
+
+ ]tokenizer
+
+fload TooManyFCodes.fth
+
+
+[ifdef] RangeTwo
+ f[
+ [DEFINED] RangeTwo constant SecondRangeFCode
+ ]f
+[endif]
+
+\ Try it once before and once after...
+[ifndef] NoReset fcode-reset [else] #message" Not resetting..." [endif]
+pci-header-end [ifndef] NoReset fcode-reset [endif]
+
+tokenizer[
+
+h# ea57 \ Bogus Rev-Level
+ SET-REV-LEVEL
+
+ last-image
+
+h# deaf \ Vendor
+h# 9021 \ Bogus Device ID
+h# 10902 \ Bogus Class Code
+ pci-header
+
+ ]tokenizer
+
+
+[ifdef] RangeTwo
+ f[
+ SecondRangeFCode next-fcode
+ ]f
+[endif]
+
+fload TooManyFCodes.fth
+
+
+pci-header-end [ifndef] NoReset fcode-reset [endif]
Added: fcode-utils/testsuite/TokeErrs/ObsoFCodes.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/ObsoFCodes.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/ObsoFCodes.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,58 @@
+\ Test "Obsolete" FCodes messages, corner-cases and suchlike.
+\ Updated Tue, 07 Feb 2006 at 14:54 PST by David L. Paktor
+
+
+
+fcode-version2
+
+headers
+
+\ Just a mindless recitation of function-names...
+
+
+
+convert
+set-token-table
+set-table
+b(code)
+4-byte-id
+dma-alloc
+memmap
+>physical
+['] my-params ['] 2dup ['] if
+intr
+driver
+true to group-code
+true to frame-buffer-busy?
+fb1-draw-character
+fb1-reset-screen
+fb1-toggle-cursor
+fb1-erase-screen
+fb1-blink-screen
+fb1-invert-screen
+fb1-insert-characters
+fb1-delete-characters
+fb1-insert-lines
+fb1-delete-lines
+fb1-draw-logo
+fb1-install
+fb1-slide-up
+return-buffer
+f['] return-buffer
+xmit-packet
+poll-packet
+processor-type
+firmware-version
+fcode-version
+adr-mask
+probe
+probe-virtual
+
+
+xwsplit
+f['] unloop
+['] unloop
+['] j
+j
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/OneTwoFive.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/OneTwoFive.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/OneTwoFive.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,125 @@
+1 constant one
+2 constant two
+3 constant three
+4 constant four
+5 constant five
+6 constant six
+7 constant seven
+8 constant eight
+9 constant nine
+10 constant ten
+11 constant eleven
+12 constant twelve
+13 constant thirteen
+14 constant fourteen
+15 constant fifteen
+16 constant sixteen
+17 constant seventeen
+18 constant eighteen
+19 constant nineteen
+20 constant twenty
+21 constant twenty-one
+22 constant twenty-two
+23 constant twenty-three
+24 constant twenty-four
+25 constant twenty-five
+26 constant twenty-six
+27 constant twenty-seven
+28 constant twenty-eight
+29 constant twenty-nine
+30 constant thirty
+31 constant thirty-one
+32 constant thirty-two
+33 constant thirty-three
+34 constant thirty-four
+35 constant thirty-five
+36 constant thirty-six
+37 constant thirty-seven
+38 constant thirty-eight
+39 constant thirty-nine
+40 constant forty
+41 constant forty-one
+42 constant forty-two
+43 constant forty-three
+44 constant forty-four
+45 constant forty-five
+46 constant forty-six
+47 constant forty-seven
+48 constant forty-eight
+49 constant forty-nine
+50 constant fifty
+51 constant fifty-one
+52 constant fifty-two
+53 constant fifty-three
+54 constant fifty-four
+55 constant fifty-five
+56 constant fifty-six
+57 constant fifty-seven
+58 constant fifty-eight
+59 constant fifty-nine
+60 constant sixty
+61 constant sixty-one
+62 constant sixty-two
+63 constant sixty-three
+64 constant sixty-four
+65 constant sixty-five
+66 constant sixty-six
+67 constant sixty-seven
+68 constant sixty-eight
+69 constant sixty-nine
+70 constant seventy
+71 constant seventy-one
+72 constant seventy-two
+73 constant seventy-three
+74 constant seventy-four
+75 constant seventy-five
+76 constant seventy-six
+77 constant seventy-seven
+78 constant seventy-eight
+79 constant seventy-nine
+80 constant eighty
+81 constant eighty-one
+82 constant eighty-two
+83 constant eighty-three
+84 constant eighty-four
+85 constant eighty-five
+86 constant eighty-six
+87 constant eighty-seven
+88 constant eighty-eight
+89 constant eighty-nine
+90 constant ninety
+91 constant ninety-one
+92 constant ninety-two
+93 constant ninety-three
+94 constant ninety-four
+95 constant ninety-five
+96 constant ninety-six
+97 constant ninety-seven
+98 constant ninety-eight
+99 constant ninety-nine
+100 constant one_hundred
+101 constant one_hundred_and_one
+102 constant one_hundred_and_two
+103 constant one_hundred_and_three
+104 constant one_hundred_and_four
+105 constant one_hundred_and_five
+106 constant one_hundred_and_six
+107 constant one_hundred_and_seven
+108 constant one_hundred_and_eight
+109 constant one_hundred_and_nine
+110 constant one_hundred_and_ten
+111 constant one_hundred_and_eleven
+112 constant one_hundred_and_twelve
+113 constant one_hundred_and_thirteen
+114 constant one_hundred_and_fourteen
+115 constant one_hundred_and_fifteen
+116 constant one_hundred_and_sixteen
+117 constant one_hundred_and_seventeen
+118 constant one_hundred_and_eighteen
+119 constant one_hundred_and_nineteen
+120 constant one_hundred_and_twenty
+121 constant one_hundred_and_twenty-one
+122 constant one_hundred_and_twenty-two
+123 constant one_hundred_and_twenty-three
+124 constant one_hundred_and_twenty-four
+125 constant one_hundred_and_twenty-five
Added: fcode-utils/testsuite/TokeErrs/PCI_FCShdrErrs.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/PCI_FCShdrErrs.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/PCI_FCShdrErrs.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,29 @@
+\ Combination PCI-Headers Errors test.
+
+\ Updated Thu, 08 Sep 2005 at 17:31 by David L. Paktor
+
+
+hex
+tokenizer[
+
+ c020
+ SET-REV-LEVEL
+ dec1 \ Vendor
+ c0ed \ Device ID
+ 80201 \ Class Code (ISA system timer. Denver Colorado )
+
+ ]tokenizer
+
+ pci-header
+
+." What is this?" \ Output FCode before the fcode-version2 . S.b. error...
+
+fcode-version2
+headers
+ : bogo " This is a test." ;
+
+
+fcode-end
+
+pci-header-end
+
Added: fcode-utils/testsuite/TokeErrs/PCIhdrErrs.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/PCIhdrErrs.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/PCIhdrErrs.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,28 @@
+\ Basic PCI-Headers Errors test.
+
+\ Updated Wed, 25 May 2005 at 17:30 by David L. Paktor
+
+
+hex
+tokenizer[
+
+ c020
+ SET-REV-LEVEL
+ dec1 \ Vendor
+ c0ed \ Device ID
+ 80201 \ Class Code (ISA system timer. Denver Colorado )
+
+ ]tokenizer
+." What is this?"
+
+ pci-header
+
+fcode-version2
+headers
+ : bogo " This is a test." ;
+
+
+fcode-end
+
+pci-header-end
+
Added: fcode-utils/testsuite/TokeErrs/PooPsalah.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/PooPsalah.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/PooPsalah.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,34 @@
+\ FLoadable body for various conditional tests, based on the value of
+\ a constant named "poopsalah?" (Okay, so I was running out of ideas...)
+
+." Begin Nested ""Constant"" Test Test"
+f[ poopsalah? f] [if]
+[message] The TRUE path has wisely been chosen, Poopsalah!
+ ." Is True, level 1"
+ f[ poopsalah? f] [if]
+ " Is True and is True, level 2"
+ [else]
+ " Is True but is Not True. What?"
+ [then]
+ ." Middle of level 2"
+ f[ poopsalah? 0= f] [if]
+ " Is True and is False. What?"
+ [else]
+ " Is True and is Not False, level 2"
+ [then]
+[else]
+[message] Oy, Poopsalah. You have foolishly chosen the FALSE path.
+ ." Is Not True, level 1"
+ f[ poopsalah? f] [if]
+ " Is Not True but is True. What?"
+ [else]
+ " Is Not True and is Not True, level 2"
+ [then]
+ ." Middle of Not level 2"
+ f[ poopsalah? 0= f] [if]
+ " Is Not True and is False, level 2"
+ [else]
+ " Is Not True and is Not False. What?"
+ [then]
+\ Missing a [then]
+
Added: fcode-utils/testsuite/TokeErrs/RetStkDep.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/RetStkDep.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/RetStkDep.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,105 @@
+\ Return-Stack Depth -- well, "depth" is not exactly it;
+\ we're testing detection of imbalance between >R and R> and uses of R@
+\ in between.
+
+\ From the ANSI Forth Spec:
+\ 3.2.3.3 Return stack
+\ . . . . . .
+\ A program may use the return stack for temporary storage during the
+\ execution of a definition subject to the following restrictions:
+\ A program shall not access values on the return stack (using R@,
+\ R>, 2R@ or 2R>) that it did not place there using >R or 2>R;
+\ A program shall not access from within a do-loop values placed
+\ on the return stack before the loop was entered;
+\ All values placed on the return stack within a do-loop shall
+\ be removed before I, J, LOOP, +LOOP, UNLOOP, or LEAVE is
+\ executed;
+\ All values placed on the return stack within a definition
+\ shall be removed before the definition is terminated
+\ or before EXIT is executed.
+
+\ Updated Tue, 18 Jul 2006 at 16:09 PDT by David L. Paktor
+
+[flag] Lower-Case-Token-Names
+
+fcode-version2
+headers
+
+\ First, a few primal errors...
+." Primal errors" cr
+d# 127 h# 127 dup r> swap r@ -rot >r swap
+3 0 do r@ loop
+3 0 do r> loop
+3 0 do i >r loop
+
+hex
+create cold-stone 1c c, ec c, 9e c, a3 c, c0 c, 6e c,
+\ Then some legit usages
+: legit_one
+ dup >r
+ 3 0 do i
+ cold-stone over ca+ c@ >r
+ 3 + cold-stone swap ca+ c@ r>
+ loop
+ r>
+;
+
+\ Now a tricky one:
+: tricky_one
+ dup >r
+ over if ." Showing " r> u.
+ else r> drop ." Don't show"
+ then
+;
+: another_one ( old new -- false | new' true )
+ >r 0= if r> drop false exit then
+ dup * r@ / r> + true
+;
+
+
+." Now we start getting bad." cr
+\ The one that started me down this path...
+0 instance value _str
+0 instance value _len
+0 instance value _num
+: PARSE-INTS ( addr len num -- n1 .. nn )
+ to _num
+ to _len
+ to _str
+ _num 0 ?do
+ _len if
+ _str _len [char] , left-parse-string 2swap to _len to _str
+ $number if 0 then
+ else
+ 0
+ then
+ >r loop
+ _num 0 ?do r> loop
+;
+
+. " If this doesn't scare you, it should:" cr
+: scattered-errors
+ 0 >r
+ _num 0 ?do
+ _str _len [char] , left-parse-string
+ 2swap to _len to _str
+ $number if 0 else r@ 1+ swap >r then
+ >r i u.
+ loop
+ r@ 0 ?do r> i roll loop
+;
+
+." Now, be very afraid..." cr
+0 instance value where-from
+: frayed-knot
+ where-from 0= if r@ to where-from then
+ r> drop where-from if exit then
+ ." What have I done?" cr
+;
+: krellboyn
+ where-from ?dup if >r 0 to where-from then
+ where-from if exit then
+ ." I didn't mean it!" cr
+;
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/SmlOvrRun.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/SmlOvrRun.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/SmlOvrRun.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,8 @@
+\ Small over-run test
+fcode-version2
+
+headers
+
+: duffy ( -- )
+." No.
+;
Added: fcode-utils/testsuite/TokeErrs/SplitImbal.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/SplitImbal.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/SplitImbal.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,33 @@
+\ For this test, we are going to Split a definition across several files,
+\ and then leave a Control-Structure Imbalance
+
+\ Updated Fri, 22 Jul 2005 at 12:41 by David L. Paktor
+
+fcode-version2
+
+headers
+
+
+: firstdefn ( n -- ??? )
+
+fload SplitImbal_01.fth
+
+fload SplitImbal_02.fth
+
+;
+
+: seconddefn ( n -- ??? )
+
+fload SplitImbal_01.fth
+
+fload SplitImbal_01.fth
+fload SplitImbal_02.fth
+
+;
+
+
+fcode-end
+\ fload SplitImbal_03.fth
+\ fload SplitImbal_04.fth
+\ fload SplitImbal_05.fth
+
Added: fcode-utils/testsuite/TokeErrs/SplitImbal_01.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/SplitImbal_01.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/SplitImbal_01.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,8 @@
+\ First part of Split Definition test
+
+
+\ Definition is under way.
+1 ?do
+ i . ." What have I done?" cr
+ i 0 do j . i . ." What has j done?" cr loop
+ cr
Added: fcode-utils/testsuite/TokeErrs/SplitImbal_02.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/SplitImbal_02.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/SplitImbal_02.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,7 @@
+\ Second part of Split Definition test
+
+
+\ Do-loop is under way.
+ cr cr
+ loop ." Done... cr"
+
Added: fcode-utils/testsuite/TokeErrs/SplitImbal_03.fth
===================================================================
Added: fcode-utils/testsuite/TokeErrs/SplitImbal_04.fth
===================================================================
Added: fcode-utils/testsuite/TokeErrs/SplitImbal_05.fth
===================================================================
Added: fcode-utils/testsuite/TokeErrs/SuppLocErrTest4.ErrMsgs.NoI
===================================================================
--- fcode-utils/testsuite/TokeErrs/SuppLocErrTest4.ErrMsgs.NoI (rev 0)
+++ fcode-utils/testsuite/TokeErrs/SuppLocErrTest4.ErrMsgs.NoI 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1 @@
+../toke: Command not found.
Added: fcode-utils/testsuite/TokeErrs/SuppLocErrTest4.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/SuppLocErrTest4.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/SuppLocErrTest4.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,111 @@
+\ SuppLocErrTest4.fth
+\ Updated Fri, 30 Jun2006 at 14:09 PDT by David L. Paktor
+
+fcode-version2
+
+headers
+
+alias snatch catch
+
+d# 32 constant _local-storage-size_
+
+fload LocalValuesSupport.fth
+
+overload : catch snatch catch ;
+variable dup
+
+: ducksoup ( n1 n2 n3 n4 -- m1 m2 )
+ { \ Declare some locals
+ _harpo ( the quiet one) _chico
+ _groucho | \ He's funny, right?
+ _zeppo ( who? ) _karl \ Is he part of the act?
+ }
+ _groucho _harpo *
+ _chico +
+ _groucho _zeppo = if swap exit then
+ _groucho + swap _zeppo +
+;
+
+: cluckpoop ( n1 n2 n3 n4 flag? -- m1 m2 )
+ if ." Freedonia's going to war!" cr then
+ { \ Declare some locals after the def'n has started
+ _harpo ( the quiet one) _chico
+ _groucho | \ He's funny, right?
+ _zeppo ( who? ) _karl \ Is he part of the act?
+ _zeppo \ Not again...
+ ; \ What is that?
+ }
+ _groucho _harpo *
+ _chico +
+ _groucho _zeppo = if swap exit then
+ _groucho + swap _zeppo +
+;
+
+: neighcluck ( n1 n2 n3 n4 flag? -- m1 m2 )
+ { \ Declare some locals
+ _harpo ( the quiet one) _chico
+ _groucho | \ He's funny, right?
+ _zeppo ( who? ) _karl \ Is he part of the act?
+ _zeppo \ Not again...
+ ; \ What is that?
+ _gummo
+ _karl ( Another repeater ) }
+
+ ." I'm against it!" cr
+ _groucho _harpo *
+ _chico +
+ _groucho _zeppo = if swap exit then
+ _groucho + swap _zeppo +
+ -> _gummo
+ ." What's yours is mine..." cr
+ dup -> _karl
+;
+: coconuts ( m1 m2 -- m3 m4 m5 )
+ { ; q _gummo _karl }
+ instance \ No,
+ create \ No, no no!
+ 2dup < if swap then
+ 2dup / -> _gummo
+ 2dup - -> _karl
+ * -> q
+ _karl _gummo q
+;
+
+_harpo
+_chico
+_groucho
+_zeppo
+_gummo
+_karl
+
+\ Two sets of Locals Declarations in one definition
+: spaulding
+ ." Hooray for the captain!" cr
+ { _lfn _pjs _how | _got _in }
+
+ _how _lfn + -> _got
+ 123 -> _in _pjs
+ { _I'll _never _know }
+ _in _pjs _I'll _never _know
+;
+
+\ Locals Declarations in a structure
+\ Inside an outer structure...
+
+true if
+ : wire-fence
+ ." Inside a structure?"
+ if
+ { _why _a _duck | _viaduct }
+ _duck _why + _a * -> _viaduct
+ _viaduct 0= if exit then
+ ." Why a duck?"
+ then
+ ." Because water..."
+ \ Scope of Locals should end here but it doesn't.
+ _a _duck _why * + _viaduct = if ." Any takers?" exit then
+ ." Step right up"
+ ;
+then
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/TestArgs
===================================================================
--- fcode-utils/testsuite/TokeErrs/TestArgs (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TestArgs 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,96 @@
+# Automated Test Arguments file for TokeErrs category
+# (That's short for "Tokenizer Errors")
+
+# Valid lines have four comma-separated fields:
+# Test-file base-name
+# Result-file label
+# Extra command-line switches
+# A script-command with arguments (but no commas).
+# Lines that have no label, no switches, and no script
+# do not need any commas.
+# A leading +V in the script-command field will suppress -v
+
+# Most files in this category need the -i switch
+# Some may have additional variants.
+
+# Updated Thu, 27 Jul 2006 at 17:55 PDT by David L. Paktor
+
+MiscFeatErrs , , -i -I. -I..
+LocalTest , NoLvSupp , -i -I. -I.. -f Local-Values
+LocalTest , , -i -f Local-Values -d dont_omit_support -I. -I..
+LocalTest1 , , -f Local-Values -f noLV-Legacy-Message -I. -I..
+ControlMismatch , , -i
+SuppLocErrTest4 , , -i -f Local-Values -l -I. -I..
+testLocDevSupG , , -i -f Local-Values -I. -I..
+testLocDevSupG , SymSiz , -i -f Local-Values -d "_local-storage-size_= d# 120" -I. -I..
+PCIhdrErrs , , -i
+FCShdrErrs , , -i
+PCI_FCShdrErrs , , -i
+CommOvrRun , , -i -l
+LocOvrRun , , -i -f Local-Values -l -I. -I..
+SplitImbal , , -i -l
+TokCondUnconcF , , -i -l
+TokCondUnconcT , , -i -l
+TooLargeCase , , -i -l
+TooLargeBranch_off16 , , -i -l
+TooLargeBranch_off16 , N231 , -i -l -d "fld_cmd=fload TooLargeBranch_N231_body.fth"
+TooLargeBranch_off16 , N232 , -i -l -d "fld_cmd=fload TooLargeBranch_N232_body.fth"
+TooLargeBranch_off16 , N233 , -i -l -d "fld_cmd=fload TooLargeBranch_N233_body.fth"
+TooLargeBranch_off16 , V178 , -i -l -d "fld_cmd=fload TooLargeBranch_V178_body.fth"
+TooLargeBranch_off16 , V179 , -i -l -d "fld_cmd=fload TooLargeBranch_V179_body.fth"
+TooLargeBranch_off16 , V180 , -i -l -d "fld_cmd=fload TooLargeBranch_V180_body.fth"
+TooLargeBranch_off08 , , -i -l
+TooLargeBranch_off08_to_16 , , -i -l
+TooTooLargeBuffer , , -i -l
+UserMacroErrors , , -i
+CStrEscOvflw , , -i -l
+DevImbal , , -i
+DevNodAli , , -i -l -I. -I..
+DevNodAli_01 , , -i -l -I. -I..
+GlobScopErrTst , NoI , -f Local-Values -I. -I..
+GlobScopErrTst , , -i -f Local-Values -I. -I..
+GlobScopErrTst_01 , , -i -f Local-Values -I. -I..
+GlobScopErrTst_02 , , -i -f Local-Values -I. -I..
+GlobScopErrTst_03 , , -i -f Local-Values -I. -I..
+# The script-fields below prepare for the ExpPath and InclLst tests
+Frinstnce , , -i , touch ExpPath.NoV.f{c,l{,.missing}}
+Frinstnce , NoI , , chmod a-rw ../TokeCommon/{MyBeerAndYouCannotHaveIt.fth,NoRead.bin} ExpPath.NoV.f{c,l{,.missing}}
+
+# We're now ready for the ExpPath and InclLst tests
+
+ExpPath , NoV , -i -l , +V rm -f ExpPath.NoV.f{c,l{,.missing}}
+
+InclLst , , -i -l -P -I .. -I ../TokBrack -I ../TokMisc -I ../TokeCommon -I ../TokoLoco -I ../TokCondl -I ../TokProdCpy -I ../TokeErrs -I /home/dlpaktor/HeyVern/DoYuhThink/ThisIsA/LongEnuffPathName/To/Make/The/Line/Really/Overflow -I . -I /home/dlpaktor/Hey/Vern/This/Path/Just/Fills/Up/TheLine/KnowWhudI/Mean -I ../TokeCommon -f noAbort-quote
+
+# The following must be the last in the set of ExpPath and InclLst tests
+# The script-field is to reset for next time, and to enable tar-ring the Log
+ExpPath , , -i -l , chmod a+r ../TokeCommon/{MyBeerAndYouCannotHaveIt.fth,NoRead.bin}
+
+# Done with the ExpPath and InclLst tests
+ToAtEnd , , -i
+ObsoFCodes , , -i
+ObsoFCodes , NoWarn , -f NoObsolete-FCode-Warning
+
+TooLargePMessage
+TooLargePQuote , , -i
+TooLargeQMessage
+TooLargeSQuote
+TooLargeParen , , -i
+TooLargeQAbort
+TooLargeQNoAbort
+
+AbrtWQuotStr , , -i
+
+# The new "Trace" feature, and handling of duplicate and mis-scoped names...
+DupNams , , -f Local-Values -T croop -T drop -T _harpo -T dup -T noop -T zoop -T foop
+
+TooManyFCodes , , -i
+TooManyFCodes , NoCrash , -i -d NoCrash
+
+MulPCI_LapFC , , -i -d NoCrash
+MulPCI_LapFC , RngTwo , -i -d NoCrash -d RangeTwo=0ace
+MulPCI_LapFC , RTwoNoRst , -i -d NoCrash -d RangeTwo=0ace -d NoReset
+MulPCI_LapFC , NoRst , -i -d NoCrash -d NoReset
+
+RetStkDep , , -i
+CondlDefn , , -i
Added: fcode-utils/testsuite/TokeErrs/ToAtEnd.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/ToAtEnd.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/ToAtEnd.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,34 @@
+\ Confirm that I now catch the error where
+\ "to" is the last thing in the input
+
+\ Updated Mon, 03 Apr 2006 at 16:03 PDT by David L. Paktor
+
+fcode-version2
+headers
+global-definitions
+alias poo to
+device-definitions
+
+\ We're also going to throw in a quickie test for how we handle
+\ attempts to create an alias to a Local.
+[flag] Local-Values
+fload LocalValuesSupport.fth
+
+: gnarggghhh! { _gnarly _dood | _hang_ten }
+ alias _cool _gnarly
+ _cool _dood + -> _hang_ten
+;
+_cool
+ _gnarly
+ _dood
+ _hang_ten
+variable shmoo
+\ What's the world coming to?
+h# 5417 value merde
+h# 4ead poo
+ merde
+h# f09e4ead poo gnarggghhh!
+h# f09e4ead to gnarggghhh!
+h# f09e4ead poo shmoo
+h# f09e4ead poo 1
+merde poo
Added: fcode-utils/testsuite/TokeErrs/TokCondUnconcF.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TokCondUnconcF.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TokCondUnconcF.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,11 @@
+\ "False" side of Nested "Constant" Unconcluded Conditionals test
+
+\ Updated Wed, 08 Mar 2006 at 16:12 PST by David L. Paktor
+\
+
+f[ false f]
+
+f[ true f] [if]
+fload TokCondUnconc_01.fth
+
+\ Missing an [endif]
Added: fcode-utils/testsuite/TokeErrs/TokCondUnconcT.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TokCondUnconcT.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TokCondUnconcT.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,11 @@
+\ "True" side of Nested "Constant" Unconcluded Conditionals test
+
+\ Updated Wed, 08 Mar 2006 at 16:12 PST by David L. Paktor
+\
+
+f[ true f]
+
+f[ true f] [if]
+fload TokCondUnconc_01.fth
+
+\ Missing an [endif]
Added: fcode-utils/testsuite/TokeErrs/TokCondUnconc_01.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TokCondUnconc_01.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TokCondUnconc_01.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,23 @@
+\ Common code (insert obligatory sneeze here)
+\ for Nested "Constant" Unconcluded Conditionals test
+
+\ Updated Wed, 08 Mar 2006 at 16:12 PST by David L. Paktor
+
+\ File that FLOADs this has already put TRUE or FALSE on the stack.
+
+f[ constant poopsalah? f]
+
+fcode-version2
+
+: whatziz
+ ." This is the "
+ f[ poopsalah? [if] f] ." True " f[ [else] f] ." False" f[ [then] f]
+ ." side of the test." cr
+;
+headers
+
+fload PooPsalah.fth
+
+: whoozis whatziz ;
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/TooLargeBranch_N231_body.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeBranch_N231_body.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooLargeBranch_N231_body.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,927 @@
+[message] Starting out with 231 Bottles of Beer on the wall
+." Oh, 231 Bottles of Beer on the wall," cr
+." 231 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 230 Bottles of Beer on the wall." cr
+." Oh, 230 Bottles of Beer on the wall," cr
+." 230 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 229 Bottles of Beer on the wall." cr
+." Oh, 229 Bottles of Beer on the wall," cr
+." 229 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 228 Bottles of Beer on the wall." cr
+." Oh, 228 Bottles of Beer on the wall," cr
+." 228 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 227 Bottles of Beer on the wall." cr
+." Oh, 227 Bottles of Beer on the wall," cr
+." 227 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 226 Bottles of Beer on the wall." cr
+." Oh, 226 Bottles of Beer on the wall," cr
+." 226 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 225 Bottles of Beer on the wall." cr
+." Oh, 225 Bottles of Beer on the wall," cr
+." 225 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 224 Bottles of Beer on the wall." cr
+." Oh, 224 Bottles of Beer on the wall," cr
+." 224 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 223 Bottles of Beer on the wall." cr
+." Oh, 223 Bottles of Beer on the wall," cr
+." 223 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 222 Bottles of Beer on the wall." cr
+." Oh, 222 Bottles of Beer on the wall," cr
+." 222 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 221 Bottles of Beer on the wall." cr
+." Oh, 221 Bottles of Beer on the wall," cr
+." 221 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 220 Bottles of Beer on the wall." cr
+." Oh, 220 Bottles of Beer on the wall," cr
+." 220 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 219 Bottles of Beer on the wall." cr
+." Oh, 219 Bottles of Beer on the wall," cr
+." 219 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 218 Bottles of Beer on the wall." cr
+." Oh, 218 Bottles of Beer on the wall," cr
+." 218 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 217 Bottles of Beer on the wall." cr
+." Oh, 217 Bottles of Beer on the wall," cr
+." 217 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 216 Bottles of Beer on the wall." cr
+." Oh, 216 Bottles of Beer on the wall," cr
+." 216 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 215 Bottles of Beer on the wall." cr
+." Oh, 215 Bottles of Beer on the wall," cr
+." 215 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 214 Bottles of Beer on the wall." cr
+." Oh, 214 Bottles of Beer on the wall," cr
+." 214 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 213 Bottles of Beer on the wall." cr
+." Oh, 213 Bottles of Beer on the wall," cr
+." 213 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 212 Bottles of Beer on the wall." cr
+." Oh, 212 Bottles of Beer on the wall," cr
+." 212 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 211 Bottles of Beer on the wall." cr
+." Oh, 211 Bottles of Beer on the wall," cr
+." 211 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 210 Bottles of Beer on the wall." cr
+." Oh, 210 Bottles of Beer on the wall," cr
+." 210 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 209 Bottles of Beer on the wall." cr
+." Oh, 209 Bottles of Beer on the wall," cr
+." 209 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 208 Bottles of Beer on the wall." cr
+." Oh, 208 Bottles of Beer on the wall," cr
+." 208 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 207 Bottles of Beer on the wall." cr
+." Oh, 207 Bottles of Beer on the wall," cr
+." 207 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 206 Bottles of Beer on the wall." cr
+." Oh, 206 Bottles of Beer on the wall," cr
+." 206 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 205 Bottles of Beer on the wall." cr
+." Oh, 205 Bottles of Beer on the wall," cr
+." 205 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 204 Bottles of Beer on the wall." cr
+." Oh, 204 Bottles of Beer on the wall," cr
+." 204 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 203 Bottles of Beer on the wall." cr
+." Oh, 203 Bottles of Beer on the wall," cr
+." 203 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 202 Bottles of Beer on the wall." cr
+." Oh, 202 Bottles of Beer on the wall," cr
+." 202 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 201 Bottles of Beer on the wall." cr
+." Oh, 201 Bottles of Beer on the wall," cr
+." 201 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 200 Bottles of Beer on the wall." cr
+." Oh, 200 Bottles of Beer on the wall," cr
+." 200 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 199 Bottles of Beer on the wall." cr
+." Oh, 199 Bottles of Beer on the wall," cr
+." 199 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 198 Bottles of Beer on the wall." cr
+." Oh, 198 Bottles of Beer on the wall," cr
+." 198 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 197 Bottles of Beer on the wall." cr
+." Oh, 197 Bottles of Beer on the wall," cr
+." 197 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 196 Bottles of Beer on the wall." cr
+." Oh, 196 Bottles of Beer on the wall," cr
+." 196 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 195 Bottles of Beer on the wall." cr
+." Oh, 195 Bottles of Beer on the wall," cr
+." 195 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 194 Bottles of Beer on the wall." cr
+." Oh, 194 Bottles of Beer on the wall," cr
+." 194 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 193 Bottles of Beer on the wall." cr
+." Oh, 193 Bottles of Beer on the wall," cr
+." 193 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 192 Bottles of Beer on the wall." cr
+." Oh, 192 Bottles of Beer on the wall," cr
+." 192 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 191 Bottles of Beer on the wall." cr
+." Oh, 191 Bottles of Beer on the wall," cr
+." 191 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 190 Bottles of Beer on the wall." cr
+." Oh, 190 Bottles of Beer on the wall," cr
+." 190 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 189 Bottles of Beer on the wall." cr
+." Oh, 189 Bottles of Beer on the wall," cr
+." 189 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 188 Bottles of Beer on the wall." cr
+." Oh, 188 Bottles of Beer on the wall," cr
+." 188 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 187 Bottles of Beer on the wall." cr
+." Oh, 187 Bottles of Beer on the wall," cr
+." 187 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 186 Bottles of Beer on the wall." cr
+." Oh, 186 Bottles of Beer on the wall," cr
+." 186 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 185 Bottles of Beer on the wall." cr
+." Oh, 185 Bottles of Beer on the wall," cr
+." 185 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 184 Bottles of Beer on the wall." cr
+." Oh, 184 Bottles of Beer on the wall," cr
+." 184 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 183 Bottles of Beer on the wall." cr
+." Oh, 183 Bottles of Beer on the wall," cr
+." 183 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 182 Bottles of Beer on the wall." cr
+." Oh, 182 Bottles of Beer on the wall," cr
+." 182 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 181 Bottles of Beer on the wall." cr
+." Oh, 181 Bottles of Beer on the wall," cr
+." 181 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 180 Bottles of Beer on the wall." cr
+." Oh, 180 Bottles of Beer on the wall," cr
+." 180 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 179 Bottles of Beer on the wall." cr
+." Oh, 179 Bottles of Beer on the wall," cr
+." 179 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 178 Bottles of Beer on the wall." cr
+." Oh, 178 Bottles of Beer on the wall," cr
+." 178 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 177 Bottles of Beer on the wall." cr
+." Oh, 177 Bottles of Beer on the wall," cr
+." 177 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 176 Bottles of Beer on the wall." cr
+." Oh, 176 Bottles of Beer on the wall," cr
+." 176 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 175 Bottles of Beer on the wall." cr
+." Oh, 175 Bottles of Beer on the wall," cr
+." 175 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 174 Bottles of Beer on the wall." cr
+." Oh, 174 Bottles of Beer on the wall," cr
+." 174 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 173 Bottles of Beer on the wall." cr
+." Oh, 173 Bottles of Beer on the wall," cr
+." 173 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 172 Bottles of Beer on the wall." cr
+." Oh, 172 Bottles of Beer on the wall," cr
+." 172 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 171 Bottles of Beer on the wall." cr
+." Oh, 171 Bottles of Beer on the wall," cr
+." 171 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 170 Bottles of Beer on the wall." cr
+." Oh, 170 Bottles of Beer on the wall," cr
+." 170 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 169 Bottles of Beer on the wall." cr
+." Oh, 169 Bottles of Beer on the wall," cr
+." 169 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 168 Bottles of Beer on the wall." cr
+." Oh, 168 Bottles of Beer on the wall," cr
+." 168 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 167 Bottles of Beer on the wall." cr
+." Oh, 167 Bottles of Beer on the wall," cr
+." 167 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 166 Bottles of Beer on the wall." cr
+." Oh, 166 Bottles of Beer on the wall," cr
+." 166 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 165 Bottles of Beer on the wall." cr
+." Oh, 165 Bottles of Beer on the wall," cr
+." 165 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 164 Bottles of Beer on the wall." cr
+." Oh, 164 Bottles of Beer on the wall," cr
+." 164 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 163 Bottles of Beer on the wall." cr
+." Oh, 163 Bottles of Beer on the wall," cr
+." 163 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 162 Bottles of Beer on the wall." cr
+." Oh, 162 Bottles of Beer on the wall," cr
+." 162 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 161 Bottles of Beer on the wall." cr
+." Oh, 161 Bottles of Beer on the wall," cr
+." 161 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 160 Bottles of Beer on the wall." cr
+." Oh, 160 Bottles of Beer on the wall," cr
+." 160 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 159 Bottles of Beer on the wall." cr
+." Oh, 159 Bottles of Beer on the wall," cr
+." 159 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 158 Bottles of Beer on the wall." cr
+." Oh, 158 Bottles of Beer on the wall," cr
+." 158 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 157 Bottles of Beer on the wall." cr
+." Oh, 157 Bottles of Beer on the wall," cr
+." 157 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 156 Bottles of Beer on the wall." cr
+." Oh, 156 Bottles of Beer on the wall," cr
+." 156 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 155 Bottles of Beer on the wall." cr
+." Oh, 155 Bottles of Beer on the wall," cr
+." 155 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 154 Bottles of Beer on the wall." cr
+." Oh, 154 Bottles of Beer on the wall," cr
+." 154 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 153 Bottles of Beer on the wall." cr
+." Oh, 153 Bottles of Beer on the wall," cr
+." 153 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 152 Bottles of Beer on the wall." cr
+." Oh, 152 Bottles of Beer on the wall," cr
+." 152 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 151 Bottles of Beer on the wall." cr
+." Oh, 151 Bottles of Beer on the wall," cr
+." 151 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 150 Bottles of Beer on the wall." cr
+." Oh, 150 Bottles of Beer on the wall," cr
+." 150 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 149 Bottles of Beer on the wall." cr
+." Oh, 149 Bottles of Beer on the wall," cr
+." 149 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 148 Bottles of Beer on the wall." cr
+." Oh, 148 Bottles of Beer on the wall," cr
+." 148 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 147 Bottles of Beer on the wall." cr
+." Oh, 147 Bottles of Beer on the wall," cr
+." 147 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 146 Bottles of Beer on the wall." cr
+." Oh, 146 Bottles of Beer on the wall," cr
+." 146 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 145 Bottles of Beer on the wall." cr
+." Oh, 145 Bottles of Beer on the wall," cr
+." 145 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 144 Bottles of Beer on the wall." cr
+." Oh, 144 Bottles of Beer on the wall," cr
+." 144 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 143 Bottles of Beer on the wall." cr
+." Oh, 143 Bottles of Beer on the wall," cr
+." 143 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 142 Bottles of Beer on the wall." cr
+." Oh, 142 Bottles of Beer on the wall," cr
+." 142 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 141 Bottles of Beer on the wall." cr
+." Oh, 141 Bottles of Beer on the wall," cr
+." 141 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 140 Bottles of Beer on the wall." cr
+." Oh, 140 Bottles of Beer on the wall," cr
+." 140 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 139 Bottles of Beer on the wall." cr
+." Oh, 139 Bottles of Beer on the wall," cr
+." 139 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 138 Bottles of Beer on the wall." cr
+." Oh, 138 Bottles of Beer on the wall," cr
+." 138 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 137 Bottles of Beer on the wall." cr
+." Oh, 137 Bottles of Beer on the wall," cr
+." 137 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 136 Bottles of Beer on the wall." cr
+." Oh, 136 Bottles of Beer on the wall," cr
+." 136 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 135 Bottles of Beer on the wall." cr
+." Oh, 135 Bottles of Beer on the wall," cr
+." 135 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 134 Bottles of Beer on the wall." cr
+." Oh, 134 Bottles of Beer on the wall," cr
+." 134 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 133 Bottles of Beer on the wall." cr
+." Oh, 133 Bottles of Beer on the wall," cr
+." 133 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 132 Bottles of Beer on the wall." cr
+." Oh, 132 Bottles of Beer on the wall," cr
+." 132 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 131 Bottles of Beer on the wall." cr
+." Oh, 131 Bottles of Beer on the wall," cr
+." 131 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 130 Bottles of Beer on the wall." cr
+." Oh, 130 Bottles of Beer on the wall," cr
+." 130 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 129 Bottles of Beer on the wall." cr
+." Oh, 129 Bottles of Beer on the wall," cr
+." 129 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 128 Bottles of Beer on the wall." cr
+." Oh, 128 Bottles of Beer on the wall," cr
+." 128 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 127 Bottles of Beer on the wall." cr
+." Oh, 127 Bottles of Beer on the wall," cr
+." 127 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 126 Bottles of Beer on the wall." cr
+." Oh, 126 Bottles of Beer on the wall," cr
+." 126 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 125 Bottles of Beer on the wall." cr
+." Oh, 125 Bottles of Beer on the wall," cr
+." 125 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 124 Bottles of Beer on the wall." cr
+." Oh, 124 Bottles of Beer on the wall," cr
+." 124 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 123 Bottles of Beer on the wall." cr
+." Oh, 123 Bottles of Beer on the wall," cr
+." 123 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 122 Bottles of Beer on the wall." cr
+." Oh, 122 Bottles of Beer on the wall," cr
+." 122 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 121 Bottles of Beer on the wall." cr
+." Oh, 121 Bottles of Beer on the wall," cr
+." 121 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 120 Bottles of Beer on the wall." cr
+." Oh, 120 Bottles of Beer on the wall," cr
+." 120 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 119 Bottles of Beer on the wall." cr
+." Oh, 119 Bottles of Beer on the wall," cr
+." 119 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 118 Bottles of Beer on the wall." cr
+." Oh, 118 Bottles of Beer on the wall," cr
+." 118 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 117 Bottles of Beer on the wall." cr
+." Oh, 117 Bottles of Beer on the wall," cr
+." 117 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 116 Bottles of Beer on the wall." cr
+." Oh, 116 Bottles of Beer on the wall," cr
+." 116 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 115 Bottles of Beer on the wall." cr
+." Oh, 115 Bottles of Beer on the wall," cr
+." 115 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 114 Bottles of Beer on the wall." cr
+." Oh, 114 Bottles of Beer on the wall," cr
+." 114 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 113 Bottles of Beer on the wall." cr
+." Oh, 113 Bottles of Beer on the wall," cr
+." 113 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 112 Bottles of Beer on the wall." cr
+." Oh, 112 Bottles of Beer on the wall," cr
+." 112 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 111 Bottles of Beer on the wall." cr
+." Oh, 111 Bottles of Beer on the wall," cr
+." 111 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 110 Bottles of Beer on the wall." cr
+." Oh, 110 Bottles of Beer on the wall," cr
+." 110 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 109 Bottles of Beer on the wall." cr
+." Oh, 109 Bottles of Beer on the wall," cr
+." 109 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 108 Bottles of Beer on the wall." cr
+." Oh, 108 Bottles of Beer on the wall," cr
+." 108 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 107 Bottles of Beer on the wall." cr
+." Oh, 107 Bottles of Beer on the wall," cr
+." 107 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 106 Bottles of Beer on the wall." cr
+." Oh, 106 Bottles of Beer on the wall," cr
+." 106 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 105 Bottles of Beer on the wall." cr
+." Oh, 105 Bottles of Beer on the wall," cr
+." 105 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 104 Bottles of Beer on the wall." cr
+." Oh, 104 Bottles of Beer on the wall," cr
+." 104 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 103 Bottles of Beer on the wall." cr
+." Oh, 103 Bottles of Beer on the wall," cr
+." 103 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 102 Bottles of Beer on the wall." cr
+." Oh, 102 Bottles of Beer on the wall," cr
+." 102 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 101 Bottles of Beer on the wall." cr
+." Oh, 101 Bottles of Beer on the wall," cr
+." 101 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 100 Bottles of Beer on the wall." cr
+." Oh, 100 Bottles of Beer on the wall," cr
+." 100 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 99 Bottles of Beer on the wall." cr
+." Oh, 99 Bottles of Beer on the wall," cr
+." 99 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 98 Bottles of Beer on the wall." cr
+." Oh, 98 Bottles of Beer on the wall," cr
+." 98 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 97 Bottles of Beer on the wall." cr
+." Oh, 97 Bottles of Beer on the wall," cr
+." 97 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 96 Bottles of Beer on the wall." cr
+." Oh, 96 Bottles of Beer on the wall," cr
+." 96 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 95 Bottles of Beer on the wall." cr
+." Oh, 95 Bottles of Beer on the wall," cr
+." 95 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 94 Bottles of Beer on the wall." cr
+." Oh, 94 Bottles of Beer on the wall," cr
+." 94 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 93 Bottles of Beer on the wall." cr
+." Oh, 93 Bottles of Beer on the wall," cr
+." 93 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 92 Bottles of Beer on the wall." cr
+." Oh, 92 Bottles of Beer on the wall," cr
+." 92 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 91 Bottles of Beer on the wall." cr
+." Oh, 91 Bottles of Beer on the wall," cr
+." 91 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 90 Bottles of Beer on the wall." cr
+." Oh, 90 Bottles of Beer on the wall," cr
+." 90 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 89 Bottles of Beer on the wall." cr
+." Oh, 89 Bottles of Beer on the wall," cr
+." 89 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 88 Bottles of Beer on the wall." cr
+." Oh, 88 Bottles of Beer on the wall," cr
+." 88 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 87 Bottles of Beer on the wall." cr
+." Oh, 87 Bottles of Beer on the wall," cr
+." 87 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 86 Bottles of Beer on the wall." cr
+." Oh, 86 Bottles of Beer on the wall," cr
+." 86 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 85 Bottles of Beer on the wall." cr
+." Oh, 85 Bottles of Beer on the wall," cr
+." 85 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 84 Bottles of Beer on the wall." cr
+." Oh, 84 Bottles of Beer on the wall," cr
+." 84 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 83 Bottles of Beer on the wall." cr
+." Oh, 83 Bottles of Beer on the wall," cr
+." 83 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 82 Bottles of Beer on the wall." cr
+." Oh, 82 Bottles of Beer on the wall," cr
+." 82 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 81 Bottles of Beer on the wall." cr
+." Oh, 81 Bottles of Beer on the wall," cr
+." 81 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 80 Bottles of Beer on the wall." cr
+." Oh, 80 Bottles of Beer on the wall," cr
+." 80 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 79 Bottles of Beer on the wall." cr
+." Oh, 79 Bottles of Beer on the wall," cr
+." 79 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 78 Bottles of Beer on the wall." cr
+." Oh, 78 Bottles of Beer on the wall," cr
+." 78 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 77 Bottles of Beer on the wall." cr
+." Oh, 77 Bottles of Beer on the wall," cr
+." 77 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 76 Bottles of Beer on the wall." cr
+." Oh, 76 Bottles of Beer on the wall," cr
+." 76 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 75 Bottles of Beer on the wall." cr
+." Oh, 75 Bottles of Beer on the wall," cr
+." 75 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 74 Bottles of Beer on the wall." cr
+." Oh, 74 Bottles of Beer on the wall," cr
+." 74 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 73 Bottles of Beer on the wall." cr
+." Oh, 73 Bottles of Beer on the wall," cr
+." 73 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 72 Bottles of Beer on the wall." cr
+." Oh, 72 Bottles of Beer on the wall," cr
+." 72 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 71 Bottles of Beer on the wall." cr
+." Oh, 71 Bottles of Beer on the wall," cr
+." 71 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 70 Bottles of Beer on the wall." cr
+." Oh, 70 Bottles of Beer on the wall," cr
+." 70 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 69 Bottles of Beer on the wall." cr
+." Oh, 69 Bottles of Beer on the wall," cr
+." 69 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 68 Bottles of Beer on the wall." cr
+." Oh, 68 Bottles of Beer on the wall," cr
+." 68 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 67 Bottles of Beer on the wall." cr
+." Oh, 67 Bottles of Beer on the wall," cr
+." 67 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 66 Bottles of Beer on the wall." cr
+." Oh, 66 Bottles of Beer on the wall," cr
+." 66 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 65 Bottles of Beer on the wall." cr
+." Oh, 65 Bottles of Beer on the wall," cr
+." 65 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 64 Bottles of Beer on the wall." cr
+." Oh, 64 Bottles of Beer on the wall," cr
+." 64 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 63 Bottles of Beer on the wall." cr
+." Oh, 63 Bottles of Beer on the wall," cr
+." 63 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 62 Bottles of Beer on the wall." cr
+." Oh, 62 Bottles of Beer on the wall," cr
+." 62 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 61 Bottles of Beer on the wall." cr
+." Oh, 61 Bottles of Beer on the wall," cr
+." 61 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 60 Bottles of Beer on the wall." cr
+." Oh, 60 Bottles of Beer on the wall," cr
+." 60 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 59 Bottles of Beer on the wall." cr
+." Oh, 59 Bottles of Beer on the wall," cr
+." 59 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 58 Bottles of Beer on the wall." cr
+." Oh, 58 Bottles of Beer on the wall," cr
+." 58 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 57 Bottles of Beer on the wall." cr
+." Oh, 57 Bottles of Beer on the wall," cr
+." 57 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 56 Bottles of Beer on the wall." cr
+." Oh, 56 Bottles of Beer on the wall," cr
+." 56 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 55 Bottles of Beer on the wall." cr
+." Oh, 55 Bottles of Beer on the wall," cr
+." 55 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 54 Bottles of Beer on the wall." cr
+." Oh, 54 Bottles of Beer on the wall," cr
+." 54 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 53 Bottles of Beer on the wall." cr
+." Oh, 53 Bottles of Beer on the wall," cr
+." 53 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 52 Bottles of Beer on the wall." cr
+." Oh, 52 Bottles of Beer on the wall," cr
+." 52 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 51 Bottles of Beer on the wall." cr
+." Oh, 51 Bottles of Beer on the wall," cr
+." 51 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 50 Bottles of Beer on the wall." cr
+." Oh, 50 Bottles of Beer on the wall," cr
+." 50 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 49 Bottles of Beer on the wall." cr
+." Oh, 49 Bottles of Beer on the wall," cr
+." 49 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 48 Bottles of Beer on the wall." cr
+." Oh, 48 Bottles of Beer on the wall," cr
+." 48 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 47 Bottles of Beer on the wall." cr
+." Oh, 47 Bottles of Beer on the wall," cr
+." 47 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 46 Bottles of Beer on the wall." cr
+." Oh, 46 Bottles of Beer on the wall," cr
+." 46 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 45 Bottles of Beer on the wall." cr
+." Oh, 45 Bottles of Beer on the wall," cr
+." 45 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 44 Bottles of Beer on the wall." cr
+." Oh, 44 Bottles of Beer on the wall," cr
+." 44 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 43 Bottles of Beer on the wall." cr
+." Oh, 43 Bottles of Beer on the wall," cr
+." 43 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 42 Bottles of Beer on the wall." cr
+." Oh, 42 Bottles of Beer on the wall," cr
+." 42 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 41 Bottles of Beer on the wall." cr
+." Oh, 41 Bottles of Beer on the wall," cr
+." 41 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 40 Bottles of Beer on the wall." cr
+." Oh, 40 Bottles of Beer on the wall," cr
+." 40 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 39 Bottles of Beer on the wall." cr
+." Oh, 39 Bottles of Beer on the wall," cr
+." 39 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 38 Bottles of Beer on the wall." cr
+." Oh, 38 Bottles of Beer on the wall," cr
+." 38 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 37 Bottles of Beer on the wall." cr
+." Oh, 37 Bottles of Beer on the wall," cr
+." 37 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 36 Bottles of Beer on the wall." cr
+." Oh, 36 Bottles of Beer on the wall," cr
+." 36 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 35 Bottles of Beer on the wall." cr
+." Oh, 35 Bottles of Beer on the wall," cr
+." 35 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 34 Bottles of Beer on the wall." cr
+." Oh, 34 Bottles of Beer on the wall," cr
+." 34 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 33 Bottles of Beer on the wall." cr
+." Oh, 33 Bottles of Beer on the wall," cr
+." 33 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 32 Bottles of Beer on the wall." cr
+." Oh, 32 Bottles of Beer on the wall," cr
+." 32 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 31 Bottles of Beer on the wall." cr
+." Oh, 31 Bottles of Beer on the wall," cr
+." 31 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 30 Bottles of Beer on the wall." cr
+." Oh, 30 Bottles of Beer on the wall," cr
+." 30 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 29 Bottles of Beer on the wall." cr
+." Oh, 29 Bottles of Beer on the wall," cr
+." 29 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 28 Bottles of Beer on the wall." cr
+." Oh, 28 Bottles of Beer on the wall," cr
+." 28 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 27 Bottles of Beer on the wall." cr
+." Oh, 27 Bottles of Beer on the wall," cr
+." 27 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 26 Bottles of Beer on the wall." cr
+." Oh, 26 Bottles of Beer on the wall," cr
+." 26 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 25 Bottles of Beer on the wall." cr
+." Oh, 25 Bottles of Beer on the wall," cr
+." 25 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 24 Bottles of Beer on the wall." cr
+." Oh, 24 Bottles of Beer on the wall," cr
+." 24 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 23 Bottles of Beer on the wall." cr
+." Oh, 23 Bottles of Beer on the wall," cr
+." 23 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 22 Bottles of Beer on the wall." cr
+." Oh, 22 Bottles of Beer on the wall," cr
+." 22 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 21 Bottles of Beer on the wall." cr
+." Oh, 21 Bottles of Beer on the wall," cr
+." 21 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 20 Bottles of Beer on the wall." cr
+." Oh, 20 Bottles of Beer on the wall," cr
+." 20 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 19 Bottles of Beer on the wall." cr
+." Oh, 19 Bottles of Beer on the wall," cr
+." 19 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 18 Bottles of Beer on the wall." cr
+." Oh, 18 Bottles of Beer on the wall," cr
+." 18 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 17 Bottles of Beer on the wall." cr
+." Oh, 17 Bottles of Beer on the wall," cr
+." 17 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 16 Bottles of Beer on the wall." cr
+." Oh, 16 Bottles of Beer on the wall," cr
+." 16 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 15 Bottles of Beer on the wall." cr
+." Oh, 15 Bottles of Beer on the wall," cr
+." 15 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 14 Bottles of Beer on the wall." cr
+." Oh, 14 Bottles of Beer on the wall," cr
+." 14 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 13 Bottles of Beer on the wall." cr
+." Oh, 13 Bottles of Beer on the wall," cr
+." 13 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 12 Bottles of Beer on the wall." cr
+." Oh, 12 Bottles of Beer on the wall," cr
+." 12 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 11 Bottles of Beer on the wall." cr
+." Oh, 11 Bottles of Beer on the wall," cr
+." 11 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 10 Bottles of Beer on the wall." cr
+." Oh, 10 Bottles of Beer on the wall," cr
+." 10 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 9 Bottles of Beer on the wall." cr
+." Oh, 9 Bottles of Beer on the wall," cr
+." 9 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 8 Bottles of Beer on the wall." cr
+." Oh, 8 Bottles of Beer on the wall," cr
+." 8 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 7 Bottles of Beer on the wall." cr
+." Oh, 7 Bottles of Beer on the wall," cr
+." 7 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 6 Bottles of Beer on the wall." cr
+." Oh, 6 Bottles of Beer on the wall," cr
+." 6 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 5 Bottles of Beer on the wall." cr
+." Oh, 5 Bottles of Beer on the wall," cr
+." 5 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 4 Bottles of Beer on the wall." cr
+." Oh, 4 Bottles of Beer on the wall," cr
+." 4 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 3 Bottles of Beer on the wall." cr
+." Oh, 3 Bottles of Beer on the wall," cr
+." 3 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 2 Bottles of Beer on the wall." cr
+." Oh, 2 Bottles of Beer on the wall," cr
+." 2 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 1 Bottle of Beer on the wall." cr
+." Oh, 1 Bottle of Beer on the wall," cr
+." 1 Bottle of Beer!," cr
+." Take it down and pass it around..." cr
+." How dry I am! How dry I am!" cr
+." No body knows how dry I am." cr
+." How ... Dry I ... Aaaammm." cr
Added: fcode-utils/testsuite/TokeErrs/TooLargeBranch_N232_body.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeBranch_N232_body.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooLargeBranch_N232_body.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,931 @@
+[message] Starting out with 232 Bottles of Beer on the wall
+." Oh, 232 Bottles of Beer on the wall," cr
+." 232 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 231 Bottles of Beer on the wall." cr
+." Oh, 231 Bottles of Beer on the wall," cr
+." 231 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 230 Bottles of Beer on the wall." cr
+." Oh, 230 Bottles of Beer on the wall," cr
+." 230 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 229 Bottles of Beer on the wall." cr
+." Oh, 229 Bottles of Beer on the wall," cr
+." 229 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 228 Bottles of Beer on the wall." cr
+." Oh, 228 Bottles of Beer on the wall," cr
+." 228 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 227 Bottles of Beer on the wall." cr
+." Oh, 227 Bottles of Beer on the wall," cr
+." 227 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 226 Bottles of Beer on the wall." cr
+." Oh, 226 Bottles of Beer on the wall," cr
+." 226 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 225 Bottles of Beer on the wall." cr
+." Oh, 225 Bottles of Beer on the wall," cr
+." 225 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 224 Bottles of Beer on the wall." cr
+." Oh, 224 Bottles of Beer on the wall," cr
+." 224 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 223 Bottles of Beer on the wall." cr
+." Oh, 223 Bottles of Beer on the wall," cr
+." 223 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 222 Bottles of Beer on the wall." cr
+." Oh, 222 Bottles of Beer on the wall," cr
+." 222 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 221 Bottles of Beer on the wall." cr
+." Oh, 221 Bottles of Beer on the wall," cr
+." 221 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 220 Bottles of Beer on the wall." cr
+." Oh, 220 Bottles of Beer on the wall," cr
+." 220 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 219 Bottles of Beer on the wall." cr
+." Oh, 219 Bottles of Beer on the wall," cr
+." 219 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 218 Bottles of Beer on the wall." cr
+." Oh, 218 Bottles of Beer on the wall," cr
+." 218 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 217 Bottles of Beer on the wall." cr
+." Oh, 217 Bottles of Beer on the wall," cr
+." 217 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 216 Bottles of Beer on the wall." cr
+." Oh, 216 Bottles of Beer on the wall," cr
+." 216 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 215 Bottles of Beer on the wall." cr
+." Oh, 215 Bottles of Beer on the wall," cr
+." 215 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 214 Bottles of Beer on the wall." cr
+." Oh, 214 Bottles of Beer on the wall," cr
+." 214 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 213 Bottles of Beer on the wall." cr
+." Oh, 213 Bottles of Beer on the wall," cr
+." 213 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 212 Bottles of Beer on the wall." cr
+." Oh, 212 Bottles of Beer on the wall," cr
+." 212 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 211 Bottles of Beer on the wall." cr
+." Oh, 211 Bottles of Beer on the wall," cr
+." 211 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 210 Bottles of Beer on the wall." cr
+." Oh, 210 Bottles of Beer on the wall," cr
+." 210 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 209 Bottles of Beer on the wall." cr
+." Oh, 209 Bottles of Beer on the wall," cr
+." 209 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 208 Bottles of Beer on the wall." cr
+." Oh, 208 Bottles of Beer on the wall," cr
+." 208 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 207 Bottles of Beer on the wall." cr
+." Oh, 207 Bottles of Beer on the wall," cr
+." 207 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 206 Bottles of Beer on the wall." cr
+." Oh, 206 Bottles of Beer on the wall," cr
+." 206 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 205 Bottles of Beer on the wall." cr
+." Oh, 205 Bottles of Beer on the wall," cr
+." 205 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 204 Bottles of Beer on the wall." cr
+." Oh, 204 Bottles of Beer on the wall," cr
+." 204 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 203 Bottles of Beer on the wall." cr
+." Oh, 203 Bottles of Beer on the wall," cr
+." 203 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 202 Bottles of Beer on the wall." cr
+." Oh, 202 Bottles of Beer on the wall," cr
+." 202 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 201 Bottles of Beer on the wall." cr
+." Oh, 201 Bottles of Beer on the wall," cr
+." 201 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 200 Bottles of Beer on the wall." cr
+." Oh, 200 Bottles of Beer on the wall," cr
+." 200 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 199 Bottles of Beer on the wall." cr
+." Oh, 199 Bottles of Beer on the wall," cr
+." 199 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 198 Bottles of Beer on the wall." cr
+." Oh, 198 Bottles of Beer on the wall," cr
+." 198 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 197 Bottles of Beer on the wall." cr
+." Oh, 197 Bottles of Beer on the wall," cr
+." 197 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 196 Bottles of Beer on the wall." cr
+." Oh, 196 Bottles of Beer on the wall," cr
+." 196 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 195 Bottles of Beer on the wall." cr
+." Oh, 195 Bottles of Beer on the wall," cr
+." 195 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 194 Bottles of Beer on the wall." cr
+." Oh, 194 Bottles of Beer on the wall," cr
+." 194 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 193 Bottles of Beer on the wall." cr
+." Oh, 193 Bottles of Beer on the wall," cr
+." 193 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 192 Bottles of Beer on the wall." cr
+." Oh, 192 Bottles of Beer on the wall," cr
+." 192 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 191 Bottles of Beer on the wall." cr
+." Oh, 191 Bottles of Beer on the wall," cr
+." 191 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 190 Bottles of Beer on the wall." cr
+." Oh, 190 Bottles of Beer on the wall," cr
+." 190 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 189 Bottles of Beer on the wall." cr
+." Oh, 189 Bottles of Beer on the wall," cr
+." 189 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 188 Bottles of Beer on the wall." cr
+." Oh, 188 Bottles of Beer on the wall," cr
+." 188 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 187 Bottles of Beer on the wall." cr
+." Oh, 187 Bottles of Beer on the wall," cr
+." 187 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 186 Bottles of Beer on the wall." cr
+." Oh, 186 Bottles of Beer on the wall," cr
+." 186 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 185 Bottles of Beer on the wall." cr
+." Oh, 185 Bottles of Beer on the wall," cr
+." 185 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 184 Bottles of Beer on the wall." cr
+." Oh, 184 Bottles of Beer on the wall," cr
+." 184 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 183 Bottles of Beer on the wall." cr
+." Oh, 183 Bottles of Beer on the wall," cr
+." 183 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 182 Bottles of Beer on the wall." cr
+." Oh, 182 Bottles of Beer on the wall," cr
+." 182 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 181 Bottles of Beer on the wall." cr
+." Oh, 181 Bottles of Beer on the wall," cr
+." 181 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 180 Bottles of Beer on the wall." cr
+." Oh, 180 Bottles of Beer on the wall," cr
+." 180 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 179 Bottles of Beer on the wall." cr
+." Oh, 179 Bottles of Beer on the wall," cr
+." 179 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 178 Bottles of Beer on the wall." cr
+." Oh, 178 Bottles of Beer on the wall," cr
+." 178 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 177 Bottles of Beer on the wall." cr
+." Oh, 177 Bottles of Beer on the wall," cr
+." 177 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 176 Bottles of Beer on the wall." cr
+." Oh, 176 Bottles of Beer on the wall," cr
+." 176 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 175 Bottles of Beer on the wall." cr
+." Oh, 175 Bottles of Beer on the wall," cr
+." 175 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 174 Bottles of Beer on the wall." cr
+." Oh, 174 Bottles of Beer on the wall," cr
+." 174 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 173 Bottles of Beer on the wall." cr
+." Oh, 173 Bottles of Beer on the wall," cr
+." 173 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 172 Bottles of Beer on the wall." cr
+." Oh, 172 Bottles of Beer on the wall," cr
+." 172 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 171 Bottles of Beer on the wall." cr
+." Oh, 171 Bottles of Beer on the wall," cr
+." 171 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 170 Bottles of Beer on the wall." cr
+." Oh, 170 Bottles of Beer on the wall," cr
+." 170 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 169 Bottles of Beer on the wall." cr
+." Oh, 169 Bottles of Beer on the wall," cr
+." 169 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 168 Bottles of Beer on the wall." cr
+." Oh, 168 Bottles of Beer on the wall," cr
+." 168 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 167 Bottles of Beer on the wall." cr
+." Oh, 167 Bottles of Beer on the wall," cr
+." 167 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 166 Bottles of Beer on the wall." cr
+." Oh, 166 Bottles of Beer on the wall," cr
+." 166 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 165 Bottles of Beer on the wall." cr
+." Oh, 165 Bottles of Beer on the wall," cr
+." 165 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 164 Bottles of Beer on the wall." cr
+." Oh, 164 Bottles of Beer on the wall," cr
+." 164 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 163 Bottles of Beer on the wall." cr
+." Oh, 163 Bottles of Beer on the wall," cr
+." 163 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 162 Bottles of Beer on the wall." cr
+." Oh, 162 Bottles of Beer on the wall," cr
+." 162 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 161 Bottles of Beer on the wall." cr
+." Oh, 161 Bottles of Beer on the wall," cr
+." 161 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 160 Bottles of Beer on the wall." cr
+." Oh, 160 Bottles of Beer on the wall," cr
+." 160 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 159 Bottles of Beer on the wall." cr
+." Oh, 159 Bottles of Beer on the wall," cr
+." 159 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 158 Bottles of Beer on the wall." cr
+." Oh, 158 Bottles of Beer on the wall," cr
+." 158 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 157 Bottles of Beer on the wall." cr
+." Oh, 157 Bottles of Beer on the wall," cr
+." 157 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 156 Bottles of Beer on the wall." cr
+." Oh, 156 Bottles of Beer on the wall," cr
+." 156 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 155 Bottles of Beer on the wall." cr
+." Oh, 155 Bottles of Beer on the wall," cr
+." 155 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 154 Bottles of Beer on the wall." cr
+." Oh, 154 Bottles of Beer on the wall," cr
+." 154 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 153 Bottles of Beer on the wall." cr
+." Oh, 153 Bottles of Beer on the wall," cr
+." 153 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 152 Bottles of Beer on the wall." cr
+." Oh, 152 Bottles of Beer on the wall," cr
+." 152 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 151 Bottles of Beer on the wall." cr
+." Oh, 151 Bottles of Beer on the wall," cr
+." 151 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 150 Bottles of Beer on the wall." cr
+." Oh, 150 Bottles of Beer on the wall," cr
+." 150 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 149 Bottles of Beer on the wall." cr
+." Oh, 149 Bottles of Beer on the wall," cr
+." 149 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 148 Bottles of Beer on the wall." cr
+." Oh, 148 Bottles of Beer on the wall," cr
+." 148 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 147 Bottles of Beer on the wall." cr
+." Oh, 147 Bottles of Beer on the wall," cr
+." 147 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 146 Bottles of Beer on the wall." cr
+." Oh, 146 Bottles of Beer on the wall," cr
+." 146 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 145 Bottles of Beer on the wall." cr
+." Oh, 145 Bottles of Beer on the wall," cr
+." 145 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 144 Bottles of Beer on the wall." cr
+." Oh, 144 Bottles of Beer on the wall," cr
+." 144 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 143 Bottles of Beer on the wall." cr
+." Oh, 143 Bottles of Beer on the wall," cr
+." 143 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 142 Bottles of Beer on the wall." cr
+." Oh, 142 Bottles of Beer on the wall," cr
+." 142 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 141 Bottles of Beer on the wall." cr
+." Oh, 141 Bottles of Beer on the wall," cr
+." 141 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 140 Bottles of Beer on the wall." cr
+." Oh, 140 Bottles of Beer on the wall," cr
+." 140 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 139 Bottles of Beer on the wall." cr
+." Oh, 139 Bottles of Beer on the wall," cr
+." 139 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 138 Bottles of Beer on the wall." cr
+." Oh, 138 Bottles of Beer on the wall," cr
+." 138 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 137 Bottles of Beer on the wall." cr
+." Oh, 137 Bottles of Beer on the wall," cr
+." 137 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 136 Bottles of Beer on the wall." cr
+." Oh, 136 Bottles of Beer on the wall," cr
+." 136 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 135 Bottles of Beer on the wall." cr
+." Oh, 135 Bottles of Beer on the wall," cr
+." 135 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 134 Bottles of Beer on the wall." cr
+." Oh, 134 Bottles of Beer on the wall," cr
+." 134 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 133 Bottles of Beer on the wall." cr
+." Oh, 133 Bottles of Beer on the wall," cr
+." 133 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 132 Bottles of Beer on the wall." cr
+." Oh, 132 Bottles of Beer on the wall," cr
+." 132 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 131 Bottles of Beer on the wall." cr
+." Oh, 131 Bottles of Beer on the wall," cr
+." 131 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 130 Bottles of Beer on the wall." cr
+." Oh, 130 Bottles of Beer on the wall," cr
+." 130 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 129 Bottles of Beer on the wall." cr
+." Oh, 129 Bottles of Beer on the wall," cr
+." 129 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 128 Bottles of Beer on the wall." cr
+." Oh, 128 Bottles of Beer on the wall," cr
+." 128 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 127 Bottles of Beer on the wall." cr
+." Oh, 127 Bottles of Beer on the wall," cr
+." 127 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 126 Bottles of Beer on the wall." cr
+." Oh, 126 Bottles of Beer on the wall," cr
+." 126 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 125 Bottles of Beer on the wall." cr
+." Oh, 125 Bottles of Beer on the wall," cr
+." 125 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 124 Bottles of Beer on the wall." cr
+." Oh, 124 Bottles of Beer on the wall," cr
+." 124 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 123 Bottles of Beer on the wall." cr
+." Oh, 123 Bottles of Beer on the wall," cr
+." 123 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 122 Bottles of Beer on the wall." cr
+." Oh, 122 Bottles of Beer on the wall," cr
+." 122 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 121 Bottles of Beer on the wall." cr
+." Oh, 121 Bottles of Beer on the wall," cr
+." 121 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 120 Bottles of Beer on the wall." cr
+." Oh, 120 Bottles of Beer on the wall," cr
+." 120 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 119 Bottles of Beer on the wall." cr
+." Oh, 119 Bottles of Beer on the wall," cr
+." 119 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 118 Bottles of Beer on the wall." cr
+." Oh, 118 Bottles of Beer on the wall," cr
+." 118 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 117 Bottles of Beer on the wall." cr
+." Oh, 117 Bottles of Beer on the wall," cr
+." 117 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 116 Bottles of Beer on the wall." cr
+." Oh, 116 Bottles of Beer on the wall," cr
+." 116 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 115 Bottles of Beer on the wall." cr
+." Oh, 115 Bottles of Beer on the wall," cr
+." 115 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 114 Bottles of Beer on the wall." cr
+." Oh, 114 Bottles of Beer on the wall," cr
+." 114 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 113 Bottles of Beer on the wall." cr
+." Oh, 113 Bottles of Beer on the wall," cr
+." 113 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 112 Bottles of Beer on the wall." cr
+." Oh, 112 Bottles of Beer on the wall," cr
+." 112 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 111 Bottles of Beer on the wall." cr
+." Oh, 111 Bottles of Beer on the wall," cr
+." 111 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 110 Bottles of Beer on the wall." cr
+." Oh, 110 Bottles of Beer on the wall," cr
+." 110 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 109 Bottles of Beer on the wall." cr
+." Oh, 109 Bottles of Beer on the wall," cr
+." 109 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 108 Bottles of Beer on the wall." cr
+." Oh, 108 Bottles of Beer on the wall," cr
+." 108 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 107 Bottles of Beer on the wall." cr
+." Oh, 107 Bottles of Beer on the wall," cr
+." 107 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 106 Bottles of Beer on the wall." cr
+." Oh, 106 Bottles of Beer on the wall," cr
+." 106 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 105 Bottles of Beer on the wall." cr
+." Oh, 105 Bottles of Beer on the wall," cr
+." 105 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 104 Bottles of Beer on the wall." cr
+." Oh, 104 Bottles of Beer on the wall," cr
+." 104 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 103 Bottles of Beer on the wall." cr
+." Oh, 103 Bottles of Beer on the wall," cr
+." 103 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 102 Bottles of Beer on the wall." cr
+." Oh, 102 Bottles of Beer on the wall," cr
+." 102 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 101 Bottles of Beer on the wall." cr
+." Oh, 101 Bottles of Beer on the wall," cr
+." 101 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 100 Bottles of Beer on the wall." cr
+." Oh, 100 Bottles of Beer on the wall," cr
+." 100 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 99 Bottles of Beer on the wall." cr
+." Oh, 99 Bottles of Beer on the wall," cr
+." 99 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 98 Bottles of Beer on the wall." cr
+." Oh, 98 Bottles of Beer on the wall," cr
+." 98 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 97 Bottles of Beer on the wall." cr
+." Oh, 97 Bottles of Beer on the wall," cr
+." 97 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 96 Bottles of Beer on the wall." cr
+." Oh, 96 Bottles of Beer on the wall," cr
+." 96 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 95 Bottles of Beer on the wall." cr
+." Oh, 95 Bottles of Beer on the wall," cr
+." 95 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 94 Bottles of Beer on the wall." cr
+." Oh, 94 Bottles of Beer on the wall," cr
+." 94 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 93 Bottles of Beer on the wall." cr
+." Oh, 93 Bottles of Beer on the wall," cr
+." 93 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 92 Bottles of Beer on the wall." cr
+." Oh, 92 Bottles of Beer on the wall," cr
+." 92 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 91 Bottles of Beer on the wall." cr
+." Oh, 91 Bottles of Beer on the wall," cr
+." 91 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 90 Bottles of Beer on the wall." cr
+." Oh, 90 Bottles of Beer on the wall," cr
+." 90 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 89 Bottles of Beer on the wall." cr
+." Oh, 89 Bottles of Beer on the wall," cr
+." 89 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 88 Bottles of Beer on the wall." cr
+." Oh, 88 Bottles of Beer on the wall," cr
+." 88 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 87 Bottles of Beer on the wall." cr
+." Oh, 87 Bottles of Beer on the wall," cr
+." 87 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 86 Bottles of Beer on the wall." cr
+." Oh, 86 Bottles of Beer on the wall," cr
+." 86 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 85 Bottles of Beer on the wall." cr
+." Oh, 85 Bottles of Beer on the wall," cr
+." 85 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 84 Bottles of Beer on the wall." cr
+." Oh, 84 Bottles of Beer on the wall," cr
+." 84 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 83 Bottles of Beer on the wall." cr
+." Oh, 83 Bottles of Beer on the wall," cr
+." 83 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 82 Bottles of Beer on the wall." cr
+." Oh, 82 Bottles of Beer on the wall," cr
+." 82 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 81 Bottles of Beer on the wall." cr
+." Oh, 81 Bottles of Beer on the wall," cr
+." 81 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 80 Bottles of Beer on the wall." cr
+." Oh, 80 Bottles of Beer on the wall," cr
+." 80 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 79 Bottles of Beer on the wall." cr
+." Oh, 79 Bottles of Beer on the wall," cr
+." 79 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 78 Bottles of Beer on the wall." cr
+." Oh, 78 Bottles of Beer on the wall," cr
+." 78 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 77 Bottles of Beer on the wall." cr
+." Oh, 77 Bottles of Beer on the wall," cr
+." 77 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 76 Bottles of Beer on the wall." cr
+." Oh, 76 Bottles of Beer on the wall," cr
+." 76 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 75 Bottles of Beer on the wall." cr
+." Oh, 75 Bottles of Beer on the wall," cr
+." 75 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 74 Bottles of Beer on the wall." cr
+." Oh, 74 Bottles of Beer on the wall," cr
+." 74 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 73 Bottles of Beer on the wall." cr
+." Oh, 73 Bottles of Beer on the wall," cr
+." 73 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 72 Bottles of Beer on the wall." cr
+." Oh, 72 Bottles of Beer on the wall," cr
+." 72 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 71 Bottles of Beer on the wall." cr
+." Oh, 71 Bottles of Beer on the wall," cr
+." 71 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 70 Bottles of Beer on the wall." cr
+." Oh, 70 Bottles of Beer on the wall," cr
+." 70 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 69 Bottles of Beer on the wall." cr
+." Oh, 69 Bottles of Beer on the wall," cr
+." 69 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 68 Bottles of Beer on the wall." cr
+." Oh, 68 Bottles of Beer on the wall," cr
+." 68 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 67 Bottles of Beer on the wall." cr
+." Oh, 67 Bottles of Beer on the wall," cr
+." 67 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 66 Bottles of Beer on the wall." cr
+." Oh, 66 Bottles of Beer on the wall," cr
+." 66 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 65 Bottles of Beer on the wall." cr
+." Oh, 65 Bottles of Beer on the wall," cr
+." 65 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 64 Bottles of Beer on the wall." cr
+." Oh, 64 Bottles of Beer on the wall," cr
+." 64 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 63 Bottles of Beer on the wall." cr
+." Oh, 63 Bottles of Beer on the wall," cr
+." 63 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 62 Bottles of Beer on the wall." cr
+." Oh, 62 Bottles of Beer on the wall," cr
+." 62 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 61 Bottles of Beer on the wall." cr
+." Oh, 61 Bottles of Beer on the wall," cr
+." 61 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 60 Bottles of Beer on the wall." cr
+." Oh, 60 Bottles of Beer on the wall," cr
+." 60 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 59 Bottles of Beer on the wall." cr
+." Oh, 59 Bottles of Beer on the wall," cr
+." 59 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 58 Bottles of Beer on the wall." cr
+." Oh, 58 Bottles of Beer on the wall," cr
+." 58 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 57 Bottles of Beer on the wall." cr
+." Oh, 57 Bottles of Beer on the wall," cr
+." 57 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 56 Bottles of Beer on the wall." cr
+." Oh, 56 Bottles of Beer on the wall," cr
+." 56 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 55 Bottles of Beer on the wall." cr
+." Oh, 55 Bottles of Beer on the wall," cr
+." 55 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 54 Bottles of Beer on the wall." cr
+." Oh, 54 Bottles of Beer on the wall," cr
+." 54 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 53 Bottles of Beer on the wall." cr
+." Oh, 53 Bottles of Beer on the wall," cr
+." 53 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 52 Bottles of Beer on the wall." cr
+." Oh, 52 Bottles of Beer on the wall," cr
+." 52 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 51 Bottles of Beer on the wall." cr
+." Oh, 51 Bottles of Beer on the wall," cr
+." 51 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 50 Bottles of Beer on the wall." cr
+." Oh, 50 Bottles of Beer on the wall," cr
+." 50 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 49 Bottles of Beer on the wall." cr
+." Oh, 49 Bottles of Beer on the wall," cr
+." 49 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 48 Bottles of Beer on the wall." cr
+." Oh, 48 Bottles of Beer on the wall," cr
+." 48 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 47 Bottles of Beer on the wall." cr
+." Oh, 47 Bottles of Beer on the wall," cr
+." 47 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 46 Bottles of Beer on the wall." cr
+." Oh, 46 Bottles of Beer on the wall," cr
+." 46 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 45 Bottles of Beer on the wall." cr
+." Oh, 45 Bottles of Beer on the wall," cr
+." 45 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 44 Bottles of Beer on the wall." cr
+." Oh, 44 Bottles of Beer on the wall," cr
+." 44 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 43 Bottles of Beer on the wall." cr
+." Oh, 43 Bottles of Beer on the wall," cr
+." 43 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 42 Bottles of Beer on the wall." cr
+." Oh, 42 Bottles of Beer on the wall," cr
+." 42 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 41 Bottles of Beer on the wall." cr
+." Oh, 41 Bottles of Beer on the wall," cr
+." 41 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 40 Bottles of Beer on the wall." cr
+." Oh, 40 Bottles of Beer on the wall," cr
+." 40 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 39 Bottles of Beer on the wall." cr
+." Oh, 39 Bottles of Beer on the wall," cr
+." 39 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 38 Bottles of Beer on the wall." cr
+." Oh, 38 Bottles of Beer on the wall," cr
+." 38 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 37 Bottles of Beer on the wall." cr
+." Oh, 37 Bottles of Beer on the wall," cr
+." 37 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 36 Bottles of Beer on the wall." cr
+." Oh, 36 Bottles of Beer on the wall," cr
+." 36 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 35 Bottles of Beer on the wall." cr
+." Oh, 35 Bottles of Beer on the wall," cr
+." 35 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 34 Bottles of Beer on the wall." cr
+." Oh, 34 Bottles of Beer on the wall," cr
+." 34 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 33 Bottles of Beer on the wall." cr
+." Oh, 33 Bottles of Beer on the wall," cr
+." 33 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 32 Bottles of Beer on the wall." cr
+." Oh, 32 Bottles of Beer on the wall," cr
+." 32 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 31 Bottles of Beer on the wall." cr
+." Oh, 31 Bottles of Beer on the wall," cr
+." 31 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 30 Bottles of Beer on the wall." cr
+." Oh, 30 Bottles of Beer on the wall," cr
+." 30 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 29 Bottles of Beer on the wall." cr
+." Oh, 29 Bottles of Beer on the wall," cr
+." 29 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 28 Bottles of Beer on the wall." cr
+." Oh, 28 Bottles of Beer on the wall," cr
+." 28 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 27 Bottles of Beer on the wall." cr
+." Oh, 27 Bottles of Beer on the wall," cr
+." 27 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 26 Bottles of Beer on the wall." cr
+." Oh, 26 Bottles of Beer on the wall," cr
+." 26 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 25 Bottles of Beer on the wall." cr
+." Oh, 25 Bottles of Beer on the wall," cr
+." 25 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 24 Bottles of Beer on the wall." cr
+." Oh, 24 Bottles of Beer on the wall," cr
+." 24 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 23 Bottles of Beer on the wall." cr
+." Oh, 23 Bottles of Beer on the wall," cr
+." 23 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 22 Bottles of Beer on the wall." cr
+." Oh, 22 Bottles of Beer on the wall," cr
+." 22 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 21 Bottles of Beer on the wall." cr
+." Oh, 21 Bottles of Beer on the wall," cr
+." 21 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 20 Bottles of Beer on the wall." cr
+." Oh, 20 Bottles of Beer on the wall," cr
+." 20 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 19 Bottles of Beer on the wall." cr
+." Oh, 19 Bottles of Beer on the wall," cr
+." 19 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 18 Bottles of Beer on the wall." cr
+." Oh, 18 Bottles of Beer on the wall," cr
+." 18 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 17 Bottles of Beer on the wall." cr
+." Oh, 17 Bottles of Beer on the wall," cr
+." 17 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 16 Bottles of Beer on the wall." cr
+." Oh, 16 Bottles of Beer on the wall," cr
+." 16 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 15 Bottles of Beer on the wall." cr
+." Oh, 15 Bottles of Beer on the wall," cr
+." 15 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 14 Bottles of Beer on the wall." cr
+." Oh, 14 Bottles of Beer on the wall," cr
+." 14 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 13 Bottles of Beer on the wall." cr
+." Oh, 13 Bottles of Beer on the wall," cr
+." 13 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 12 Bottles of Beer on the wall." cr
+." Oh, 12 Bottles of Beer on the wall," cr
+." 12 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 11 Bottles of Beer on the wall." cr
+." Oh, 11 Bottles of Beer on the wall," cr
+." 11 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 10 Bottles of Beer on the wall." cr
+." Oh, 10 Bottles of Beer on the wall," cr
+." 10 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 9 Bottles of Beer on the wall." cr
+." Oh, 9 Bottles of Beer on the wall," cr
+." 9 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 8 Bottles of Beer on the wall." cr
+." Oh, 8 Bottles of Beer on the wall," cr
+." 8 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 7 Bottles of Beer on the wall." cr
+." Oh, 7 Bottles of Beer on the wall," cr
+." 7 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 6 Bottles of Beer on the wall." cr
+." Oh, 6 Bottles of Beer on the wall," cr
+." 6 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 5 Bottles of Beer on the wall." cr
+." Oh, 5 Bottles of Beer on the wall," cr
+." 5 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 4 Bottles of Beer on the wall." cr
+." Oh, 4 Bottles of Beer on the wall," cr
+." 4 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 3 Bottles of Beer on the wall." cr
+." Oh, 3 Bottles of Beer on the wall," cr
+." 3 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 2 Bottles of Beer on the wall." cr
+." Oh, 2 Bottles of Beer on the wall," cr
+." 2 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 1 Bottle of Beer on the wall." cr
+." Oh, 1 Bottle of Beer on the wall," cr
+." 1 Bottle of Beer!," cr
+." Take it down and pass it around..." cr
+." How dry I am! How dry I am!" cr
+." No body knows how dry I am." cr
+." How ... Dry I ... Aaaammm." cr
Added: fcode-utils/testsuite/TokeErrs/TooLargeBranch_N233_body.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeBranch_N233_body.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooLargeBranch_N233_body.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,935 @@
+[message] Starting out with 233 Bottles of Beer on the wall
+." Oh, 233 Bottles of Beer on the wall," cr
+." 233 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 232 Bottles of Beer on the wall." cr
+." Oh, 232 Bottles of Beer on the wall," cr
+." 232 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 231 Bottles of Beer on the wall." cr
+." Oh, 231 Bottles of Beer on the wall," cr
+." 231 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 230 Bottles of Beer on the wall." cr
+." Oh, 230 Bottles of Beer on the wall," cr
+." 230 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 229 Bottles of Beer on the wall." cr
+." Oh, 229 Bottles of Beer on the wall," cr
+." 229 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 228 Bottles of Beer on the wall." cr
+." Oh, 228 Bottles of Beer on the wall," cr
+." 228 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 227 Bottles of Beer on the wall." cr
+." Oh, 227 Bottles of Beer on the wall," cr
+." 227 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 226 Bottles of Beer on the wall." cr
+." Oh, 226 Bottles of Beer on the wall," cr
+." 226 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 225 Bottles of Beer on the wall." cr
+." Oh, 225 Bottles of Beer on the wall," cr
+." 225 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 224 Bottles of Beer on the wall." cr
+." Oh, 224 Bottles of Beer on the wall," cr
+." 224 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 223 Bottles of Beer on the wall." cr
+." Oh, 223 Bottles of Beer on the wall," cr
+." 223 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 222 Bottles of Beer on the wall." cr
+." Oh, 222 Bottles of Beer on the wall," cr
+." 222 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 221 Bottles of Beer on the wall." cr
+." Oh, 221 Bottles of Beer on the wall," cr
+." 221 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 220 Bottles of Beer on the wall." cr
+." Oh, 220 Bottles of Beer on the wall," cr
+." 220 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 219 Bottles of Beer on the wall." cr
+." Oh, 219 Bottles of Beer on the wall," cr
+." 219 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 218 Bottles of Beer on the wall." cr
+." Oh, 218 Bottles of Beer on the wall," cr
+." 218 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 217 Bottles of Beer on the wall." cr
+." Oh, 217 Bottles of Beer on the wall," cr
+." 217 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 216 Bottles of Beer on the wall." cr
+." Oh, 216 Bottles of Beer on the wall," cr
+." 216 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 215 Bottles of Beer on the wall." cr
+." Oh, 215 Bottles of Beer on the wall," cr
+." 215 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 214 Bottles of Beer on the wall." cr
+." Oh, 214 Bottles of Beer on the wall," cr
+." 214 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 213 Bottles of Beer on the wall." cr
+." Oh, 213 Bottles of Beer on the wall," cr
+." 213 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 212 Bottles of Beer on the wall." cr
+." Oh, 212 Bottles of Beer on the wall," cr
+." 212 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 211 Bottles of Beer on the wall." cr
+." Oh, 211 Bottles of Beer on the wall," cr
+." 211 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 210 Bottles of Beer on the wall." cr
+." Oh, 210 Bottles of Beer on the wall," cr
+." 210 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 209 Bottles of Beer on the wall." cr
+." Oh, 209 Bottles of Beer on the wall," cr
+." 209 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 208 Bottles of Beer on the wall." cr
+." Oh, 208 Bottles of Beer on the wall," cr
+." 208 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 207 Bottles of Beer on the wall." cr
+." Oh, 207 Bottles of Beer on the wall," cr
+." 207 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 206 Bottles of Beer on the wall." cr
+." Oh, 206 Bottles of Beer on the wall," cr
+." 206 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 205 Bottles of Beer on the wall." cr
+." Oh, 205 Bottles of Beer on the wall," cr
+." 205 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 204 Bottles of Beer on the wall." cr
+." Oh, 204 Bottles of Beer on the wall," cr
+." 204 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 203 Bottles of Beer on the wall." cr
+." Oh, 203 Bottles of Beer on the wall," cr
+." 203 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 202 Bottles of Beer on the wall." cr
+." Oh, 202 Bottles of Beer on the wall," cr
+." 202 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 201 Bottles of Beer on the wall." cr
+." Oh, 201 Bottles of Beer on the wall," cr
+." 201 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 200 Bottles of Beer on the wall." cr
+." Oh, 200 Bottles of Beer on the wall," cr
+." 200 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 199 Bottles of Beer on the wall." cr
+." Oh, 199 Bottles of Beer on the wall," cr
+." 199 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 198 Bottles of Beer on the wall." cr
+." Oh, 198 Bottles of Beer on the wall," cr
+." 198 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 197 Bottles of Beer on the wall." cr
+." Oh, 197 Bottles of Beer on the wall," cr
+." 197 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 196 Bottles of Beer on the wall." cr
+." Oh, 196 Bottles of Beer on the wall," cr
+." 196 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 195 Bottles of Beer on the wall." cr
+." Oh, 195 Bottles of Beer on the wall," cr
+." 195 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 194 Bottles of Beer on the wall." cr
+." Oh, 194 Bottles of Beer on the wall," cr
+." 194 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 193 Bottles of Beer on the wall." cr
+." Oh, 193 Bottles of Beer on the wall," cr
+." 193 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 192 Bottles of Beer on the wall." cr
+." Oh, 192 Bottles of Beer on the wall," cr
+." 192 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 191 Bottles of Beer on the wall." cr
+." Oh, 191 Bottles of Beer on the wall," cr
+." 191 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 190 Bottles of Beer on the wall." cr
+." Oh, 190 Bottles of Beer on the wall," cr
+." 190 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 189 Bottles of Beer on the wall." cr
+." Oh, 189 Bottles of Beer on the wall," cr
+." 189 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 188 Bottles of Beer on the wall." cr
+." Oh, 188 Bottles of Beer on the wall," cr
+." 188 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 187 Bottles of Beer on the wall." cr
+." Oh, 187 Bottles of Beer on the wall," cr
+." 187 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 186 Bottles of Beer on the wall." cr
+." Oh, 186 Bottles of Beer on the wall," cr
+." 186 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 185 Bottles of Beer on the wall." cr
+." Oh, 185 Bottles of Beer on the wall," cr
+." 185 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 184 Bottles of Beer on the wall." cr
+." Oh, 184 Bottles of Beer on the wall," cr
+." 184 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 183 Bottles of Beer on the wall." cr
+." Oh, 183 Bottles of Beer on the wall," cr
+." 183 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 182 Bottles of Beer on the wall." cr
+." Oh, 182 Bottles of Beer on the wall," cr
+." 182 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 181 Bottles of Beer on the wall." cr
+." Oh, 181 Bottles of Beer on the wall," cr
+." 181 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 180 Bottles of Beer on the wall." cr
+." Oh, 180 Bottles of Beer on the wall," cr
+." 180 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 179 Bottles of Beer on the wall." cr
+." Oh, 179 Bottles of Beer on the wall," cr
+." 179 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 178 Bottles of Beer on the wall." cr
+." Oh, 178 Bottles of Beer on the wall," cr
+." 178 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 177 Bottles of Beer on the wall." cr
+." Oh, 177 Bottles of Beer on the wall," cr
+." 177 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 176 Bottles of Beer on the wall." cr
+." Oh, 176 Bottles of Beer on the wall," cr
+." 176 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 175 Bottles of Beer on the wall." cr
+." Oh, 175 Bottles of Beer on the wall," cr
+." 175 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 174 Bottles of Beer on the wall." cr
+." Oh, 174 Bottles of Beer on the wall," cr
+." 174 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 173 Bottles of Beer on the wall." cr
+." Oh, 173 Bottles of Beer on the wall," cr
+." 173 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 172 Bottles of Beer on the wall." cr
+." Oh, 172 Bottles of Beer on the wall," cr
+." 172 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 171 Bottles of Beer on the wall." cr
+." Oh, 171 Bottles of Beer on the wall," cr
+." 171 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 170 Bottles of Beer on the wall." cr
+." Oh, 170 Bottles of Beer on the wall," cr
+." 170 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 169 Bottles of Beer on the wall." cr
+." Oh, 169 Bottles of Beer on the wall," cr
+." 169 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 168 Bottles of Beer on the wall." cr
+." Oh, 168 Bottles of Beer on the wall," cr
+." 168 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 167 Bottles of Beer on the wall." cr
+." Oh, 167 Bottles of Beer on the wall," cr
+." 167 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 166 Bottles of Beer on the wall." cr
+." Oh, 166 Bottles of Beer on the wall," cr
+." 166 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 165 Bottles of Beer on the wall." cr
+." Oh, 165 Bottles of Beer on the wall," cr
+." 165 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 164 Bottles of Beer on the wall." cr
+." Oh, 164 Bottles of Beer on the wall," cr
+." 164 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 163 Bottles of Beer on the wall." cr
+." Oh, 163 Bottles of Beer on the wall," cr
+." 163 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 162 Bottles of Beer on the wall." cr
+." Oh, 162 Bottles of Beer on the wall," cr
+." 162 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 161 Bottles of Beer on the wall." cr
+." Oh, 161 Bottles of Beer on the wall," cr
+." 161 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 160 Bottles of Beer on the wall." cr
+." Oh, 160 Bottles of Beer on the wall," cr
+." 160 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 159 Bottles of Beer on the wall." cr
+." Oh, 159 Bottles of Beer on the wall," cr
+." 159 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 158 Bottles of Beer on the wall." cr
+." Oh, 158 Bottles of Beer on the wall," cr
+." 158 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 157 Bottles of Beer on the wall." cr
+." Oh, 157 Bottles of Beer on the wall," cr
+." 157 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 156 Bottles of Beer on the wall." cr
+." Oh, 156 Bottles of Beer on the wall," cr
+." 156 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 155 Bottles of Beer on the wall." cr
+." Oh, 155 Bottles of Beer on the wall," cr
+." 155 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 154 Bottles of Beer on the wall." cr
+." Oh, 154 Bottles of Beer on the wall," cr
+." 154 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 153 Bottles of Beer on the wall." cr
+." Oh, 153 Bottles of Beer on the wall," cr
+." 153 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 152 Bottles of Beer on the wall." cr
+." Oh, 152 Bottles of Beer on the wall," cr
+." 152 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 151 Bottles of Beer on the wall." cr
+." Oh, 151 Bottles of Beer on the wall," cr
+." 151 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 150 Bottles of Beer on the wall." cr
+." Oh, 150 Bottles of Beer on the wall," cr
+." 150 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 149 Bottles of Beer on the wall." cr
+." Oh, 149 Bottles of Beer on the wall," cr
+." 149 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 148 Bottles of Beer on the wall." cr
+." Oh, 148 Bottles of Beer on the wall," cr
+." 148 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 147 Bottles of Beer on the wall." cr
+." Oh, 147 Bottles of Beer on the wall," cr
+." 147 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 146 Bottles of Beer on the wall." cr
+." Oh, 146 Bottles of Beer on the wall," cr
+." 146 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 145 Bottles of Beer on the wall." cr
+." Oh, 145 Bottles of Beer on the wall," cr
+." 145 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 144 Bottles of Beer on the wall." cr
+." Oh, 144 Bottles of Beer on the wall," cr
+." 144 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 143 Bottles of Beer on the wall." cr
+." Oh, 143 Bottles of Beer on the wall," cr
+." 143 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 142 Bottles of Beer on the wall." cr
+." Oh, 142 Bottles of Beer on the wall," cr
+." 142 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 141 Bottles of Beer on the wall." cr
+." Oh, 141 Bottles of Beer on the wall," cr
+." 141 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 140 Bottles of Beer on the wall." cr
+." Oh, 140 Bottles of Beer on the wall," cr
+." 140 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 139 Bottles of Beer on the wall." cr
+." Oh, 139 Bottles of Beer on the wall," cr
+." 139 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 138 Bottles of Beer on the wall." cr
+." Oh, 138 Bottles of Beer on the wall," cr
+." 138 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 137 Bottles of Beer on the wall." cr
+." Oh, 137 Bottles of Beer on the wall," cr
+." 137 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 136 Bottles of Beer on the wall." cr
+." Oh, 136 Bottles of Beer on the wall," cr
+." 136 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 135 Bottles of Beer on the wall." cr
+." Oh, 135 Bottles of Beer on the wall," cr
+." 135 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 134 Bottles of Beer on the wall." cr
+." Oh, 134 Bottles of Beer on the wall," cr
+." 134 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 133 Bottles of Beer on the wall." cr
+." Oh, 133 Bottles of Beer on the wall," cr
+." 133 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 132 Bottles of Beer on the wall." cr
+." Oh, 132 Bottles of Beer on the wall," cr
+." 132 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 131 Bottles of Beer on the wall." cr
+." Oh, 131 Bottles of Beer on the wall," cr
+." 131 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 130 Bottles of Beer on the wall." cr
+." Oh, 130 Bottles of Beer on the wall," cr
+." 130 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 129 Bottles of Beer on the wall." cr
+." Oh, 129 Bottles of Beer on the wall," cr
+." 129 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 128 Bottles of Beer on the wall." cr
+." Oh, 128 Bottles of Beer on the wall," cr
+." 128 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 127 Bottles of Beer on the wall." cr
+." Oh, 127 Bottles of Beer on the wall," cr
+." 127 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 126 Bottles of Beer on the wall." cr
+." Oh, 126 Bottles of Beer on the wall," cr
+." 126 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 125 Bottles of Beer on the wall." cr
+." Oh, 125 Bottles of Beer on the wall," cr
+." 125 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 124 Bottles of Beer on the wall." cr
+." Oh, 124 Bottles of Beer on the wall," cr
+." 124 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 123 Bottles of Beer on the wall." cr
+." Oh, 123 Bottles of Beer on the wall," cr
+." 123 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 122 Bottles of Beer on the wall." cr
+." Oh, 122 Bottles of Beer on the wall," cr
+." 122 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 121 Bottles of Beer on the wall." cr
+." Oh, 121 Bottles of Beer on the wall," cr
+." 121 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 120 Bottles of Beer on the wall." cr
+." Oh, 120 Bottles of Beer on the wall," cr
+." 120 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 119 Bottles of Beer on the wall." cr
+." Oh, 119 Bottles of Beer on the wall," cr
+." 119 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 118 Bottles of Beer on the wall." cr
+." Oh, 118 Bottles of Beer on the wall," cr
+." 118 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 117 Bottles of Beer on the wall." cr
+." Oh, 117 Bottles of Beer on the wall," cr
+." 117 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 116 Bottles of Beer on the wall." cr
+." Oh, 116 Bottles of Beer on the wall," cr
+." 116 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 115 Bottles of Beer on the wall." cr
+." Oh, 115 Bottles of Beer on the wall," cr
+." 115 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 114 Bottles of Beer on the wall." cr
+." Oh, 114 Bottles of Beer on the wall," cr
+." 114 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 113 Bottles of Beer on the wall." cr
+." Oh, 113 Bottles of Beer on the wall," cr
+." 113 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 112 Bottles of Beer on the wall." cr
+." Oh, 112 Bottles of Beer on the wall," cr
+." 112 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 111 Bottles of Beer on the wall." cr
+." Oh, 111 Bottles of Beer on the wall," cr
+." 111 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 110 Bottles of Beer on the wall." cr
+." Oh, 110 Bottles of Beer on the wall," cr
+." 110 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 109 Bottles of Beer on the wall." cr
+." Oh, 109 Bottles of Beer on the wall," cr
+." 109 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 108 Bottles of Beer on the wall." cr
+." Oh, 108 Bottles of Beer on the wall," cr
+." 108 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 107 Bottles of Beer on the wall." cr
+." Oh, 107 Bottles of Beer on the wall," cr
+." 107 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 106 Bottles of Beer on the wall." cr
+." Oh, 106 Bottles of Beer on the wall," cr
+." 106 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 105 Bottles of Beer on the wall." cr
+." Oh, 105 Bottles of Beer on the wall," cr
+." 105 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 104 Bottles of Beer on the wall." cr
+." Oh, 104 Bottles of Beer on the wall," cr
+." 104 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 103 Bottles of Beer on the wall." cr
+." Oh, 103 Bottles of Beer on the wall," cr
+." 103 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 102 Bottles of Beer on the wall." cr
+." Oh, 102 Bottles of Beer on the wall," cr
+." 102 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 101 Bottles of Beer on the wall." cr
+." Oh, 101 Bottles of Beer on the wall," cr
+." 101 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 100 Bottles of Beer on the wall." cr
+." Oh, 100 Bottles of Beer on the wall," cr
+." 100 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 99 Bottles of Beer on the wall." cr
+." Oh, 99 Bottles of Beer on the wall," cr
+." 99 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 98 Bottles of Beer on the wall." cr
+." Oh, 98 Bottles of Beer on the wall," cr
+." 98 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 97 Bottles of Beer on the wall." cr
+." Oh, 97 Bottles of Beer on the wall," cr
+." 97 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 96 Bottles of Beer on the wall." cr
+." Oh, 96 Bottles of Beer on the wall," cr
+." 96 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 95 Bottles of Beer on the wall." cr
+." Oh, 95 Bottles of Beer on the wall," cr
+." 95 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 94 Bottles of Beer on the wall." cr
+." Oh, 94 Bottles of Beer on the wall," cr
+." 94 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 93 Bottles of Beer on the wall." cr
+." Oh, 93 Bottles of Beer on the wall," cr
+." 93 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 92 Bottles of Beer on the wall." cr
+." Oh, 92 Bottles of Beer on the wall," cr
+." 92 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 91 Bottles of Beer on the wall." cr
+." Oh, 91 Bottles of Beer on the wall," cr
+." 91 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 90 Bottles of Beer on the wall." cr
+." Oh, 90 Bottles of Beer on the wall," cr
+." 90 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 89 Bottles of Beer on the wall." cr
+." Oh, 89 Bottles of Beer on the wall," cr
+." 89 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 88 Bottles of Beer on the wall." cr
+." Oh, 88 Bottles of Beer on the wall," cr
+." 88 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 87 Bottles of Beer on the wall." cr
+." Oh, 87 Bottles of Beer on the wall," cr
+." 87 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 86 Bottles of Beer on the wall." cr
+." Oh, 86 Bottles of Beer on the wall," cr
+." 86 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 85 Bottles of Beer on the wall." cr
+." Oh, 85 Bottles of Beer on the wall," cr
+." 85 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 84 Bottles of Beer on the wall." cr
+." Oh, 84 Bottles of Beer on the wall," cr
+." 84 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 83 Bottles of Beer on the wall." cr
+." Oh, 83 Bottles of Beer on the wall," cr
+." 83 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 82 Bottles of Beer on the wall." cr
+." Oh, 82 Bottles of Beer on the wall," cr
+." 82 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 81 Bottles of Beer on the wall." cr
+." Oh, 81 Bottles of Beer on the wall," cr
+." 81 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 80 Bottles of Beer on the wall." cr
+." Oh, 80 Bottles of Beer on the wall," cr
+." 80 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 79 Bottles of Beer on the wall." cr
+." Oh, 79 Bottles of Beer on the wall," cr
+." 79 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 78 Bottles of Beer on the wall." cr
+." Oh, 78 Bottles of Beer on the wall," cr
+." 78 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 77 Bottles of Beer on the wall." cr
+." Oh, 77 Bottles of Beer on the wall," cr
+." 77 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 76 Bottles of Beer on the wall." cr
+." Oh, 76 Bottles of Beer on the wall," cr
+." 76 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 75 Bottles of Beer on the wall." cr
+." Oh, 75 Bottles of Beer on the wall," cr
+." 75 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 74 Bottles of Beer on the wall." cr
+." Oh, 74 Bottles of Beer on the wall," cr
+." 74 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 73 Bottles of Beer on the wall." cr
+." Oh, 73 Bottles of Beer on the wall," cr
+." 73 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 72 Bottles of Beer on the wall." cr
+." Oh, 72 Bottles of Beer on the wall," cr
+." 72 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 71 Bottles of Beer on the wall." cr
+." Oh, 71 Bottles of Beer on the wall," cr
+." 71 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 70 Bottles of Beer on the wall." cr
+." Oh, 70 Bottles of Beer on the wall," cr
+." 70 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 69 Bottles of Beer on the wall." cr
+." Oh, 69 Bottles of Beer on the wall," cr
+." 69 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 68 Bottles of Beer on the wall." cr
+." Oh, 68 Bottles of Beer on the wall," cr
+." 68 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 67 Bottles of Beer on the wall." cr
+." Oh, 67 Bottles of Beer on the wall," cr
+." 67 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 66 Bottles of Beer on the wall." cr
+." Oh, 66 Bottles of Beer on the wall," cr
+." 66 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 65 Bottles of Beer on the wall." cr
+." Oh, 65 Bottles of Beer on the wall," cr
+." 65 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 64 Bottles of Beer on the wall." cr
+." Oh, 64 Bottles of Beer on the wall," cr
+." 64 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 63 Bottles of Beer on the wall." cr
+." Oh, 63 Bottles of Beer on the wall," cr
+." 63 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 62 Bottles of Beer on the wall." cr
+." Oh, 62 Bottles of Beer on the wall," cr
+." 62 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 61 Bottles of Beer on the wall." cr
+." Oh, 61 Bottles of Beer on the wall," cr
+." 61 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 60 Bottles of Beer on the wall." cr
+." Oh, 60 Bottles of Beer on the wall," cr
+." 60 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 59 Bottles of Beer on the wall." cr
+." Oh, 59 Bottles of Beer on the wall," cr
+." 59 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 58 Bottles of Beer on the wall." cr
+." Oh, 58 Bottles of Beer on the wall," cr
+." 58 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 57 Bottles of Beer on the wall." cr
+." Oh, 57 Bottles of Beer on the wall," cr
+." 57 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 56 Bottles of Beer on the wall." cr
+." Oh, 56 Bottles of Beer on the wall," cr
+." 56 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 55 Bottles of Beer on the wall." cr
+." Oh, 55 Bottles of Beer on the wall," cr
+." 55 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 54 Bottles of Beer on the wall." cr
+." Oh, 54 Bottles of Beer on the wall," cr
+." 54 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 53 Bottles of Beer on the wall." cr
+." Oh, 53 Bottles of Beer on the wall," cr
+." 53 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 52 Bottles of Beer on the wall." cr
+." Oh, 52 Bottles of Beer on the wall," cr
+." 52 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 51 Bottles of Beer on the wall." cr
+." Oh, 51 Bottles of Beer on the wall," cr
+." 51 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 50 Bottles of Beer on the wall." cr
+." Oh, 50 Bottles of Beer on the wall," cr
+." 50 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 49 Bottles of Beer on the wall." cr
+." Oh, 49 Bottles of Beer on the wall," cr
+." 49 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 48 Bottles of Beer on the wall." cr
+." Oh, 48 Bottles of Beer on the wall," cr
+." 48 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 47 Bottles of Beer on the wall." cr
+." Oh, 47 Bottles of Beer on the wall," cr
+." 47 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 46 Bottles of Beer on the wall." cr
+." Oh, 46 Bottles of Beer on the wall," cr
+." 46 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 45 Bottles of Beer on the wall." cr
+." Oh, 45 Bottles of Beer on the wall," cr
+." 45 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 44 Bottles of Beer on the wall." cr
+." Oh, 44 Bottles of Beer on the wall," cr
+." 44 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 43 Bottles of Beer on the wall." cr
+." Oh, 43 Bottles of Beer on the wall," cr
+." 43 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 42 Bottles of Beer on the wall." cr
+." Oh, 42 Bottles of Beer on the wall," cr
+." 42 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 41 Bottles of Beer on the wall." cr
+." Oh, 41 Bottles of Beer on the wall," cr
+." 41 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 40 Bottles of Beer on the wall." cr
+." Oh, 40 Bottles of Beer on the wall," cr
+." 40 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 39 Bottles of Beer on the wall." cr
+." Oh, 39 Bottles of Beer on the wall," cr
+." 39 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 38 Bottles of Beer on the wall." cr
+." Oh, 38 Bottles of Beer on the wall," cr
+." 38 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 37 Bottles of Beer on the wall." cr
+." Oh, 37 Bottles of Beer on the wall," cr
+." 37 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 36 Bottles of Beer on the wall." cr
+." Oh, 36 Bottles of Beer on the wall," cr
+." 36 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 35 Bottles of Beer on the wall." cr
+." Oh, 35 Bottles of Beer on the wall," cr
+." 35 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 34 Bottles of Beer on the wall." cr
+." Oh, 34 Bottles of Beer on the wall," cr
+." 34 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 33 Bottles of Beer on the wall." cr
+." Oh, 33 Bottles of Beer on the wall," cr
+." 33 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 32 Bottles of Beer on the wall." cr
+." Oh, 32 Bottles of Beer on the wall," cr
+." 32 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 31 Bottles of Beer on the wall." cr
+." Oh, 31 Bottles of Beer on the wall," cr
+." 31 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 30 Bottles of Beer on the wall." cr
+." Oh, 30 Bottles of Beer on the wall," cr
+." 30 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 29 Bottles of Beer on the wall." cr
+." Oh, 29 Bottles of Beer on the wall," cr
+." 29 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 28 Bottles of Beer on the wall." cr
+." Oh, 28 Bottles of Beer on the wall," cr
+." 28 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 27 Bottles of Beer on the wall." cr
+." Oh, 27 Bottles of Beer on the wall," cr
+." 27 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 26 Bottles of Beer on the wall." cr
+." Oh, 26 Bottles of Beer on the wall," cr
+." 26 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 25 Bottles of Beer on the wall." cr
+." Oh, 25 Bottles of Beer on the wall," cr
+." 25 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 24 Bottles of Beer on the wall." cr
+." Oh, 24 Bottles of Beer on the wall," cr
+." 24 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 23 Bottles of Beer on the wall." cr
+." Oh, 23 Bottles of Beer on the wall," cr
+." 23 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 22 Bottles of Beer on the wall." cr
+." Oh, 22 Bottles of Beer on the wall," cr
+." 22 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 21 Bottles of Beer on the wall." cr
+." Oh, 21 Bottles of Beer on the wall," cr
+." 21 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 20 Bottles of Beer on the wall." cr
+." Oh, 20 Bottles of Beer on the wall," cr
+." 20 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 19 Bottles of Beer on the wall." cr
+." Oh, 19 Bottles of Beer on the wall," cr
+." 19 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 18 Bottles of Beer on the wall." cr
+." Oh, 18 Bottles of Beer on the wall," cr
+." 18 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 17 Bottles of Beer on the wall." cr
+." Oh, 17 Bottles of Beer on the wall," cr
+." 17 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 16 Bottles of Beer on the wall." cr
+." Oh, 16 Bottles of Beer on the wall," cr
+." 16 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 15 Bottles of Beer on the wall." cr
+." Oh, 15 Bottles of Beer on the wall," cr
+." 15 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 14 Bottles of Beer on the wall." cr
+." Oh, 14 Bottles of Beer on the wall," cr
+." 14 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 13 Bottles of Beer on the wall." cr
+." Oh, 13 Bottles of Beer on the wall," cr
+." 13 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 12 Bottles of Beer on the wall." cr
+." Oh, 12 Bottles of Beer on the wall," cr
+." 12 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 11 Bottles of Beer on the wall." cr
+." Oh, 11 Bottles of Beer on the wall," cr
+." 11 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 10 Bottles of Beer on the wall." cr
+." Oh, 10 Bottles of Beer on the wall," cr
+." 10 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 9 Bottles of Beer on the wall." cr
+." Oh, 9 Bottles of Beer on the wall," cr
+." 9 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 8 Bottles of Beer on the wall." cr
+." Oh, 8 Bottles of Beer on the wall," cr
+." 8 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 7 Bottles of Beer on the wall." cr
+." Oh, 7 Bottles of Beer on the wall," cr
+." 7 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 6 Bottles of Beer on the wall." cr
+." Oh, 6 Bottles of Beer on the wall," cr
+." 6 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 5 Bottles of Beer on the wall." cr
+." Oh, 5 Bottles of Beer on the wall," cr
+." 5 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 4 Bottles of Beer on the wall." cr
+." Oh, 4 Bottles of Beer on the wall," cr
+." 4 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 3 Bottles of Beer on the wall." cr
+." Oh, 3 Bottles of Beer on the wall," cr
+." 3 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 2 Bottles of Beer on the wall." cr
+." Oh, 2 Bottles of Beer on the wall," cr
+." 2 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 1 Bottle of Beer on the wall." cr
+." Oh, 1 Bottle of Beer on the wall," cr
+." 1 Bottle of Beer!," cr
+." Take it down and pass it around..." cr
+." How dry I am! How dry I am!" cr
+." No body knows how dry I am." cr
+." How ... Dry I ... Aaaammm." cr
Added: fcode-utils/testsuite/TokeErrs/TooLargeBranch_V178_body.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeBranch_V178_body.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooLargeBranch_V178_body.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,715 @@
+[message] Starting out with one hundred and seventy-eight Bottles of Beer on the wall
+." Oh, one hundred and seventy-eight Bottles of Beer on the wall," cr
+." one hundred and seventy-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-seven Bottles of Beer on the wall," cr
+." one hundred and seventy-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-six Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-six Bottles of Beer on the wall," cr
+." one hundred and seventy-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-five Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-five Bottles of Beer on the wall," cr
+." one hundred and seventy-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-four Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-four Bottles of Beer on the wall," cr
+." one hundred and seventy-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-three Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-three Bottles of Beer on the wall," cr
+." one hundred and seventy-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-two Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-two Bottles of Beer on the wall," cr
+." one hundred and seventy-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-one Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-one Bottles of Beer on the wall," cr
+." one hundred and seventy-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy Bottles of Beer on the wall," cr
+." one hundred and seventy Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-nine Bottles of Beer on the wall," cr
+." one hundred and sixty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-eight Bottles of Beer on the wall," cr
+." one hundred and sixty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-seven Bottles of Beer on the wall," cr
+." one hundred and sixty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-six Bottles of Beer on the wall," cr
+." one hundred and sixty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-five Bottles of Beer on the wall," cr
+." one hundred and sixty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-four Bottles of Beer on the wall," cr
+." one hundred and sixty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-three Bottles of Beer on the wall," cr
+." one hundred and sixty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-two Bottles of Beer on the wall," cr
+." one hundred and sixty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-one Bottles of Beer on the wall," cr
+." one hundred and sixty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty Bottles of Beer on the wall," cr
+." one hundred and sixty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-nine Bottles of Beer on the wall," cr
+." one hundred and fifty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-eight Bottles of Beer on the wall," cr
+." one hundred and fifty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-seven Bottles of Beer on the wall," cr
+." one hundred and fifty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-six Bottles of Beer on the wall," cr
+." one hundred and fifty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-five Bottles of Beer on the wall," cr
+." one hundred and fifty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-four Bottles of Beer on the wall," cr
+." one hundred and fifty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-three Bottles of Beer on the wall," cr
+." one hundred and fifty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-two Bottles of Beer on the wall," cr
+." one hundred and fifty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-one Bottles of Beer on the wall," cr
+." one hundred and fifty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty Bottles of Beer on the wall," cr
+." one hundred and fifty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-nine Bottles of Beer on the wall," cr
+." one hundred and forty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-eight Bottles of Beer on the wall," cr
+." one hundred and forty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-seven Bottles of Beer on the wall," cr
+." one hundred and forty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-six Bottles of Beer on the wall," cr
+." one hundred and forty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-five Bottles of Beer on the wall," cr
+." one hundred and forty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-four Bottles of Beer on the wall," cr
+." one hundred and forty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-three Bottles of Beer on the wall," cr
+." one hundred and forty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-two Bottles of Beer on the wall," cr
+." one hundred and forty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-one Bottles of Beer on the wall," cr
+." one hundred and forty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty Bottles of Beer on the wall." cr
+." Oh, one hundred and forty Bottles of Beer on the wall," cr
+." one hundred and forty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-nine Bottles of Beer on the wall," cr
+." one hundred and thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-eight Bottles of Beer on the wall," cr
+." one hundred and thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-seven Bottles of Beer on the wall," cr
+." one hundred and thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-six Bottles of Beer on the wall," cr
+." one hundred and thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-five Bottles of Beer on the wall," cr
+." one hundred and thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-four Bottles of Beer on the wall," cr
+." one hundred and thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-three Bottles of Beer on the wall," cr
+." one hundred and thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-two Bottles of Beer on the wall," cr
+." one hundred and thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-one Bottles of Beer on the wall," cr
+." one hundred and thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty Bottles of Beer on the wall," cr
+." one hundred and thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-nine Bottles of Beer on the wall," cr
+." one hundred and twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-eight Bottles of Beer on the wall," cr
+." one hundred and twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-seven Bottles of Beer on the wall," cr
+." one hundred and twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-six Bottles of Beer on the wall," cr
+." one hundred and twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-five Bottles of Beer on the wall," cr
+." one hundred and twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-four Bottles of Beer on the wall," cr
+." one hundred and twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-three Bottles of Beer on the wall," cr
+." one hundred and twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-two Bottles of Beer on the wall," cr
+." one hundred and twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-one Bottles of Beer on the wall," cr
+." one hundred and twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty Bottles of Beer on the wall," cr
+." one hundred and twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and nineteen Bottles of Beer on the wall." cr
+." Oh, one hundred and nineteen Bottles of Beer on the wall," cr
+." one hundred and nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighteen Bottles of Beer on the wall." cr
+." Oh, one hundred and eighteen Bottles of Beer on the wall," cr
+." one hundred and eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventeen Bottles of Beer on the wall." cr
+." Oh, one hundred and seventeen Bottles of Beer on the wall," cr
+." one hundred and seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixteen Bottles of Beer on the wall." cr
+." Oh, one hundred and sixteen Bottles of Beer on the wall," cr
+." one hundred and sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifteen Bottles of Beer on the wall." cr
+." Oh, one hundred and fifteen Bottles of Beer on the wall," cr
+." one hundred and fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fourteen Bottles of Beer on the wall." cr
+." Oh, one hundred and fourteen Bottles of Beer on the wall," cr
+." one hundred and fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirteen Bottles of Beer on the wall." cr
+." Oh, one hundred and thirteen Bottles of Beer on the wall," cr
+." one hundred and thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twelve Bottles of Beer on the wall." cr
+." Oh, one hundred and twelve Bottles of Beer on the wall," cr
+." one hundred and twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eleven Bottles of Beer on the wall." cr
+." Oh, one hundred and eleven Bottles of Beer on the wall," cr
+." one hundred and eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ten Bottles of Beer on the wall." cr
+." Oh, one hundred and ten Bottles of Beer on the wall," cr
+." one hundred and ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and nine Bottles of Beer on the wall." cr
+." Oh, one hundred and nine Bottles of Beer on the wall," cr
+." one hundred and nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eight Bottles of Beer on the wall." cr
+." Oh, one hundred and eight Bottles of Beer on the wall," cr
+." one hundred and eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seven Bottles of Beer on the wall." cr
+." Oh, one hundred and seven Bottles of Beer on the wall," cr
+." one hundred and seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and six Bottles of Beer on the wall." cr
+." Oh, one hundred and six Bottles of Beer on the wall," cr
+." one hundred and six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and five Bottles of Beer on the wall." cr
+." Oh, one hundred and five Bottles of Beer on the wall," cr
+." one hundred and five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and four Bottles of Beer on the wall." cr
+." Oh, one hundred and four Bottles of Beer on the wall," cr
+." one hundred and four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and three Bottles of Beer on the wall." cr
+." Oh, one hundred and three Bottles of Beer on the wall," cr
+." one hundred and three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and two Bottles of Beer on the wall." cr
+." Oh, one hundred and two Bottles of Beer on the wall," cr
+." one hundred and two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and one Bottles of Beer on the wall." cr
+." Oh, one hundred and one Bottles of Beer on the wall," cr
+." one hundred and one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred Bottles of Beer on the wall." cr
+." Oh, one hundred Bottles of Beer on the wall," cr
+." one hundred Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-nine Bottles of Beer on the wall." cr
+." Oh, ninety-nine Bottles of Beer on the wall," cr
+." ninety-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-eight Bottles of Beer on the wall." cr
+." Oh, ninety-eight Bottles of Beer on the wall," cr
+." ninety-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-seven Bottles of Beer on the wall." cr
+." Oh, ninety-seven Bottles of Beer on the wall," cr
+." ninety-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-six Bottles of Beer on the wall." cr
+." Oh, ninety-six Bottles of Beer on the wall," cr
+." ninety-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-five Bottles of Beer on the wall." cr
+." Oh, ninety-five Bottles of Beer on the wall," cr
+." ninety-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-four Bottles of Beer on the wall." cr
+." Oh, ninety-four Bottles of Beer on the wall," cr
+." ninety-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-three Bottles of Beer on the wall." cr
+." Oh, ninety-three Bottles of Beer on the wall," cr
+." ninety-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-two Bottles of Beer on the wall." cr
+." Oh, ninety-two Bottles of Beer on the wall," cr
+." ninety-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-one Bottles of Beer on the wall." cr
+." Oh, ninety-one Bottles of Beer on the wall," cr
+." ninety-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety Bottles of Beer on the wall." cr
+." Oh, ninety Bottles of Beer on the wall," cr
+." ninety Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-nine Bottles of Beer on the wall." cr
+." Oh, eighty-nine Bottles of Beer on the wall," cr
+." eighty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-eight Bottles of Beer on the wall." cr
+." Oh, eighty-eight Bottles of Beer on the wall," cr
+." eighty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-seven Bottles of Beer on the wall." cr
+." Oh, eighty-seven Bottles of Beer on the wall," cr
+." eighty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-six Bottles of Beer on the wall." cr
+." Oh, eighty-six Bottles of Beer on the wall," cr
+." eighty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-five Bottles of Beer on the wall." cr
+." Oh, eighty-five Bottles of Beer on the wall," cr
+." eighty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-four Bottles of Beer on the wall." cr
+." Oh, eighty-four Bottles of Beer on the wall," cr
+." eighty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-three Bottles of Beer on the wall." cr
+." Oh, eighty-three Bottles of Beer on the wall," cr
+." eighty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-two Bottles of Beer on the wall." cr
+." Oh, eighty-two Bottles of Beer on the wall," cr
+." eighty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-one Bottles of Beer on the wall." cr
+." Oh, eighty-one Bottles of Beer on the wall," cr
+." eighty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty Bottles of Beer on the wall." cr
+." Oh, eighty Bottles of Beer on the wall," cr
+." eighty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-nine Bottles of Beer on the wall." cr
+." Oh, seventy-nine Bottles of Beer on the wall," cr
+." seventy-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-eight Bottles of Beer on the wall." cr
+." Oh, seventy-eight Bottles of Beer on the wall," cr
+." seventy-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-seven Bottles of Beer on the wall." cr
+." Oh, seventy-seven Bottles of Beer on the wall," cr
+." seventy-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-six Bottles of Beer on the wall." cr
+." Oh, seventy-six Bottles of Beer on the wall," cr
+." seventy-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-five Bottles of Beer on the wall." cr
+." Oh, seventy-five Bottles of Beer on the wall," cr
+." seventy-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-four Bottles of Beer on the wall." cr
+." Oh, seventy-four Bottles of Beer on the wall," cr
+." seventy-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-three Bottles of Beer on the wall." cr
+." Oh, seventy-three Bottles of Beer on the wall," cr
+." seventy-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-two Bottles of Beer on the wall." cr
+." Oh, seventy-two Bottles of Beer on the wall," cr
+." seventy-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-one Bottles of Beer on the wall." cr
+." Oh, seventy-one Bottles of Beer on the wall," cr
+." seventy-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy Bottles of Beer on the wall." cr
+." Oh, seventy Bottles of Beer on the wall," cr
+." seventy Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-nine Bottles of Beer on the wall." cr
+." Oh, sixty-nine Bottles of Beer on the wall," cr
+." sixty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-eight Bottles of Beer on the wall." cr
+." Oh, sixty-eight Bottles of Beer on the wall," cr
+." sixty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-seven Bottles of Beer on the wall." cr
+." Oh, sixty-seven Bottles of Beer on the wall," cr
+." sixty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-six Bottles of Beer on the wall." cr
+." Oh, sixty-six Bottles of Beer on the wall," cr
+." sixty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-five Bottles of Beer on the wall." cr
+." Oh, sixty-five Bottles of Beer on the wall," cr
+." sixty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-four Bottles of Beer on the wall." cr
+." Oh, sixty-four Bottles of Beer on the wall," cr
+." sixty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-three Bottles of Beer on the wall." cr
+." Oh, sixty-three Bottles of Beer on the wall," cr
+." sixty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-two Bottles of Beer on the wall." cr
+." Oh, sixty-two Bottles of Beer on the wall," cr
+." sixty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-one Bottles of Beer on the wall." cr
+." Oh, sixty-one Bottles of Beer on the wall," cr
+." sixty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty Bottles of Beer on the wall." cr
+." Oh, sixty Bottles of Beer on the wall," cr
+." sixty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-nine Bottles of Beer on the wall." cr
+." Oh, fifty-nine Bottles of Beer on the wall," cr
+." fifty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-eight Bottles of Beer on the wall." cr
+." Oh, fifty-eight Bottles of Beer on the wall," cr
+." fifty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-seven Bottles of Beer on the wall." cr
+." Oh, fifty-seven Bottles of Beer on the wall," cr
+." fifty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-six Bottles of Beer on the wall." cr
+." Oh, fifty-six Bottles of Beer on the wall," cr
+." fifty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-five Bottles of Beer on the wall." cr
+." Oh, fifty-five Bottles of Beer on the wall," cr
+." fifty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-four Bottles of Beer on the wall." cr
+." Oh, fifty-four Bottles of Beer on the wall," cr
+." fifty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-three Bottles of Beer on the wall." cr
+." Oh, fifty-three Bottles of Beer on the wall," cr
+." fifty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-two Bottles of Beer on the wall." cr
+." Oh, fifty-two Bottles of Beer on the wall," cr
+." fifty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-one Bottles of Beer on the wall." cr
+." Oh, fifty-one Bottles of Beer on the wall," cr
+." fifty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty Bottles of Beer on the wall." cr
+." Oh, fifty Bottles of Beer on the wall," cr
+." fifty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-nine Bottles of Beer on the wall." cr
+." Oh, forty-nine Bottles of Beer on the wall," cr
+." forty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-eight Bottles of Beer on the wall." cr
+." Oh, forty-eight Bottles of Beer on the wall," cr
+." forty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-seven Bottles of Beer on the wall." cr
+." Oh, forty-seven Bottles of Beer on the wall," cr
+." forty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-six Bottles of Beer on the wall." cr
+." Oh, forty-six Bottles of Beer on the wall," cr
+." forty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-five Bottles of Beer on the wall." cr
+." Oh, forty-five Bottles of Beer on the wall," cr
+." forty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-four Bottles of Beer on the wall." cr
+." Oh, forty-four Bottles of Beer on the wall," cr
+." forty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-three Bottles of Beer on the wall." cr
+." Oh, forty-three Bottles of Beer on the wall," cr
+." forty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-two Bottles of Beer on the wall." cr
+." Oh, forty-two Bottles of Beer on the wall," cr
+." forty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-one Bottles of Beer on the wall." cr
+." Oh, forty-one Bottles of Beer on the wall," cr
+." forty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty Bottles of Beer on the wall." cr
+." Oh, forty Bottles of Beer on the wall," cr
+." forty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-nine Bottles of Beer on the wall." cr
+." Oh, thirty-nine Bottles of Beer on the wall," cr
+." thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-eight Bottles of Beer on the wall." cr
+." Oh, thirty-eight Bottles of Beer on the wall," cr
+." thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-seven Bottles of Beer on the wall." cr
+." Oh, thirty-seven Bottles of Beer on the wall," cr
+." thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-six Bottles of Beer on the wall." cr
+." Oh, thirty-six Bottles of Beer on the wall," cr
+." thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-five Bottles of Beer on the wall." cr
+." Oh, thirty-five Bottles of Beer on the wall," cr
+." thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-four Bottles of Beer on the wall." cr
+." Oh, thirty-four Bottles of Beer on the wall," cr
+." thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-three Bottles of Beer on the wall." cr
+." Oh, thirty-three Bottles of Beer on the wall," cr
+." thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-two Bottles of Beer on the wall." cr
+." Oh, thirty-two Bottles of Beer on the wall," cr
+." thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-one Bottles of Beer on the wall." cr
+." Oh, thirty-one Bottles of Beer on the wall," cr
+." thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty Bottles of Beer on the wall." cr
+." Oh, thirty Bottles of Beer on the wall," cr
+." thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-nine Bottles of Beer on the wall." cr
+." Oh, twenty-nine Bottles of Beer on the wall," cr
+." twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-eight Bottles of Beer on the wall." cr
+." Oh, twenty-eight Bottles of Beer on the wall," cr
+." twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-seven Bottles of Beer on the wall." cr
+." Oh, twenty-seven Bottles of Beer on the wall," cr
+." twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-six Bottles of Beer on the wall." cr
+." Oh, twenty-six Bottles of Beer on the wall," cr
+." twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-five Bottles of Beer on the wall." cr
+." Oh, twenty-five Bottles of Beer on the wall," cr
+." twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-four Bottles of Beer on the wall." cr
+." Oh, twenty-four Bottles of Beer on the wall," cr
+." twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-three Bottles of Beer on the wall." cr
+." Oh, twenty-three Bottles of Beer on the wall," cr
+." twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-two Bottles of Beer on the wall." cr
+." Oh, twenty-two Bottles of Beer on the wall," cr
+." twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-one Bottles of Beer on the wall." cr
+." Oh, twenty-one Bottles of Beer on the wall," cr
+." twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty Bottles of Beer on the wall." cr
+." Oh, twenty Bottles of Beer on the wall," cr
+." twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." nineteen Bottles of Beer on the wall." cr
+." Oh, nineteen Bottles of Beer on the wall," cr
+." nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighteen Bottles of Beer on the wall." cr
+." Oh, eighteen Bottles of Beer on the wall," cr
+." eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventeen Bottles of Beer on the wall." cr
+." Oh, seventeen Bottles of Beer on the wall," cr
+." seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixteen Bottles of Beer on the wall." cr
+." Oh, sixteen Bottles of Beer on the wall," cr
+." sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifteen Bottles of Beer on the wall." cr
+." Oh, fifteen Bottles of Beer on the wall," cr
+." fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fourteen Bottles of Beer on the wall." cr
+." Oh, fourteen Bottles of Beer on the wall," cr
+." fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirteen Bottles of Beer on the wall." cr
+." Oh, thirteen Bottles of Beer on the wall," cr
+." thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twelve Bottles of Beer on the wall." cr
+." Oh, twelve Bottles of Beer on the wall," cr
+." twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eleven Bottles of Beer on the wall." cr
+." Oh, eleven Bottles of Beer on the wall," cr
+." eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ten Bottles of Beer on the wall." cr
+." Oh, ten Bottles of Beer on the wall," cr
+." ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." nine Bottles of Beer on the wall." cr
+." Oh, nine Bottles of Beer on the wall," cr
+." nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eight Bottles of Beer on the wall." cr
+." Oh, eight Bottles of Beer on the wall," cr
+." eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seven Bottles of Beer on the wall." cr
+." Oh, seven Bottles of Beer on the wall," cr
+." seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six Bottles of Beer on the wall." cr
+." Oh, six Bottles of Beer on the wall," cr
+." six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five Bottles of Beer on the wall." cr
+." Oh, five Bottles of Beer on the wall," cr
+." five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four Bottles of Beer on the wall." cr
+." Oh, four Bottles of Beer on the wall," cr
+." four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three Bottles of Beer on the wall." cr
+." Oh, three Bottles of Beer on the wall," cr
+." three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two Bottles of Beer on the wall." cr
+." Oh, two Bottles of Beer on the wall," cr
+." two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one Bottle of Beer on the wall." cr
+." Oh, one Bottle of Beer on the wall," cr
+." one Bottle of Beer!," cr
+." Take it down and pass it around..." cr
+." How dry I am! How dry I am!" cr
+." No body knows how dry I am." cr
+." How ... Dry I ... Aaaammm." cr
Added: fcode-utils/testsuite/TokeErrs/TooLargeBranch_V179_body.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeBranch_V179_body.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooLargeBranch_V179_body.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,719 @@
+[message] Starting out with one hundred and seventy-nine Bottles of Beer on the wall
+." Oh, one hundred and seventy-nine Bottles of Beer on the wall," cr
+." one hundred and seventy-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-eight Bottles of Beer on the wall," cr
+." one hundred and seventy-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-seven Bottles of Beer on the wall," cr
+." one hundred and seventy-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-six Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-six Bottles of Beer on the wall," cr
+." one hundred and seventy-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-five Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-five Bottles of Beer on the wall," cr
+." one hundred and seventy-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-four Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-four Bottles of Beer on the wall," cr
+." one hundred and seventy-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-three Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-three Bottles of Beer on the wall," cr
+." one hundred and seventy-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-two Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-two Bottles of Beer on the wall," cr
+." one hundred and seventy-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-one Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-one Bottles of Beer on the wall," cr
+." one hundred and seventy-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy Bottles of Beer on the wall," cr
+." one hundred and seventy Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-nine Bottles of Beer on the wall," cr
+." one hundred and sixty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-eight Bottles of Beer on the wall," cr
+." one hundred and sixty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-seven Bottles of Beer on the wall," cr
+." one hundred and sixty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-six Bottles of Beer on the wall," cr
+." one hundred and sixty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-five Bottles of Beer on the wall," cr
+." one hundred and sixty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-four Bottles of Beer on the wall," cr
+." one hundred and sixty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-three Bottles of Beer on the wall," cr
+." one hundred and sixty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-two Bottles of Beer on the wall," cr
+." one hundred and sixty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-one Bottles of Beer on the wall," cr
+." one hundred and sixty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty Bottles of Beer on the wall," cr
+." one hundred and sixty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-nine Bottles of Beer on the wall," cr
+." one hundred and fifty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-eight Bottles of Beer on the wall," cr
+." one hundred and fifty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-seven Bottles of Beer on the wall," cr
+." one hundred and fifty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-six Bottles of Beer on the wall," cr
+." one hundred and fifty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-five Bottles of Beer on the wall," cr
+." one hundred and fifty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-four Bottles of Beer on the wall," cr
+." one hundred and fifty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-three Bottles of Beer on the wall," cr
+." one hundred and fifty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-two Bottles of Beer on the wall," cr
+." one hundred and fifty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-one Bottles of Beer on the wall," cr
+." one hundred and fifty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty Bottles of Beer on the wall," cr
+." one hundred and fifty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-nine Bottles of Beer on the wall," cr
+." one hundred and forty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-eight Bottles of Beer on the wall," cr
+." one hundred and forty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-seven Bottles of Beer on the wall," cr
+." one hundred and forty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-six Bottles of Beer on the wall," cr
+." one hundred and forty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-five Bottles of Beer on the wall," cr
+." one hundred and forty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-four Bottles of Beer on the wall," cr
+." one hundred and forty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-three Bottles of Beer on the wall," cr
+." one hundred and forty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-two Bottles of Beer on the wall," cr
+." one hundred and forty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-one Bottles of Beer on the wall," cr
+." one hundred and forty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty Bottles of Beer on the wall." cr
+." Oh, one hundred and forty Bottles of Beer on the wall," cr
+." one hundred and forty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-nine Bottles of Beer on the wall," cr
+." one hundred and thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-eight Bottles of Beer on the wall," cr
+." one hundred and thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-seven Bottles of Beer on the wall," cr
+." one hundred and thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-six Bottles of Beer on the wall," cr
+." one hundred and thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-five Bottles of Beer on the wall," cr
+." one hundred and thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-four Bottles of Beer on the wall," cr
+." one hundred and thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-three Bottles of Beer on the wall," cr
+." one hundred and thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-two Bottles of Beer on the wall," cr
+." one hundred and thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-one Bottles of Beer on the wall," cr
+." one hundred and thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty Bottles of Beer on the wall," cr
+." one hundred and thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-nine Bottles of Beer on the wall," cr
+." one hundred and twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-eight Bottles of Beer on the wall," cr
+." one hundred and twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-seven Bottles of Beer on the wall," cr
+." one hundred and twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-six Bottles of Beer on the wall," cr
+." one hundred and twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-five Bottles of Beer on the wall," cr
+." one hundred and twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-four Bottles of Beer on the wall," cr
+." one hundred and twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-three Bottles of Beer on the wall," cr
+." one hundred and twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-two Bottles of Beer on the wall," cr
+." one hundred and twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-one Bottles of Beer on the wall," cr
+." one hundred and twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty Bottles of Beer on the wall," cr
+." one hundred and twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and nineteen Bottles of Beer on the wall." cr
+." Oh, one hundred and nineteen Bottles of Beer on the wall," cr
+." one hundred and nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighteen Bottles of Beer on the wall." cr
+." Oh, one hundred and eighteen Bottles of Beer on the wall," cr
+." one hundred and eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventeen Bottles of Beer on the wall." cr
+." Oh, one hundred and seventeen Bottles of Beer on the wall," cr
+." one hundred and seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixteen Bottles of Beer on the wall." cr
+." Oh, one hundred and sixteen Bottles of Beer on the wall," cr
+." one hundred and sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifteen Bottles of Beer on the wall." cr
+." Oh, one hundred and fifteen Bottles of Beer on the wall," cr
+." one hundred and fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fourteen Bottles of Beer on the wall." cr
+." Oh, one hundred and fourteen Bottles of Beer on the wall," cr
+." one hundred and fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirteen Bottles of Beer on the wall." cr
+." Oh, one hundred and thirteen Bottles of Beer on the wall," cr
+." one hundred and thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twelve Bottles of Beer on the wall." cr
+." Oh, one hundred and twelve Bottles of Beer on the wall," cr
+." one hundred and twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eleven Bottles of Beer on the wall." cr
+." Oh, one hundred and eleven Bottles of Beer on the wall," cr
+." one hundred and eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ten Bottles of Beer on the wall." cr
+." Oh, one hundred and ten Bottles of Beer on the wall," cr
+." one hundred and ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and nine Bottles of Beer on the wall." cr
+." Oh, one hundred and nine Bottles of Beer on the wall," cr
+." one hundred and nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eight Bottles of Beer on the wall." cr
+." Oh, one hundred and eight Bottles of Beer on the wall," cr
+." one hundred and eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seven Bottles of Beer on the wall." cr
+." Oh, one hundred and seven Bottles of Beer on the wall," cr
+." one hundred and seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and six Bottles of Beer on the wall." cr
+." Oh, one hundred and six Bottles of Beer on the wall," cr
+." one hundred and six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and five Bottles of Beer on the wall." cr
+." Oh, one hundred and five Bottles of Beer on the wall," cr
+." one hundred and five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and four Bottles of Beer on the wall." cr
+." Oh, one hundred and four Bottles of Beer on the wall," cr
+." one hundred and four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and three Bottles of Beer on the wall." cr
+." Oh, one hundred and three Bottles of Beer on the wall," cr
+." one hundred and three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and two Bottles of Beer on the wall." cr
+." Oh, one hundred and two Bottles of Beer on the wall," cr
+." one hundred and two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and one Bottles of Beer on the wall." cr
+." Oh, one hundred and one Bottles of Beer on the wall," cr
+." one hundred and one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred Bottles of Beer on the wall." cr
+." Oh, one hundred Bottles of Beer on the wall," cr
+." one hundred Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-nine Bottles of Beer on the wall." cr
+." Oh, ninety-nine Bottles of Beer on the wall," cr
+." ninety-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-eight Bottles of Beer on the wall." cr
+." Oh, ninety-eight Bottles of Beer on the wall," cr
+." ninety-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-seven Bottles of Beer on the wall." cr
+." Oh, ninety-seven Bottles of Beer on the wall," cr
+." ninety-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-six Bottles of Beer on the wall." cr
+." Oh, ninety-six Bottles of Beer on the wall," cr
+." ninety-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-five Bottles of Beer on the wall." cr
+." Oh, ninety-five Bottles of Beer on the wall," cr
+." ninety-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-four Bottles of Beer on the wall." cr
+." Oh, ninety-four Bottles of Beer on the wall," cr
+." ninety-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-three Bottles of Beer on the wall." cr
+." Oh, ninety-three Bottles of Beer on the wall," cr
+." ninety-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-two Bottles of Beer on the wall." cr
+." Oh, ninety-two Bottles of Beer on the wall," cr
+." ninety-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-one Bottles of Beer on the wall." cr
+." Oh, ninety-one Bottles of Beer on the wall," cr
+." ninety-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety Bottles of Beer on the wall." cr
+." Oh, ninety Bottles of Beer on the wall," cr
+." ninety Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-nine Bottles of Beer on the wall." cr
+." Oh, eighty-nine Bottles of Beer on the wall," cr
+." eighty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-eight Bottles of Beer on the wall." cr
+." Oh, eighty-eight Bottles of Beer on the wall," cr
+." eighty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-seven Bottles of Beer on the wall." cr
+." Oh, eighty-seven Bottles of Beer on the wall," cr
+." eighty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-six Bottles of Beer on the wall." cr
+." Oh, eighty-six Bottles of Beer on the wall," cr
+." eighty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-five Bottles of Beer on the wall." cr
+." Oh, eighty-five Bottles of Beer on the wall," cr
+." eighty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-four Bottles of Beer on the wall." cr
+." Oh, eighty-four Bottles of Beer on the wall," cr
+." eighty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-three Bottles of Beer on the wall." cr
+." Oh, eighty-three Bottles of Beer on the wall," cr
+." eighty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-two Bottles of Beer on the wall." cr
+." Oh, eighty-two Bottles of Beer on the wall," cr
+." eighty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-one Bottles of Beer on the wall." cr
+." Oh, eighty-one Bottles of Beer on the wall," cr
+." eighty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty Bottles of Beer on the wall." cr
+." Oh, eighty Bottles of Beer on the wall," cr
+." eighty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-nine Bottles of Beer on the wall." cr
+." Oh, seventy-nine Bottles of Beer on the wall," cr
+." seventy-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-eight Bottles of Beer on the wall." cr
+." Oh, seventy-eight Bottles of Beer on the wall," cr
+." seventy-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-seven Bottles of Beer on the wall." cr
+." Oh, seventy-seven Bottles of Beer on the wall," cr
+." seventy-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-six Bottles of Beer on the wall." cr
+." Oh, seventy-six Bottles of Beer on the wall," cr
+." seventy-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-five Bottles of Beer on the wall." cr
+." Oh, seventy-five Bottles of Beer on the wall," cr
+." seventy-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-four Bottles of Beer on the wall." cr
+." Oh, seventy-four Bottles of Beer on the wall," cr
+." seventy-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-three Bottles of Beer on the wall." cr
+." Oh, seventy-three Bottles of Beer on the wall," cr
+." seventy-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-two Bottles of Beer on the wall." cr
+." Oh, seventy-two Bottles of Beer on the wall," cr
+." seventy-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-one Bottles of Beer on the wall." cr
+." Oh, seventy-one Bottles of Beer on the wall," cr
+." seventy-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy Bottles of Beer on the wall." cr
+." Oh, seventy Bottles of Beer on the wall," cr
+." seventy Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-nine Bottles of Beer on the wall." cr
+." Oh, sixty-nine Bottles of Beer on the wall," cr
+." sixty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-eight Bottles of Beer on the wall." cr
+." Oh, sixty-eight Bottles of Beer on the wall," cr
+." sixty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-seven Bottles of Beer on the wall." cr
+." Oh, sixty-seven Bottles of Beer on the wall," cr
+." sixty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-six Bottles of Beer on the wall." cr
+." Oh, sixty-six Bottles of Beer on the wall," cr
+." sixty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-five Bottles of Beer on the wall." cr
+." Oh, sixty-five Bottles of Beer on the wall," cr
+." sixty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-four Bottles of Beer on the wall." cr
+." Oh, sixty-four Bottles of Beer on the wall," cr
+." sixty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-three Bottles of Beer on the wall." cr
+." Oh, sixty-three Bottles of Beer on the wall," cr
+." sixty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-two Bottles of Beer on the wall." cr
+." Oh, sixty-two Bottles of Beer on the wall," cr
+." sixty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-one Bottles of Beer on the wall." cr
+." Oh, sixty-one Bottles of Beer on the wall," cr
+." sixty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty Bottles of Beer on the wall." cr
+." Oh, sixty Bottles of Beer on the wall," cr
+." sixty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-nine Bottles of Beer on the wall." cr
+." Oh, fifty-nine Bottles of Beer on the wall," cr
+." fifty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-eight Bottles of Beer on the wall." cr
+." Oh, fifty-eight Bottles of Beer on the wall," cr
+." fifty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-seven Bottles of Beer on the wall." cr
+." Oh, fifty-seven Bottles of Beer on the wall," cr
+." fifty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-six Bottles of Beer on the wall." cr
+." Oh, fifty-six Bottles of Beer on the wall," cr
+." fifty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-five Bottles of Beer on the wall." cr
+." Oh, fifty-five Bottles of Beer on the wall," cr
+." fifty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-four Bottles of Beer on the wall." cr
+." Oh, fifty-four Bottles of Beer on the wall," cr
+." fifty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-three Bottles of Beer on the wall." cr
+." Oh, fifty-three Bottles of Beer on the wall," cr
+." fifty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-two Bottles of Beer on the wall." cr
+." Oh, fifty-two Bottles of Beer on the wall," cr
+." fifty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-one Bottles of Beer on the wall." cr
+." Oh, fifty-one Bottles of Beer on the wall," cr
+." fifty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty Bottles of Beer on the wall." cr
+." Oh, fifty Bottles of Beer on the wall," cr
+." fifty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-nine Bottles of Beer on the wall." cr
+." Oh, forty-nine Bottles of Beer on the wall," cr
+." forty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-eight Bottles of Beer on the wall." cr
+." Oh, forty-eight Bottles of Beer on the wall," cr
+." forty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-seven Bottles of Beer on the wall." cr
+." Oh, forty-seven Bottles of Beer on the wall," cr
+." forty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-six Bottles of Beer on the wall." cr
+." Oh, forty-six Bottles of Beer on the wall," cr
+." forty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-five Bottles of Beer on the wall." cr
+." Oh, forty-five Bottles of Beer on the wall," cr
+." forty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-four Bottles of Beer on the wall." cr
+." Oh, forty-four Bottles of Beer on the wall," cr
+." forty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-three Bottles of Beer on the wall." cr
+." Oh, forty-three Bottles of Beer on the wall," cr
+." forty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-two Bottles of Beer on the wall." cr
+." Oh, forty-two Bottles of Beer on the wall," cr
+." forty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-one Bottles of Beer on the wall." cr
+." Oh, forty-one Bottles of Beer on the wall," cr
+." forty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty Bottles of Beer on the wall." cr
+." Oh, forty Bottles of Beer on the wall," cr
+." forty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-nine Bottles of Beer on the wall." cr
+." Oh, thirty-nine Bottles of Beer on the wall," cr
+." thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-eight Bottles of Beer on the wall." cr
+." Oh, thirty-eight Bottles of Beer on the wall," cr
+." thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-seven Bottles of Beer on the wall." cr
+." Oh, thirty-seven Bottles of Beer on the wall," cr
+." thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-six Bottles of Beer on the wall." cr
+." Oh, thirty-six Bottles of Beer on the wall," cr
+." thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-five Bottles of Beer on the wall." cr
+." Oh, thirty-five Bottles of Beer on the wall," cr
+." thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-four Bottles of Beer on the wall." cr
+." Oh, thirty-four Bottles of Beer on the wall," cr
+." thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-three Bottles of Beer on the wall." cr
+." Oh, thirty-three Bottles of Beer on the wall," cr
+." thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-two Bottles of Beer on the wall." cr
+." Oh, thirty-two Bottles of Beer on the wall," cr
+." thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-one Bottles of Beer on the wall." cr
+." Oh, thirty-one Bottles of Beer on the wall," cr
+." thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty Bottles of Beer on the wall." cr
+." Oh, thirty Bottles of Beer on the wall," cr
+." thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-nine Bottles of Beer on the wall." cr
+." Oh, twenty-nine Bottles of Beer on the wall," cr
+." twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-eight Bottles of Beer on the wall." cr
+." Oh, twenty-eight Bottles of Beer on the wall," cr
+." twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-seven Bottles of Beer on the wall." cr
+." Oh, twenty-seven Bottles of Beer on the wall," cr
+." twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-six Bottles of Beer on the wall." cr
+." Oh, twenty-six Bottles of Beer on the wall," cr
+." twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-five Bottles of Beer on the wall." cr
+." Oh, twenty-five Bottles of Beer on the wall," cr
+." twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-four Bottles of Beer on the wall." cr
+." Oh, twenty-four Bottles of Beer on the wall," cr
+." twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-three Bottles of Beer on the wall." cr
+." Oh, twenty-three Bottles of Beer on the wall," cr
+." twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-two Bottles of Beer on the wall." cr
+." Oh, twenty-two Bottles of Beer on the wall," cr
+." twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-one Bottles of Beer on the wall." cr
+." Oh, twenty-one Bottles of Beer on the wall," cr
+." twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty Bottles of Beer on the wall." cr
+." Oh, twenty Bottles of Beer on the wall," cr
+." twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." nineteen Bottles of Beer on the wall." cr
+." Oh, nineteen Bottles of Beer on the wall," cr
+." nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighteen Bottles of Beer on the wall." cr
+." Oh, eighteen Bottles of Beer on the wall," cr
+." eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventeen Bottles of Beer on the wall." cr
+." Oh, seventeen Bottles of Beer on the wall," cr
+." seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixteen Bottles of Beer on the wall." cr
+." Oh, sixteen Bottles of Beer on the wall," cr
+." sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifteen Bottles of Beer on the wall." cr
+." Oh, fifteen Bottles of Beer on the wall," cr
+." fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fourteen Bottles of Beer on the wall." cr
+." Oh, fourteen Bottles of Beer on the wall," cr
+." fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirteen Bottles of Beer on the wall." cr
+." Oh, thirteen Bottles of Beer on the wall," cr
+." thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twelve Bottles of Beer on the wall." cr
+." Oh, twelve Bottles of Beer on the wall," cr
+." twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eleven Bottles of Beer on the wall." cr
+." Oh, eleven Bottles of Beer on the wall," cr
+." eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ten Bottles of Beer on the wall." cr
+." Oh, ten Bottles of Beer on the wall," cr
+." ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." nine Bottles of Beer on the wall." cr
+." Oh, nine Bottles of Beer on the wall," cr
+." nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eight Bottles of Beer on the wall." cr
+." Oh, eight Bottles of Beer on the wall," cr
+." eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seven Bottles of Beer on the wall." cr
+." Oh, seven Bottles of Beer on the wall," cr
+." seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six Bottles of Beer on the wall." cr
+." Oh, six Bottles of Beer on the wall," cr
+." six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five Bottles of Beer on the wall." cr
+." Oh, five Bottles of Beer on the wall," cr
+." five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four Bottles of Beer on the wall." cr
+." Oh, four Bottles of Beer on the wall," cr
+." four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three Bottles of Beer on the wall." cr
+." Oh, three Bottles of Beer on the wall," cr
+." three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two Bottles of Beer on the wall." cr
+." Oh, two Bottles of Beer on the wall," cr
+." two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one Bottle of Beer on the wall." cr
+." Oh, one Bottle of Beer on the wall," cr
+." one Bottle of Beer!," cr
+." Take it down and pass it around..." cr
+." How dry I am! How dry I am!" cr
+." No body knows how dry I am." cr
+." How ... Dry I ... Aaaammm." cr
Added: fcode-utils/testsuite/TokeErrs/TooLargeBranch_V180_body.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeBranch_V180_body.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooLargeBranch_V180_body.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,723 @@
+[message] Starting out with one hundred and eighty Bottles of Beer on the wall
+." Oh, one hundred and eighty Bottles of Beer on the wall," cr
+." one hundred and eighty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-nine Bottles of Beer on the wall," cr
+." one hundred and seventy-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-eight Bottles of Beer on the wall," cr
+." one hundred and seventy-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-seven Bottles of Beer on the wall," cr
+." one hundred and seventy-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-six Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-six Bottles of Beer on the wall," cr
+." one hundred and seventy-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-five Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-five Bottles of Beer on the wall," cr
+." one hundred and seventy-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-four Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-four Bottles of Beer on the wall," cr
+." one hundred and seventy-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-three Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-three Bottles of Beer on the wall," cr
+." one hundred and seventy-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-two Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-two Bottles of Beer on the wall," cr
+." one hundred and seventy-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-one Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-one Bottles of Beer on the wall," cr
+." one hundred and seventy-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy Bottles of Beer on the wall," cr
+." one hundred and seventy Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-nine Bottles of Beer on the wall," cr
+." one hundred and sixty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-eight Bottles of Beer on the wall," cr
+." one hundred and sixty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-seven Bottles of Beer on the wall," cr
+." one hundred and sixty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-six Bottles of Beer on the wall," cr
+." one hundred and sixty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-five Bottles of Beer on the wall," cr
+." one hundred and sixty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-four Bottles of Beer on the wall," cr
+." one hundred and sixty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-three Bottles of Beer on the wall," cr
+." one hundred and sixty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-two Bottles of Beer on the wall," cr
+." one hundred and sixty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-one Bottles of Beer on the wall," cr
+." one hundred and sixty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty Bottles of Beer on the wall," cr
+." one hundred and sixty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-nine Bottles of Beer on the wall," cr
+." one hundred and fifty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-eight Bottles of Beer on the wall," cr
+." one hundred and fifty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-seven Bottles of Beer on the wall," cr
+." one hundred and fifty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-six Bottles of Beer on the wall," cr
+." one hundred and fifty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-five Bottles of Beer on the wall," cr
+." one hundred and fifty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-four Bottles of Beer on the wall," cr
+." one hundred and fifty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-three Bottles of Beer on the wall," cr
+." one hundred and fifty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-two Bottles of Beer on the wall," cr
+." one hundred and fifty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-one Bottles of Beer on the wall," cr
+." one hundred and fifty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty Bottles of Beer on the wall," cr
+." one hundred and fifty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-nine Bottles of Beer on the wall," cr
+." one hundred and forty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-eight Bottles of Beer on the wall," cr
+." one hundred and forty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-seven Bottles of Beer on the wall," cr
+." one hundred and forty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-six Bottles of Beer on the wall," cr
+." one hundred and forty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-five Bottles of Beer on the wall," cr
+." one hundred and forty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-four Bottles of Beer on the wall," cr
+." one hundred and forty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-three Bottles of Beer on the wall," cr
+." one hundred and forty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-two Bottles of Beer on the wall," cr
+." one hundred and forty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and forty-one Bottles of Beer on the wall," cr
+." one hundred and forty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and forty Bottles of Beer on the wall." cr
+." Oh, one hundred and forty Bottles of Beer on the wall," cr
+." one hundred and forty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-nine Bottles of Beer on the wall," cr
+." one hundred and thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-eight Bottles of Beer on the wall," cr
+." one hundred and thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-seven Bottles of Beer on the wall," cr
+." one hundred and thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-six Bottles of Beer on the wall," cr
+." one hundred and thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-five Bottles of Beer on the wall," cr
+." one hundred and thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-four Bottles of Beer on the wall," cr
+." one hundred and thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-three Bottles of Beer on the wall," cr
+." one hundred and thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-two Bottles of Beer on the wall," cr
+." one hundred and thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-one Bottles of Beer on the wall," cr
+." one hundred and thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty Bottles of Beer on the wall," cr
+." one hundred and thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-nine Bottles of Beer on the wall," cr
+." one hundred and twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-eight Bottles of Beer on the wall," cr
+." one hundred and twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-seven Bottles of Beer on the wall," cr
+." one hundred and twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-six Bottles of Beer on the wall," cr
+." one hundred and twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-five Bottles of Beer on the wall," cr
+." one hundred and twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-four Bottles of Beer on the wall," cr
+." one hundred and twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-three Bottles of Beer on the wall," cr
+." one hundred and twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-two Bottles of Beer on the wall," cr
+." one hundred and twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-one Bottles of Beer on the wall," cr
+." one hundred and twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty Bottles of Beer on the wall," cr
+." one hundred and twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and nineteen Bottles of Beer on the wall." cr
+." Oh, one hundred and nineteen Bottles of Beer on the wall," cr
+." one hundred and nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighteen Bottles of Beer on the wall." cr
+." Oh, one hundred and eighteen Bottles of Beer on the wall," cr
+." one hundred and eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventeen Bottles of Beer on the wall." cr
+." Oh, one hundred and seventeen Bottles of Beer on the wall," cr
+." one hundred and seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixteen Bottles of Beer on the wall." cr
+." Oh, one hundred and sixteen Bottles of Beer on the wall," cr
+." one hundred and sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifteen Bottles of Beer on the wall." cr
+." Oh, one hundred and fifteen Bottles of Beer on the wall," cr
+." one hundred and fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fourteen Bottles of Beer on the wall." cr
+." Oh, one hundred and fourteen Bottles of Beer on the wall," cr
+." one hundred and fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirteen Bottles of Beer on the wall." cr
+." Oh, one hundred and thirteen Bottles of Beer on the wall," cr
+." one hundred and thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twelve Bottles of Beer on the wall." cr
+." Oh, one hundred and twelve Bottles of Beer on the wall," cr
+." one hundred and twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eleven Bottles of Beer on the wall." cr
+." Oh, one hundred and eleven Bottles of Beer on the wall," cr
+." one hundred and eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ten Bottles of Beer on the wall." cr
+." Oh, one hundred and ten Bottles of Beer on the wall," cr
+." one hundred and ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and nine Bottles of Beer on the wall." cr
+." Oh, one hundred and nine Bottles of Beer on the wall," cr
+." one hundred and nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eight Bottles of Beer on the wall." cr
+." Oh, one hundred and eight Bottles of Beer on the wall," cr
+." one hundred and eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seven Bottles of Beer on the wall." cr
+." Oh, one hundred and seven Bottles of Beer on the wall," cr
+." one hundred and seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and six Bottles of Beer on the wall." cr
+." Oh, one hundred and six Bottles of Beer on the wall," cr
+." one hundred and six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and five Bottles of Beer on the wall." cr
+." Oh, one hundred and five Bottles of Beer on the wall," cr
+." one hundred and five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and four Bottles of Beer on the wall." cr
+." Oh, one hundred and four Bottles of Beer on the wall," cr
+." one hundred and four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and three Bottles of Beer on the wall." cr
+." Oh, one hundred and three Bottles of Beer on the wall," cr
+." one hundred and three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and two Bottles of Beer on the wall." cr
+." Oh, one hundred and two Bottles of Beer on the wall," cr
+." one hundred and two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and one Bottles of Beer on the wall." cr
+." Oh, one hundred and one Bottles of Beer on the wall," cr
+." one hundred and one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred Bottles of Beer on the wall." cr
+." Oh, one hundred Bottles of Beer on the wall," cr
+." one hundred Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-nine Bottles of Beer on the wall." cr
+." Oh, ninety-nine Bottles of Beer on the wall," cr
+." ninety-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-eight Bottles of Beer on the wall." cr
+." Oh, ninety-eight Bottles of Beer on the wall," cr
+." ninety-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-seven Bottles of Beer on the wall." cr
+." Oh, ninety-seven Bottles of Beer on the wall," cr
+." ninety-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-six Bottles of Beer on the wall." cr
+." Oh, ninety-six Bottles of Beer on the wall," cr
+." ninety-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-five Bottles of Beer on the wall." cr
+." Oh, ninety-five Bottles of Beer on the wall," cr
+." ninety-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-four Bottles of Beer on the wall." cr
+." Oh, ninety-four Bottles of Beer on the wall," cr
+." ninety-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-three Bottles of Beer on the wall." cr
+." Oh, ninety-three Bottles of Beer on the wall," cr
+." ninety-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-two Bottles of Beer on the wall." cr
+." Oh, ninety-two Bottles of Beer on the wall," cr
+." ninety-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-one Bottles of Beer on the wall." cr
+." Oh, ninety-one Bottles of Beer on the wall," cr
+." ninety-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety Bottles of Beer on the wall." cr
+." Oh, ninety Bottles of Beer on the wall," cr
+." ninety Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-nine Bottles of Beer on the wall." cr
+." Oh, eighty-nine Bottles of Beer on the wall," cr
+." eighty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-eight Bottles of Beer on the wall." cr
+." Oh, eighty-eight Bottles of Beer on the wall," cr
+." eighty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-seven Bottles of Beer on the wall." cr
+." Oh, eighty-seven Bottles of Beer on the wall," cr
+." eighty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-six Bottles of Beer on the wall." cr
+." Oh, eighty-six Bottles of Beer on the wall," cr
+." eighty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-five Bottles of Beer on the wall." cr
+." Oh, eighty-five Bottles of Beer on the wall," cr
+." eighty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-four Bottles of Beer on the wall." cr
+." Oh, eighty-four Bottles of Beer on the wall," cr
+." eighty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-three Bottles of Beer on the wall." cr
+." Oh, eighty-three Bottles of Beer on the wall," cr
+." eighty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-two Bottles of Beer on the wall." cr
+." Oh, eighty-two Bottles of Beer on the wall," cr
+." eighty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-one Bottles of Beer on the wall." cr
+." Oh, eighty-one Bottles of Beer on the wall," cr
+." eighty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty Bottles of Beer on the wall." cr
+." Oh, eighty Bottles of Beer on the wall," cr
+." eighty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-nine Bottles of Beer on the wall." cr
+." Oh, seventy-nine Bottles of Beer on the wall," cr
+." seventy-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-eight Bottles of Beer on the wall." cr
+." Oh, seventy-eight Bottles of Beer on the wall," cr
+." seventy-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-seven Bottles of Beer on the wall." cr
+." Oh, seventy-seven Bottles of Beer on the wall," cr
+." seventy-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-six Bottles of Beer on the wall." cr
+." Oh, seventy-six Bottles of Beer on the wall," cr
+." seventy-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-five Bottles of Beer on the wall." cr
+." Oh, seventy-five Bottles of Beer on the wall," cr
+." seventy-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-four Bottles of Beer on the wall." cr
+." Oh, seventy-four Bottles of Beer on the wall," cr
+." seventy-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-three Bottles of Beer on the wall." cr
+." Oh, seventy-three Bottles of Beer on the wall," cr
+." seventy-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-two Bottles of Beer on the wall." cr
+." Oh, seventy-two Bottles of Beer on the wall," cr
+." seventy-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-one Bottles of Beer on the wall." cr
+." Oh, seventy-one Bottles of Beer on the wall," cr
+." seventy-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy Bottles of Beer on the wall." cr
+." Oh, seventy Bottles of Beer on the wall," cr
+." seventy Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-nine Bottles of Beer on the wall." cr
+." Oh, sixty-nine Bottles of Beer on the wall," cr
+." sixty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-eight Bottles of Beer on the wall." cr
+." Oh, sixty-eight Bottles of Beer on the wall," cr
+." sixty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-seven Bottles of Beer on the wall." cr
+." Oh, sixty-seven Bottles of Beer on the wall," cr
+." sixty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-six Bottles of Beer on the wall." cr
+." Oh, sixty-six Bottles of Beer on the wall," cr
+." sixty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-five Bottles of Beer on the wall." cr
+." Oh, sixty-five Bottles of Beer on the wall," cr
+." sixty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-four Bottles of Beer on the wall." cr
+." Oh, sixty-four Bottles of Beer on the wall," cr
+." sixty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-three Bottles of Beer on the wall." cr
+." Oh, sixty-three Bottles of Beer on the wall," cr
+." sixty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-two Bottles of Beer on the wall." cr
+." Oh, sixty-two Bottles of Beer on the wall," cr
+." sixty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-one Bottles of Beer on the wall." cr
+." Oh, sixty-one Bottles of Beer on the wall," cr
+." sixty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty Bottles of Beer on the wall." cr
+." Oh, sixty Bottles of Beer on the wall," cr
+." sixty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-nine Bottles of Beer on the wall." cr
+." Oh, fifty-nine Bottles of Beer on the wall," cr
+." fifty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-eight Bottles of Beer on the wall." cr
+." Oh, fifty-eight Bottles of Beer on the wall," cr
+." fifty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-seven Bottles of Beer on the wall." cr
+." Oh, fifty-seven Bottles of Beer on the wall," cr
+." fifty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-six Bottles of Beer on the wall." cr
+." Oh, fifty-six Bottles of Beer on the wall," cr
+." fifty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-five Bottles of Beer on the wall." cr
+." Oh, fifty-five Bottles of Beer on the wall," cr
+." fifty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-four Bottles of Beer on the wall." cr
+." Oh, fifty-four Bottles of Beer on the wall," cr
+." fifty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-three Bottles of Beer on the wall." cr
+." Oh, fifty-three Bottles of Beer on the wall," cr
+." fifty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-two Bottles of Beer on the wall." cr
+." Oh, fifty-two Bottles of Beer on the wall," cr
+." fifty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-one Bottles of Beer on the wall." cr
+." Oh, fifty-one Bottles of Beer on the wall," cr
+." fifty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty Bottles of Beer on the wall." cr
+." Oh, fifty Bottles of Beer on the wall," cr
+." fifty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-nine Bottles of Beer on the wall." cr
+." Oh, forty-nine Bottles of Beer on the wall," cr
+." forty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-eight Bottles of Beer on the wall." cr
+." Oh, forty-eight Bottles of Beer on the wall," cr
+." forty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-seven Bottles of Beer on the wall." cr
+." Oh, forty-seven Bottles of Beer on the wall," cr
+." forty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-six Bottles of Beer on the wall." cr
+." Oh, forty-six Bottles of Beer on the wall," cr
+." forty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-five Bottles of Beer on the wall." cr
+." Oh, forty-five Bottles of Beer on the wall," cr
+." forty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-four Bottles of Beer on the wall." cr
+." Oh, forty-four Bottles of Beer on the wall," cr
+." forty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-three Bottles of Beer on the wall." cr
+." Oh, forty-three Bottles of Beer on the wall," cr
+." forty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-two Bottles of Beer on the wall." cr
+." Oh, forty-two Bottles of Beer on the wall," cr
+." forty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty-one Bottles of Beer on the wall." cr
+." Oh, forty-one Bottles of Beer on the wall," cr
+." forty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." forty Bottles of Beer on the wall." cr
+." Oh, forty Bottles of Beer on the wall," cr
+." forty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-nine Bottles of Beer on the wall." cr
+." Oh, thirty-nine Bottles of Beer on the wall," cr
+." thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-eight Bottles of Beer on the wall." cr
+." Oh, thirty-eight Bottles of Beer on the wall," cr
+." thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-seven Bottles of Beer on the wall." cr
+." Oh, thirty-seven Bottles of Beer on the wall," cr
+." thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-six Bottles of Beer on the wall." cr
+." Oh, thirty-six Bottles of Beer on the wall," cr
+." thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-five Bottles of Beer on the wall." cr
+." Oh, thirty-five Bottles of Beer on the wall," cr
+." thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-four Bottles of Beer on the wall." cr
+." Oh, thirty-four Bottles of Beer on the wall," cr
+." thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-three Bottles of Beer on the wall." cr
+." Oh, thirty-three Bottles of Beer on the wall," cr
+." thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-two Bottles of Beer on the wall." cr
+." Oh, thirty-two Bottles of Beer on the wall," cr
+." thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-one Bottles of Beer on the wall." cr
+." Oh, thirty-one Bottles of Beer on the wall," cr
+." thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty Bottles of Beer on the wall." cr
+." Oh, thirty Bottles of Beer on the wall," cr
+." thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-nine Bottles of Beer on the wall." cr
+." Oh, twenty-nine Bottles of Beer on the wall," cr
+." twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-eight Bottles of Beer on the wall." cr
+." Oh, twenty-eight Bottles of Beer on the wall," cr
+." twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-seven Bottles of Beer on the wall." cr
+." Oh, twenty-seven Bottles of Beer on the wall," cr
+." twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-six Bottles of Beer on the wall." cr
+." Oh, twenty-six Bottles of Beer on the wall," cr
+." twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-five Bottles of Beer on the wall." cr
+." Oh, twenty-five Bottles of Beer on the wall," cr
+." twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-four Bottles of Beer on the wall." cr
+." Oh, twenty-four Bottles of Beer on the wall," cr
+." twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-three Bottles of Beer on the wall." cr
+." Oh, twenty-three Bottles of Beer on the wall," cr
+." twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-two Bottles of Beer on the wall." cr
+." Oh, twenty-two Bottles of Beer on the wall," cr
+." twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-one Bottles of Beer on the wall." cr
+." Oh, twenty-one Bottles of Beer on the wall," cr
+." twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty Bottles of Beer on the wall." cr
+." Oh, twenty Bottles of Beer on the wall," cr
+." twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." nineteen Bottles of Beer on the wall." cr
+." Oh, nineteen Bottles of Beer on the wall," cr
+." nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighteen Bottles of Beer on the wall." cr
+." Oh, eighteen Bottles of Beer on the wall," cr
+." eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventeen Bottles of Beer on the wall." cr
+." Oh, seventeen Bottles of Beer on the wall," cr
+." seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixteen Bottles of Beer on the wall." cr
+." Oh, sixteen Bottles of Beer on the wall," cr
+." sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifteen Bottles of Beer on the wall." cr
+." Oh, fifteen Bottles of Beer on the wall," cr
+." fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fourteen Bottles of Beer on the wall." cr
+." Oh, fourteen Bottles of Beer on the wall," cr
+." fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirteen Bottles of Beer on the wall." cr
+." Oh, thirteen Bottles of Beer on the wall," cr
+." thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twelve Bottles of Beer on the wall." cr
+." Oh, twelve Bottles of Beer on the wall," cr
+." twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eleven Bottles of Beer on the wall." cr
+." Oh, eleven Bottles of Beer on the wall," cr
+." eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ten Bottles of Beer on the wall." cr
+." Oh, ten Bottles of Beer on the wall," cr
+." ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." nine Bottles of Beer on the wall." cr
+." Oh, nine Bottles of Beer on the wall," cr
+." nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eight Bottles of Beer on the wall." cr
+." Oh, eight Bottles of Beer on the wall," cr
+." eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seven Bottles of Beer on the wall." cr
+." Oh, seven Bottles of Beer on the wall," cr
+." seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six Bottles of Beer on the wall." cr
+." Oh, six Bottles of Beer on the wall," cr
+." six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five Bottles of Beer on the wall." cr
+." Oh, five Bottles of Beer on the wall," cr
+." five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four Bottles of Beer on the wall." cr
+." Oh, four Bottles of Beer on the wall," cr
+." four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three Bottles of Beer on the wall." cr
+." Oh, three Bottles of Beer on the wall," cr
+." three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two Bottles of Beer on the wall." cr
+." Oh, two Bottles of Beer on the wall," cr
+." two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one Bottle of Beer on the wall." cr
+." Oh, one Bottle of Beer on the wall," cr
+." one Bottle of Beer!," cr
+." Take it down and pass it around..." cr
+." How dry I am! How dry I am!" cr
+." No body knows how dry I am." cr
+." How ... Dry I ... Aaaammm." cr
Added: fcode-utils/testsuite/TokeErrs/TooLargeBranch_off08.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeBranch_off08.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooLargeBranch_off08.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,72 @@
+\ Test case of a branch going over too large a range
+\ Body generated by the "Verbal Bottles of Beer" script,
+\ (Argument of 1 is enough to do it.)
+
+
+fcode-version1 \ Eight-bit offsets.
+
+headers
+
+: too-large-case ( n -- )
+
+ ." Let's give it a large back-reference too."
+ begin ." We've just begun"
+ ." 1 0 do " cr 1 0 do
+ dup ." if " cr
+ if
+ dup ." case"
+ case
+ 0 of ." Just a short case" cr endof
+ ." default. The Big One!" cr
+
+ fload TooLargeBranch_off08_body.fth
+
+ endcase
+ ." then"
+ then
+ ." Loop back and forward" cr loop
+
+ ." And here we are!"
+ exit
+ ." Well, we needed some way out!"
+
+ again ." Back to the fuchsia."
+;
+
+\ Let's make a small jump, just to see what normal looks like
+: control-example
+ ." Here's the beguine"
+ begin
+ dup ." if "
+ if
+ dup ." case"
+ case
+ 0 of ." Short case" cr endof
+ ." No default." cr
+ endcase
+ ." then"
+ then
+
+ ." Way out"
+ exit
+ ." Jump back"
+ again ." Never do this"
+;
+
+
+\ Let's make a do-loop that straddles the limit
+\ (I.e., the "outer" branch is just too large,
+\ but the "inner" branch just fits.)
+: straddle-loop
+ ." 1 0 do" cr 1 0 do
+
+." Take it down and pass it around..." cr
+." How dry I am! How dry I am!" cr
+." No body knows" cr
+." How ... Dry I ... Aaaammm." cr
+
+ ." Loop." cr loop
+ ." Here we go!" cr
+;
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/TooLargeBranch_off08_body.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeBranch_off08_body.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooLargeBranch_off08_body.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,7 @@
+[message] Starting out with one Bottle of Beer on the wall
+." Oh, one Bottle of Beer on the wall," cr
+." one Bottle of Beer!," cr
+." Take it down and pass it around..." cr
+." How dry I am! How dry I am!" cr
+." No body knows how dry I am." cr
+." How ... Dry I ... Aaaammm." cr
Added: fcode-utils/testsuite/TokeErrs/TooLargeBranch_off08_to_16.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeBranch_off08_to_16.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooLargeBranch_off08_to_16.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,85 @@
+\ Test case of a branch going over too large a range
+\ Body generated by the "Verbal Bottles of Beer" script (Arg of 1 does it.)
+\ Test transition from eight-bit offsets to sixteen-bit offsets
+
+
+fcode-version1 \ Eight-bit offsets.
+
+headers
+
+: too-large-case ( n -- )
+
+ ." Let's give it a large back-reference too."
+ begin ." We've just begun"
+ ." 1 0 do " cr 1 0 do
+ dup ." if " cr
+ if
+ dup ." case"
+ case
+ 0 of ." Just a short case" cr endof
+ ." default. The Big One!" cr
+
+ fload TooLargeBranch_off08_body.fth
+
+ endcase
+ ." then" cr
+ then
+ ." Loop back and forward" cr loop
+
+ ." And here we are!" cr
+ exit
+ ." Well, we needed some way out!" cr
+
+ again ." Back to the fuchsia." cr
+;
+
+\ Let's make a small jump, just to see what normal looks like
+: control-example
+ ." Here's the beguine"
+ begin
+ dup ." if "
+ if
+ dup ." case"
+ case
+ 0 of ." Short case" cr endof
+ ." No default." cr
+ endcase
+ ." then"
+ then
+
+ ." Way out"
+ exit
+ ." Jump back"
+ again ." Never do this"
+;
+
+
+fcode-end
+
+
+fcode-version2 \ Sixteen-bit offsets.
+
+: odd-size-case ( n -- )
+ ." With a back-reference."
+ begin ." We've begun"
+ dup ." blah-if "
+ if
+ dup ." blah-case"
+ case
+ 0 of ." A very short case" cr endof
+ ." A big default." cr
+
+ fload TooLargeBranch_off08_body.fth
+
+ endcase
+ ." blah-then" cr
+ then
+ ." blah-some way out."
+ exit
+ ." Back again" cr
+
+ again ." Done. are you happy?" cr
+;
+
+fcode-end
+
Added: fcode-utils/testsuite/TokeErrs/TooLargeBranch_off16.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeBranch_off16.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooLargeBranch_off16.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,67 @@
+\ Test case of a branch going over too large a range
+\ Body generated by script.
+\ (Numeric values, argument of 232 just exceeds the inner branches.)
+\ (Numeric values, argument of N >= 233 exceeds them all.)
+\ (Verbal argument of 179 just exceeds the inner branches.)
+\ (Verbal argument of N >= 180 exceeds them all.)
+\ Command-line definition of 'fld_cmd' should be of the form 'fload <filename>'
+\ and can be used to load variable-sized bodies.
+
+\ Default will be TooLargeBranch_off16_body.fth
+
+fcode-version2 \ Sixteen-bit offsets.
+
+headers
+
+: too-large-case ( n -- )
+
+ ." Let's give it a large back-reference too."
+ begin ." We've just begun"
+ ." 1 0 do " cr 1 0 do
+ dup ." if " cr
+ if
+ dup ." case"
+ case
+ 0 of ." Just a short case" cr endof
+ ." default. The Big One!" cr
+
+[ifndef] fld_cmd
+ fload TooLargeBranch_off16_body.fth
+[else]
+ [defined] fld_cmd
+[endif]
+
+ endcase
+ ." then"
+ then
+ ." Loop back and forward" cr loop
+
+ ." And here we are!"
+ exit
+ ." Well, we needed some way out!"
+
+ again ." Back to the fuchsia."
+;
+
+\ Let's make a small jump, just to see what normal looks like
+: control-example
+ ." Small non-loop"
+ begin ." Here's the beguine"
+
+ dup ." if "
+ if
+ dup ." case"
+ case
+ 0 of ." Just a short case" cr endof
+ ." default. Normal one!" cr
+ endcase
+ ." then"
+ then
+
+ ." and the way out"
+ exit
+ ." and the jump back"
+ again ." Never do this" cr
+;
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/TooLargeBranch_off16_body.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeBranch_off16_body.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooLargeBranch_off16_body.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,719 @@
+[message] Starting out with one hundred and seventy-nine Bottles of Beer on the wall
+." Oh, one hundred and seventy-nine Bottles of Beer on the wall," cr
+." one hundred and seventy-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-eight Bottles of Beer on the wall," cr
+." one hundred and seventy-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-seven Bottles of Beer on the wall," cr
+." one hundred and seventy-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-six Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-six Bottles of Beer on the wall," cr
+." one hundred and seventy-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-five Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-five Bottles of Beer on the wall," cr
+." one hundred and seventy-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-four Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-four Bottles of Beer on the wall," cr
+." one hundred and seventy-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-three Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-three Bottles of Beer on the wall," cr
+." one hundred and seventy-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-two Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-two Bottles of Beer on the wall," cr
+." one hundred and seventy-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy-one Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy-one Bottles of Beer on the wall," cr
+." one hundred and seventy-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventy Bottles of Beer on the wall." cr
+." Oh, one hundred and seventy Bottles of Beer on the wall," cr
+." one hundred and seventy Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-nine Bottles of Beer on the wall," cr
+." one hundred and sixty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-eight Bottles of Beer on the wall," cr
+." one hundred and sixty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-seven Bottles of Beer on the wall," cr
+." one hundred and sixty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-six Bottles of Beer on the wall," cr
+." one hundred and sixty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-five Bottles of Beer on the wall," cr
+." one hundred and sixty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-four Bottles of Beer on the wall," cr
+." one hundred and sixty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-three Bottles of Beer on the wall," cr
+." one hundred and sixty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-two Bottles of Beer on the wall," cr
+." one hundred and sixty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty-one Bottles of Beer on the wall," cr
+." one hundred and sixty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixty Bottles of Beer on the wall." cr
+." Oh, one hundred and sixty Bottles of Beer on the wall," cr
+." one hundred and sixty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-nine Bottles of Beer on the wall," cr
+." one hundred and fifty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-eight Bottles of Beer on the wall," cr
+." one hundred and fifty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-seven Bottles of Beer on the wall," cr
+." one hundred and fifty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-six Bottles of Beer on the wall," cr
+." one hundred and fifty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-five Bottles of Beer on the wall," cr
+." one hundred and fifty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-four Bottles of Beer on the wall," cr
+." one hundred and fifty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-three Bottles of Beer on the wall," cr
+." one hundred and fifty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-two Bottles of Beer on the wall," cr
+." one hundred and fifty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty-one Bottles of Beer on the wall," cr
+." one hundred and fifty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifty Bottles of Beer on the wall." cr
+." Oh, one hundred and fifty Bottles of Beer on the wall," cr
+." one hundred and fifty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fourty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and fourty-nine Bottles of Beer on the wall," cr
+." one hundred and fourty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fourty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and fourty-eight Bottles of Beer on the wall," cr
+." one hundred and fourty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fourty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and fourty-seven Bottles of Beer on the wall," cr
+." one hundred and fourty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fourty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and fourty-six Bottles of Beer on the wall," cr
+." one hundred and fourty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fourty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and fourty-five Bottles of Beer on the wall," cr
+." one hundred and fourty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fourty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and fourty-four Bottles of Beer on the wall," cr
+." one hundred and fourty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fourty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and fourty-three Bottles of Beer on the wall," cr
+." one hundred and fourty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fourty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and fourty-two Bottles of Beer on the wall," cr
+." one hundred and fourty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fourty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and fourty-one Bottles of Beer on the wall," cr
+." one hundred and fourty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fourty Bottles of Beer on the wall." cr
+." Oh, one hundred and fourty Bottles of Beer on the wall," cr
+." one hundred and fourty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-nine Bottles of Beer on the wall," cr
+." one hundred and thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-eight Bottles of Beer on the wall," cr
+." one hundred and thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-seven Bottles of Beer on the wall," cr
+." one hundred and thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-six Bottles of Beer on the wall," cr
+." one hundred and thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-five Bottles of Beer on the wall," cr
+." one hundred and thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-four Bottles of Beer on the wall," cr
+." one hundred and thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-three Bottles of Beer on the wall," cr
+." one hundred and thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-two Bottles of Beer on the wall," cr
+." one hundred and thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty-one Bottles of Beer on the wall," cr
+." one hundred and thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirty Bottles of Beer on the wall." cr
+." Oh, one hundred and thirty Bottles of Beer on the wall," cr
+." one hundred and thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-nine Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-nine Bottles of Beer on the wall," cr
+." one hundred and twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-eight Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-eight Bottles of Beer on the wall," cr
+." one hundred and twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-seven Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-seven Bottles of Beer on the wall," cr
+." one hundred and twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-six Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-six Bottles of Beer on the wall," cr
+." one hundred and twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-five Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-five Bottles of Beer on the wall," cr
+." one hundred and twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-four Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-four Bottles of Beer on the wall," cr
+." one hundred and twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-three Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-three Bottles of Beer on the wall," cr
+." one hundred and twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-two Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-two Bottles of Beer on the wall," cr
+." one hundred and twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty-one Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty-one Bottles of Beer on the wall," cr
+." one hundred and twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twenty Bottles of Beer on the wall." cr
+." Oh, one hundred and twenty Bottles of Beer on the wall," cr
+." one hundred and twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and nineteen Bottles of Beer on the wall." cr
+." Oh, one hundred and nineteen Bottles of Beer on the wall," cr
+." one hundred and nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eighteen Bottles of Beer on the wall." cr
+." Oh, one hundred and eighteen Bottles of Beer on the wall," cr
+." one hundred and eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seventeen Bottles of Beer on the wall." cr
+." Oh, one hundred and seventeen Bottles of Beer on the wall," cr
+." one hundred and seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and sixteen Bottles of Beer on the wall." cr
+." Oh, one hundred and sixteen Bottles of Beer on the wall," cr
+." one hundred and sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fifteen Bottles of Beer on the wall." cr
+." Oh, one hundred and fifteen Bottles of Beer on the wall," cr
+." one hundred and fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and fourteen Bottles of Beer on the wall." cr
+." Oh, one hundred and fourteen Bottles of Beer on the wall," cr
+." one hundred and fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and thirteen Bottles of Beer on the wall." cr
+." Oh, one hundred and thirteen Bottles of Beer on the wall," cr
+." one hundred and thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and twelve Bottles of Beer on the wall." cr
+." Oh, one hundred and twelve Bottles of Beer on the wall," cr
+." one hundred and twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eleven Bottles of Beer on the wall." cr
+." Oh, one hundred and eleven Bottles of Beer on the wall," cr
+." one hundred and eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and ten Bottles of Beer on the wall." cr
+." Oh, one hundred and ten Bottles of Beer on the wall," cr
+." one hundred and ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and nine Bottles of Beer on the wall." cr
+." Oh, one hundred and nine Bottles of Beer on the wall," cr
+." one hundred and nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and eight Bottles of Beer on the wall." cr
+." Oh, one hundred and eight Bottles of Beer on the wall," cr
+." one hundred and eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and seven Bottles of Beer on the wall." cr
+." Oh, one hundred and seven Bottles of Beer on the wall," cr
+." one hundred and seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and six Bottles of Beer on the wall." cr
+." Oh, one hundred and six Bottles of Beer on the wall," cr
+." one hundred and six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and five Bottles of Beer on the wall." cr
+." Oh, one hundred and five Bottles of Beer on the wall," cr
+." one hundred and five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and four Bottles of Beer on the wall." cr
+." Oh, one hundred and four Bottles of Beer on the wall," cr
+." one hundred and four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and three Bottles of Beer on the wall." cr
+." Oh, one hundred and three Bottles of Beer on the wall," cr
+." one hundred and three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and two Bottles of Beer on the wall." cr
+." Oh, one hundred and two Bottles of Beer on the wall," cr
+." one hundred and two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred and one Bottles of Beer on the wall." cr
+." Oh, one hundred and one Bottles of Beer on the wall," cr
+." one hundred and one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one hundred Bottles of Beer on the wall." cr
+." Oh, one hundred Bottles of Beer on the wall," cr
+." one hundred Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-nine Bottles of Beer on the wall." cr
+." Oh, ninety-nine Bottles of Beer on the wall," cr
+." ninety-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-eight Bottles of Beer on the wall." cr
+." Oh, ninety-eight Bottles of Beer on the wall," cr
+." ninety-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-seven Bottles of Beer on the wall." cr
+." Oh, ninety-seven Bottles of Beer on the wall," cr
+." ninety-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-six Bottles of Beer on the wall." cr
+." Oh, ninety-six Bottles of Beer on the wall," cr
+." ninety-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-five Bottles of Beer on the wall." cr
+." Oh, ninety-five Bottles of Beer on the wall," cr
+." ninety-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-four Bottles of Beer on the wall." cr
+." Oh, ninety-four Bottles of Beer on the wall," cr
+." ninety-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-three Bottles of Beer on the wall." cr
+." Oh, ninety-three Bottles of Beer on the wall," cr
+." ninety-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-two Bottles of Beer on the wall." cr
+." Oh, ninety-two Bottles of Beer on the wall," cr
+." ninety-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety-one Bottles of Beer on the wall." cr
+." Oh, ninety-one Bottles of Beer on the wall," cr
+." ninety-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ninety Bottles of Beer on the wall." cr
+." Oh, ninety Bottles of Beer on the wall," cr
+." ninety Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-nine Bottles of Beer on the wall." cr
+." Oh, eighty-nine Bottles of Beer on the wall," cr
+." eighty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-eight Bottles of Beer on the wall." cr
+." Oh, eighty-eight Bottles of Beer on the wall," cr
+." eighty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-seven Bottles of Beer on the wall." cr
+." Oh, eighty-seven Bottles of Beer on the wall," cr
+." eighty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-six Bottles of Beer on the wall." cr
+." Oh, eighty-six Bottles of Beer on the wall," cr
+." eighty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-five Bottles of Beer on the wall." cr
+." Oh, eighty-five Bottles of Beer on the wall," cr
+." eighty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-four Bottles of Beer on the wall." cr
+." Oh, eighty-four Bottles of Beer on the wall," cr
+." eighty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-three Bottles of Beer on the wall." cr
+." Oh, eighty-three Bottles of Beer on the wall," cr
+." eighty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-two Bottles of Beer on the wall." cr
+." Oh, eighty-two Bottles of Beer on the wall," cr
+." eighty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty-one Bottles of Beer on the wall." cr
+." Oh, eighty-one Bottles of Beer on the wall," cr
+." eighty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighty Bottles of Beer on the wall." cr
+." Oh, eighty Bottles of Beer on the wall," cr
+." eighty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-nine Bottles of Beer on the wall." cr
+." Oh, seventy-nine Bottles of Beer on the wall," cr
+." seventy-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-eight Bottles of Beer on the wall." cr
+." Oh, seventy-eight Bottles of Beer on the wall," cr
+." seventy-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-seven Bottles of Beer on the wall." cr
+." Oh, seventy-seven Bottles of Beer on the wall," cr
+." seventy-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-six Bottles of Beer on the wall." cr
+." Oh, seventy-six Bottles of Beer on the wall," cr
+." seventy-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-five Bottles of Beer on the wall." cr
+." Oh, seventy-five Bottles of Beer on the wall," cr
+." seventy-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-four Bottles of Beer on the wall." cr
+." Oh, seventy-four Bottles of Beer on the wall," cr
+." seventy-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-three Bottles of Beer on the wall." cr
+." Oh, seventy-three Bottles of Beer on the wall," cr
+." seventy-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-two Bottles of Beer on the wall." cr
+." Oh, seventy-two Bottles of Beer on the wall," cr
+." seventy-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy-one Bottles of Beer on the wall." cr
+." Oh, seventy-one Bottles of Beer on the wall," cr
+." seventy-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventy Bottles of Beer on the wall." cr
+." Oh, seventy Bottles of Beer on the wall," cr
+." seventy Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-nine Bottles of Beer on the wall." cr
+." Oh, sixty-nine Bottles of Beer on the wall," cr
+." sixty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-eight Bottles of Beer on the wall." cr
+." Oh, sixty-eight Bottles of Beer on the wall," cr
+." sixty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-seven Bottles of Beer on the wall." cr
+." Oh, sixty-seven Bottles of Beer on the wall," cr
+." sixty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-six Bottles of Beer on the wall." cr
+." Oh, sixty-six Bottles of Beer on the wall," cr
+." sixty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-five Bottles of Beer on the wall." cr
+." Oh, sixty-five Bottles of Beer on the wall," cr
+." sixty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-four Bottles of Beer on the wall." cr
+." Oh, sixty-four Bottles of Beer on the wall," cr
+." sixty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-three Bottles of Beer on the wall." cr
+." Oh, sixty-three Bottles of Beer on the wall," cr
+." sixty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-two Bottles of Beer on the wall." cr
+." Oh, sixty-two Bottles of Beer on the wall," cr
+." sixty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty-one Bottles of Beer on the wall." cr
+." Oh, sixty-one Bottles of Beer on the wall," cr
+." sixty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixty Bottles of Beer on the wall." cr
+." Oh, sixty Bottles of Beer on the wall," cr
+." sixty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-nine Bottles of Beer on the wall." cr
+." Oh, fifty-nine Bottles of Beer on the wall," cr
+." fifty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-eight Bottles of Beer on the wall." cr
+." Oh, fifty-eight Bottles of Beer on the wall," cr
+." fifty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-seven Bottles of Beer on the wall." cr
+." Oh, fifty-seven Bottles of Beer on the wall," cr
+." fifty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-six Bottles of Beer on the wall." cr
+." Oh, fifty-six Bottles of Beer on the wall," cr
+." fifty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-five Bottles of Beer on the wall." cr
+." Oh, fifty-five Bottles of Beer on the wall," cr
+." fifty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-four Bottles of Beer on the wall." cr
+." Oh, fifty-four Bottles of Beer on the wall," cr
+." fifty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-three Bottles of Beer on the wall." cr
+." Oh, fifty-three Bottles of Beer on the wall," cr
+." fifty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-two Bottles of Beer on the wall." cr
+." Oh, fifty-two Bottles of Beer on the wall," cr
+." fifty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty-one Bottles of Beer on the wall." cr
+." Oh, fifty-one Bottles of Beer on the wall," cr
+." fifty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifty Bottles of Beer on the wall." cr
+." Oh, fifty Bottles of Beer on the wall," cr
+." fifty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fourty-nine Bottles of Beer on the wall." cr
+." Oh, fourty-nine Bottles of Beer on the wall," cr
+." fourty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fourty-eight Bottles of Beer on the wall." cr
+." Oh, fourty-eight Bottles of Beer on the wall," cr
+." fourty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fourty-seven Bottles of Beer on the wall." cr
+." Oh, fourty-seven Bottles of Beer on the wall," cr
+." fourty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fourty-six Bottles of Beer on the wall." cr
+." Oh, fourty-six Bottles of Beer on the wall," cr
+." fourty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fourty-five Bottles of Beer on the wall." cr
+." Oh, fourty-five Bottles of Beer on the wall," cr
+." fourty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fourty-four Bottles of Beer on the wall." cr
+." Oh, fourty-four Bottles of Beer on the wall," cr
+." fourty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fourty-three Bottles of Beer on the wall." cr
+." Oh, fourty-three Bottles of Beer on the wall," cr
+." fourty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fourty-two Bottles of Beer on the wall." cr
+." Oh, fourty-two Bottles of Beer on the wall," cr
+." fourty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fourty-one Bottles of Beer on the wall." cr
+." Oh, fourty-one Bottles of Beer on the wall," cr
+." fourty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fourty Bottles of Beer on the wall." cr
+." Oh, fourty Bottles of Beer on the wall," cr
+." fourty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-nine Bottles of Beer on the wall." cr
+." Oh, thirty-nine Bottles of Beer on the wall," cr
+." thirty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-eight Bottles of Beer on the wall." cr
+." Oh, thirty-eight Bottles of Beer on the wall," cr
+." thirty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-seven Bottles of Beer on the wall." cr
+." Oh, thirty-seven Bottles of Beer on the wall," cr
+." thirty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-six Bottles of Beer on the wall." cr
+." Oh, thirty-six Bottles of Beer on the wall," cr
+." thirty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-five Bottles of Beer on the wall." cr
+." Oh, thirty-five Bottles of Beer on the wall," cr
+." thirty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-four Bottles of Beer on the wall." cr
+." Oh, thirty-four Bottles of Beer on the wall," cr
+." thirty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-three Bottles of Beer on the wall." cr
+." Oh, thirty-three Bottles of Beer on the wall," cr
+." thirty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-two Bottles of Beer on the wall." cr
+." Oh, thirty-two Bottles of Beer on the wall," cr
+." thirty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty-one Bottles of Beer on the wall." cr
+." Oh, thirty-one Bottles of Beer on the wall," cr
+." thirty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirty Bottles of Beer on the wall." cr
+." Oh, thirty Bottles of Beer on the wall," cr
+." thirty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-nine Bottles of Beer on the wall." cr
+." Oh, twenty-nine Bottles of Beer on the wall," cr
+." twenty-nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-eight Bottles of Beer on the wall." cr
+." Oh, twenty-eight Bottles of Beer on the wall," cr
+." twenty-eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-seven Bottles of Beer on the wall." cr
+." Oh, twenty-seven Bottles of Beer on the wall," cr
+." twenty-seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-six Bottles of Beer on the wall." cr
+." Oh, twenty-six Bottles of Beer on the wall," cr
+." twenty-six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-five Bottles of Beer on the wall." cr
+." Oh, twenty-five Bottles of Beer on the wall," cr
+." twenty-five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-four Bottles of Beer on the wall." cr
+." Oh, twenty-four Bottles of Beer on the wall," cr
+." twenty-four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-three Bottles of Beer on the wall." cr
+." Oh, twenty-three Bottles of Beer on the wall," cr
+." twenty-three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-two Bottles of Beer on the wall." cr
+." Oh, twenty-two Bottles of Beer on the wall," cr
+." twenty-two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty-one Bottles of Beer on the wall." cr
+." Oh, twenty-one Bottles of Beer on the wall," cr
+." twenty-one Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twenty Bottles of Beer on the wall." cr
+." Oh, twenty Bottles of Beer on the wall," cr
+." twenty Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." nineteen Bottles of Beer on the wall." cr
+." Oh, nineteen Bottles of Beer on the wall," cr
+." nineteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eighteen Bottles of Beer on the wall." cr
+." Oh, eighteen Bottles of Beer on the wall," cr
+." eighteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seventeen Bottles of Beer on the wall." cr
+." Oh, seventeen Bottles of Beer on the wall," cr
+." seventeen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." sixteen Bottles of Beer on the wall." cr
+." Oh, sixteen Bottles of Beer on the wall," cr
+." sixteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fifteen Bottles of Beer on the wall." cr
+." Oh, fifteen Bottles of Beer on the wall," cr
+." fifteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." fourteen Bottles of Beer on the wall." cr
+." Oh, fourteen Bottles of Beer on the wall," cr
+." fourteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." thirteen Bottles of Beer on the wall." cr
+." Oh, thirteen Bottles of Beer on the wall," cr
+." thirteen Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." twelve Bottles of Beer on the wall." cr
+." Oh, twelve Bottles of Beer on the wall," cr
+." twelve Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eleven Bottles of Beer on the wall." cr
+." Oh, eleven Bottles of Beer on the wall," cr
+." eleven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." ten Bottles of Beer on the wall." cr
+." Oh, ten Bottles of Beer on the wall," cr
+." ten Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." nine Bottles of Beer on the wall." cr
+." Oh, nine Bottles of Beer on the wall," cr
+." nine Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." eight Bottles of Beer on the wall." cr
+." Oh, eight Bottles of Beer on the wall," cr
+." eight Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." seven Bottles of Beer on the wall." cr
+." Oh, seven Bottles of Beer on the wall," cr
+." seven Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." six Bottles of Beer on the wall." cr
+." Oh, six Bottles of Beer on the wall," cr
+." six Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." five Bottles of Beer on the wall." cr
+." Oh, five Bottles of Beer on the wall," cr
+." five Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." four Bottles of Beer on the wall." cr
+." Oh, four Bottles of Beer on the wall," cr
+." four Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." three Bottles of Beer on the wall." cr
+." Oh, three Bottles of Beer on the wall," cr
+." three Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." two Bottles of Beer on the wall." cr
+." Oh, two Bottles of Beer on the wall," cr
+." two Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." one Bottle of Beer on the wall." cr
+." Oh, one Bottle of Beer on the wall," cr
+." one Bottle of Beer!," cr
+." Take it down and pass it around..." cr
+." How dry I am! How dry I am!" cr
+." No body knows how dry I am." cr
+." How ... Dry I ... Aaaammm." cr
Added: fcode-utils/testsuite/TokeErrs/TooLargeCase.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeCase.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooLargeCase.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,34 @@
+\ Test whether too-large "Case" statement messes up the Tokenizer.
+\ Body generated by script
+
+
+fcode-version2
+
+headers
+
+: too-large-case ( n -- )
+
+ ." Let's give it a large back-reference too."
+ begin ." We've just begun"
+
+ fload TooLargeCase_body.fth
+
+ ." And here we are!"
+ exit
+ ." Well, we needed some way out!"
+
+ again ." Back to the fuchsia."
+;
+
+\ Let's make a small jump, just to see what normal looks like
+: control-example
+ ." Small non-loop"
+ begin ." Here's the beguine"
+ ." and the way out"
+ exit
+ ." and the jump back"
+ again ." Never do this"
+;
+
+fcode-end
+
Added: fcode-utils/testsuite/TokeErrs/TooLargeCase_body.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeCase_body.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooLargeCase_body.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,1260 @@
+ case
+ 0 of ." Case of 0 " endof
+ 1 of ." Case of 1 " endof
+ 2 of ." Case of 2 " endof
+ 3 of ." Case of 3 " endof
+ 4 of ." Case of 4 " endof
+ 5 of ." Case of 5 " endof
+ 6 of ." Case of 6 " endof
+ 7 of ." Case of 7 " endof
+ 8 of ." Case of 8 " endof
+ 9 of ." Case of 9 " endof
+ 10 of ." Case of 10 " endof
+ 11 of ." Case of 11 " endof
+ 12 of ." Case of 12 " endof
+ 13 of ." Case of 13 " endof
+ 14 of ." Case of 14 " endof
+ 15 of ." Case of 15 " endof
+ 16 of ." Case of 16 " endof
+ 17 of ." Case of 17 " endof
+ 18 of ." Case of 18 " endof
+ 19 of ." Case of 19 " endof
+ 20 of ." Case of 20 " endof
+ 21 of ." Case of 21 " endof
+ 22 of ." Case of 22 " endof
+ 23 of ." Case of 23 " endof
+ 24 of ." Case of 24 " endof
+ 25 of ." Case of 25 " endof
+ 26 of ." Case of 26 " endof
+ 27 of ." Case of 27 " endof
+ 28 of ." Case of 28 " endof
+ 29 of ." Case of 29 " endof
+ 30 of ." Case of 30 " endof
+ 31 of ." Case of 31 " endof
+ 32 of ." Case of 32 " endof
+ 33 of ." Case of 33 " endof
+ 34 of ." Case of 34 " endof
+ 35 of ." Case of 35 " endof
+ 36 of ." Case of 36 " endof
+ 37 of ." Case of 37 " endof
+ 38 of ." Case of 38 " endof
+ 39 of ." Case of 39 " endof
+ 40 of ." Case of 40 " endof
+ 41 of ." Case of 41 " endof
+ 42 of ." Case of 42 " endof
+ 43 of ." Case of 43 " endof
+ 44 of ." Case of 44 " endof
+ 45 of ." Case of 45 " endof
+ 46 of ." Case of 46 " endof
+ 47 of ." Case of 47 " endof
+ 48 of ." Case of 48 " endof
+ 49 of ." Case of 49 " endof
+ 50 of ." Case of 50 " endof
+ 51 of ." Case of 51 " endof
+ 52 of ." Case of 52 " endof
+ 53 of ." Case of 53 " endof
+ 54 of ." Case of 54 " endof
+ 55 of ." Case of 55 " endof
+ 56 of ." Case of 56 " endof
+ 57 of ." Case of 57 " endof
+ 58 of ." Case of 58 " endof
+ 59 of ." Case of 59 " endof
+ 60 of ." Case of 60 " endof
+ 61 of ." Case of 61 " endof
+ 62 of ." Case of 62 " endof
+ 63 of ." Case of 63 " endof
+ 64 of ." Case of 64 " endof
+ 65 of ." Case of 65 " endof
+ 66 of ." Case of 66 " endof
+ 67 of ." Case of 67 " endof
+ 68 of ." Case of 68 " endof
+ 69 of ." Case of 69 " endof
+ 70 of ." Case of 70 " endof
+ 71 of ." Case of 71 " endof
+ 72 of ." Case of 72 " endof
+ 73 of ." Case of 73 " endof
+ 74 of ." Case of 74 " endof
+ 75 of ." Case of 75 " endof
+ 76 of ." Case of 76 " endof
+ 77 of ." Case of 77 " endof
+ 78 of ." Case of 78 " endof
+ 79 of ." Case of 79 " endof
+ 80 of ." Case of 80 " endof
+ 81 of ." Case of 81 " endof
+ 82 of ." Case of 82 " endof
+ 83 of ." Case of 83 " endof
+ 84 of ." Case of 84 " endof
+ 85 of ." Case of 85 " endof
+ 86 of ." Case of 86 " endof
+ 87 of ." Case of 87 " endof
+ 88 of ." Case of 88 " endof
+ 89 of ." Case of 89 " endof
+ 90 of ." Case of 90 " endof
+ 91 of ." Case of 91 " endof
+ 92 of ." Case of 92 " endof
+ 93 of ." Case of 93 " endof
+ 94 of ." Case of 94 " endof
+ 95 of ." Case of 95 " endof
+ 96 of ." Case of 96 " endof
+ 97 of ." Case of 97 " endof
+ 98 of ." Case of 98 " endof
+ 99 of ." Case of 99 " endof
+ 100 of ." Case of 100 " endof
+ 101 of ." Case of 101 " endof
+ 102 of ." Case of 102 " endof
+ 103 of ." Case of 103 " endof
+ 104 of ." Case of 104 " endof
+ 105 of ." Case of 105 " endof
+ 106 of ." Case of 106 " endof
+ 107 of ." Case of 107 " endof
+ 108 of ." Case of 108 " endof
+ 109 of ." Case of 109 " endof
+ 110 of ." Case of 110 " endof
+ 111 of ." Case of 111 " endof
+ 112 of ." Case of 112 " endof
+ 113 of ." Case of 113 " endof
+ 114 of ." Case of 114 " endof
+ 115 of ." Case of 115 " endof
+ 116 of ." Case of 116 " endof
+ 117 of ." Case of 117 " endof
+ 118 of ." Case of 118 " endof
+ 119 of ." Case of 119 " endof
+ 120 of ." Case of 120 " endof
+ 121 of ." Case of 121 " endof
+ 122 of ." Case of 122 " endof
+ 123 of ." Case of 123 " endof
+ 124 of ." Case of 124 " endof
+ 125 of ." Case of 125 " endof
+ 126 of ." Case of 126 " endof
+ 127 of ." Case of 127 " endof
+ 128 of ." Case of 128 " endof
+ 129 of ." Case of 129 " endof
+ 130 of ." Case of 130 " endof
+ 131 of ." Case of 131 " endof
+ 132 of ." Case of 132 " endof
+ 133 of ." Case of 133 " endof
+ 134 of ." Case of 134 " endof
+ 135 of ." Case of 135 " endof
+ 136 of ." Case of 136 " endof
+ 137 of ." Case of 137 " endof
+ 138 of ." Case of 138 " endof
+ 139 of ." Case of 139 " endof
+ 140 of ." Case of 140 " endof
+ 141 of ." Case of 141 " endof
+ 142 of ." Case of 142 " endof
+ 143 of ." Case of 143 " endof
+ 144 of ." Case of 144 " endof
+ 145 of ." Case of 145 " endof
+ 146 of ." Case of 146 " endof
+ 147 of ." Case of 147 " endof
+ 148 of ." Case of 148 " endof
+ 149 of ." Case of 149 " endof
+ 150 of ." Case of 150 " endof
+ 151 of ." Case of 151 " endof
+ 152 of ." Case of 152 " endof
+ 153 of ." Case of 153 " endof
+ 154 of ." Case of 154 " endof
+ 155 of ." Case of 155 " endof
+ 156 of ." Case of 156 " endof
+ 157 of ." Case of 157 " endof
+ 158 of ." Case of 158 " endof
+ 159 of ." Case of 159 " endof
+ 160 of ." Case of 160 " endof
+ 161 of ." Case of 161 " endof
+ 162 of ." Case of 162 " endof
+ 163 of ." Case of 163 " endof
+ 164 of ." Case of 164 " endof
+ 165 of ." Case of 165 " endof
+ 166 of ." Case of 166 " endof
+ 167 of ." Case of 167 " endof
+ 168 of ." Case of 168 " endof
+ 169 of ." Case of 169 " endof
+ 170 of ." Case of 170 " endof
+ 171 of ." Case of 171 " endof
+ 172 of ." Case of 172 " endof
+ 173 of ." Case of 173 " endof
+ 174 of ." Case of 174 " endof
+ 175 of ." Case of 175 " endof
+ 176 of ." Case of 176 " endof
+ 177 of ." Case of 177 " endof
+ 178 of ." Case of 178 " endof
+ 179 of ." Case of 179 " endof
+ 180 of ." Case of 180 " endof
+ 181 of ." Case of 181 " endof
+ 182 of ." Case of 182 " endof
+ 183 of ." Case of 183 " endof
+ 184 of ." Case of 184 " endof
+ 185 of ." Case of 185 " endof
+ 186 of ." Case of 186 " endof
+ 187 of ." Case of 187 " endof
+ 188 of ." Case of 188 " endof
+ 189 of ." Case of 189 " endof
+ 190 of ." Case of 190 " endof
+ 191 of ." Case of 191 " endof
+ 192 of ." Case of 192 " endof
+ 193 of ." Case of 193 " endof
+ 194 of ." Case of 194 " endof
+ 195 of ." Case of 195 " endof
+ 196 of ." Case of 196 " endof
+ 197 of ." Case of 197 " endof
+ 198 of ." Case of 198 " endof
+ 199 of ." Case of 199 " endof
+ 200 of ." Case of 200 " endof
+ 201 of ." Case of 201 " endof
+ 202 of ." Case of 202 " endof
+ 203 of ." Case of 203 " endof
+ 204 of ." Case of 204 " endof
+ 205 of ." Case of 205 " endof
+ 206 of ." Case of 206 " endof
+ 207 of ." Case of 207 " endof
+ 208 of ." Case of 208 " endof
+ 209 of ." Case of 209 " endof
+ 210 of ." Case of 210 " endof
+ 211 of ." Case of 211 " endof
+ 212 of ." Case of 212 " endof
+ 213 of ." Case of 213 " endof
+ 214 of ." Case of 214 " endof
+ 215 of ." Case of 215 " endof
+ 216 of ." Case of 216 " endof
+ 217 of ." Case of 217 " endof
+ 218 of ." Case of 218 " endof
+ 219 of ." Case of 219 " endof
+ 220 of ." Case of 220 " endof
+ 221 of ." Case of 221 " endof
+ 222 of ." Case of 222 " endof
+ 223 of ." Case of 223 " endof
+ 224 of ." Case of 224 " endof
+ 225 of ." Case of 225 " endof
+ 226 of ." Case of 226 " endof
+ 227 of ." Case of 227 " endof
+ 228 of ." Case of 228 " endof
+ 229 of ." Case of 229 " endof
+ 230 of ." Case of 230 " endof
+ 231 of ." Case of 231 " endof
+ 232 of ." Case of 232 " endof
+ 233 of ." Case of 233 " endof
+ 234 of ." Case of 234 " endof
+ 235 of ." Case of 235 " endof
+ 236 of ." Case of 236 " endof
+ 237 of ." Case of 237 " endof
+ 238 of ." Case of 238 " endof
+ 239 of ." Case of 239 " endof
+ 240 of ." Case of 240 " endof
+ 241 of ." Case of 241 " endof
+ 242 of ." Case of 242 " endof
+ 243 of ." Case of 243 " endof
+ 244 of ." Case of 244 " endof
+ 245 of ." Case of 245 " endof
+ 246 of ." Case of 246 " endof
+ 247 of ." Case of 247 " endof
+ 248 of ." Case of 248 " endof
+ 249 of ." Case of 249 " endof
+ 250 of ." Case of 250 " endof
+ 251 of ." Case of 251 " endof
+ 252 of ." Case of 252 " endof
+ 253 of ." Case of 253 " endof
+ 254 of ." Case of 254 " endof
+ 255 of ." Case of 255 " endof
+ 256 of ." Case of 256 " endof
+ 257 of ." Case of 257 " endof
+ 258 of ." Case of 258 " endof
+ 259 of ." Case of 259 " endof
+ 260 of ." Case of 260 " endof
+ 261 of ." Case of 261 " endof
+ 262 of ." Case of 262 " endof
+ 263 of ." Case of 263 " endof
+ 264 of ." Case of 264 " endof
+ 265 of ." Case of 265 " endof
+ 266 of ." Case of 266 " endof
+ 267 of ." Case of 267 " endof
+ 268 of ." Case of 268 " endof
+ 269 of ." Case of 269 " endof
+ 270 of ." Case of 270 " endof
+ 271 of ." Case of 271 " endof
+ 272 of ." Case of 272 " endof
+ 273 of ." Case of 273 " endof
+ 274 of ." Case of 274 " endof
+ 275 of ." Case of 275 " endof
+ 276 of ." Case of 276 " endof
+ 277 of ." Case of 277 " endof
+ 278 of ." Case of 278 " endof
+ 279 of ." Case of 279 " endof
+ 280 of ." Case of 280 " endof
+ 281 of ." Case of 281 " endof
+ 282 of ." Case of 282 " endof
+ 283 of ." Case of 283 " endof
+ 284 of ." Case of 284 " endof
+ 285 of ." Case of 285 " endof
+ 286 of ." Case of 286 " endof
+ 287 of ." Case of 287 " endof
+ 288 of ." Case of 288 " endof
+ 289 of ." Case of 289 " endof
+ 290 of ." Case of 290 " endof
+ 291 of ." Case of 291 " endof
+ 292 of ." Case of 292 " endof
+ 293 of ." Case of 293 " endof
+ 294 of ." Case of 294 " endof
+ 295 of ." Case of 295 " endof
+ 296 of ." Case of 296 " endof
+ 297 of ." Case of 297 " endof
+ 298 of ." Case of 298 " endof
+ 299 of ." Case of 299 " endof
+ 300 of ." Case of 300 " endof
+ 301 of ." Case of 301 " endof
+ 302 of ." Case of 302 " endof
+ 303 of ." Case of 303 " endof
+ 304 of ." Case of 304 " endof
+ 305 of ." Case of 305 " endof
+ 306 of ." Case of 306 " endof
+ 307 of ." Case of 307 " endof
+ 308 of ." Case of 308 " endof
+ 309 of ." Case of 309 " endof
+ 310 of ." Case of 310 " endof
+ 311 of ." Case of 311 " endof
+ 312 of ." Case of 312 " endof
+ 313 of ." Case of 313 " endof
+ 314 of ." Case of 314 " endof
+ 315 of ." Case of 315 " endof
+ 316 of ." Case of 316 " endof
+ 317 of ." Case of 317 " endof
+ 318 of ." Case of 318 " endof
+ 319 of ." Case of 319 " endof
+ 320 of ." Case of 320 " endof
+ 321 of ." Case of 321 " endof
+ 322 of ." Case of 322 " endof
+ 323 of ." Case of 323 " endof
+ 324 of ." Case of 324 " endof
+ 325 of ." Case of 325 " endof
+ 326 of ." Case of 326 " endof
+ 327 of ." Case of 327 " endof
+ 328 of ." Case of 328 " endof
+ 329 of ." Case of 329 " endof
+ 330 of ." Case of 330 " endof
+ 331 of ." Case of 331 " endof
+ 332 of ." Case of 332 " endof
+ 333 of ." Case of 333 " endof
+ 334 of ." Case of 334 " endof
+ 335 of ." Case of 335 " endof
+ 336 of ." Case of 336 " endof
+ 337 of ." Case of 337 " endof
+ 338 of ." Case of 338 " endof
+ 339 of ." Case of 339 " endof
+ 340 of ." Case of 340 " endof
+ 341 of ." Case of 341 " endof
+ 342 of ." Case of 342 " endof
+ 343 of ." Case of 343 " endof
+ 344 of ." Case of 344 " endof
+ 345 of ." Case of 345 " endof
+ 346 of ." Case of 346 " endof
+ 347 of ." Case of 347 " endof
+ 348 of ." Case of 348 " endof
+ 349 of ." Case of 349 " endof
+ 350 of ." Case of 350 " endof
+ 351 of ." Case of 351 " endof
+ 352 of ." Case of 352 " endof
+ 353 of ." Case of 353 " endof
+ 354 of ." Case of 354 " endof
+ 355 of ." Case of 355 " endof
+ 356 of ." Case of 356 " endof
+ 357 of ." Case of 357 " endof
+ 358 of ." Case of 358 " endof
+ 359 of ." Case of 359 " endof
+ 360 of ." Case of 360 " endof
+ 361 of ." Case of 361 " endof
+ 362 of ." Case of 362 " endof
+ 363 of ." Case of 363 " endof
+ 364 of ." Case of 364 " endof
+ 365 of ." Case of 365 " endof
+ 366 of ." Case of 366 " endof
+ 367 of ." Case of 367 " endof
+ 368 of ." Case of 368 " endof
+ 369 of ." Case of 369 " endof
+ 370 of ." Case of 370 " endof
+ 371 of ." Case of 371 " endof
+ 372 of ." Case of 372 " endof
+ 373 of ." Case of 373 " endof
+ 374 of ." Case of 374 " endof
+ 375 of ." Case of 375 " endof
+ 376 of ." Case of 376 " endof
+ 377 of ." Case of 377 " endof
+ 378 of ." Case of 378 " endof
+ 379 of ." Case of 379 " endof
+ 380 of ." Case of 380 " endof
+ 381 of ." Case of 381 " endof
+ 382 of ." Case of 382 " endof
+ 383 of ." Case of 383 " endof
+ 384 of ." Case of 384 " endof
+ 385 of ." Case of 385 " endof
+ 386 of ." Case of 386 " endof
+ 387 of ." Case of 387 " endof
+ 388 of ." Case of 388 " endof
+ 389 of ." Case of 389 " endof
+ 390 of ." Case of 390 " endof
+ 391 of ." Case of 391 " endof
+ 392 of ." Case of 392 " endof
+ 393 of ." Case of 393 " endof
+ 394 of ." Case of 394 " endof
+ 395 of ." Case of 395 " endof
+ 396 of ." Case of 396 " endof
+ 397 of ." Case of 397 " endof
+ 398 of ." Case of 398 " endof
+ 399 of ." Case of 399 " endof
+ 400 of ." Case of 400 " endof
+ 401 of ." Case of 401 " endof
+ 402 of ." Case of 402 " endof
+ 403 of ." Case of 403 " endof
+ 404 of ." Case of 404 " endof
+ 405 of ." Case of 405 " endof
+ 406 of ." Case of 406 " endof
+ 407 of ." Case of 407 " endof
+ 408 of ." Case of 408 " endof
+ 409 of ." Case of 409 " endof
+ 410 of ." Case of 410 " endof
+ 411 of ." Case of 411 " endof
+ 412 of ." Case of 412 " endof
+ 413 of ." Case of 413 " endof
+ 414 of ." Case of 414 " endof
+ 415 of ." Case of 415 " endof
+ 416 of ." Case of 416 " endof
+ 417 of ." Case of 417 " endof
+ 418 of ." Case of 418 " endof
+ 419 of ." Case of 419 " endof
+ 420 of ." Case of 420 " endof
+ 421 of ." Case of 421 " endof
+ 422 of ." Case of 422 " endof
+ 423 of ." Case of 423 " endof
+ 424 of ." Case of 424 " endof
+ 425 of ." Case of 425 " endof
+ 426 of ." Case of 426 " endof
+ 427 of ." Case of 427 " endof
+ 428 of ." Case of 428 " endof
+ 429 of ." Case of 429 " endof
+ 430 of ." Case of 430 " endof
+ 431 of ." Case of 431 " endof
+ 432 of ." Case of 432 " endof
+ 433 of ." Case of 433 " endof
+ 434 of ." Case of 434 " endof
+ 435 of ." Case of 435 " endof
+ 436 of ." Case of 436 " endof
+ 437 of ." Case of 437 " endof
+ 438 of ." Case of 438 " endof
+ 439 of ." Case of 439 " endof
+ 440 of ." Case of 440 " endof
+ 441 of ." Case of 441 " endof
+ 442 of ." Case of 442 " endof
+ 443 of ." Case of 443 " endof
+ 444 of ." Case of 444 " endof
+ 445 of ." Case of 445 " endof
+ 446 of ." Case of 446 " endof
+ 447 of ." Case of 447 " endof
+ 448 of ." Case of 448 " endof
+ 449 of ." Case of 449 " endof
+ 450 of ." Case of 450 " endof
+ 451 of ." Case of 451 " endof
+ 452 of ." Case of 452 " endof
+ 453 of ." Case of 453 " endof
+ 454 of ." Case of 454 " endof
+ 455 of ." Case of 455 " endof
+ 456 of ." Case of 456 " endof
+ 457 of ." Case of 457 " endof
+ 458 of ." Case of 458 " endof
+ 459 of ." Case of 459 " endof
+ 460 of ." Case of 460 " endof
+ 461 of ." Case of 461 " endof
+ 462 of ." Case of 462 " endof
+ 463 of ." Case of 463 " endof
+ 464 of ." Case of 464 " endof
+ 465 of ." Case of 465 " endof
+ 466 of ." Case of 466 " endof
+ 467 of ." Case of 467 " endof
+ 468 of ." Case of 468 " endof
+ 469 of ." Case of 469 " endof
+ 470 of ." Case of 470 " endof
+ 471 of ." Case of 471 " endof
+ 472 of ." Case of 472 " endof
+ 473 of ." Case of 473 " endof
+ 474 of ." Case of 474 " endof
+ 475 of ." Case of 475 " endof
+ 476 of ." Case of 476 " endof
+ 477 of ." Case of 477 " endof
+ 478 of ." Case of 478 " endof
+ 479 of ." Case of 479 " endof
+ 480 of ." Case of 480 " endof
+ 481 of ." Case of 481 " endof
+ 482 of ." Case of 482 " endof
+ 483 of ." Case of 483 " endof
+ 484 of ." Case of 484 " endof
+ 485 of ." Case of 485 " endof
+ 486 of ." Case of 486 " endof
+ 487 of ." Case of 487 " endof
+ 488 of ." Case of 488 " endof
+ 489 of ." Case of 489 " endof
+ 490 of ." Case of 490 " endof
+ 491 of ." Case of 491 " endof
+ 492 of ." Case of 492 " endof
+ 493 of ." Case of 493 " endof
+ 494 of ." Case of 494 " endof
+ 495 of ." Case of 495 " endof
+ 496 of ." Case of 496 " endof
+ 497 of ." Case of 497 " endof
+ 498 of ." Case of 498 " endof
+ 499 of ." Case of 499 " endof
+ 500 of ." Case of 500 " endof
+ 501 of ." Case of 501 " endof
+ 502 of ." Case of 502 " endof
+ 503 of ." Case of 503 " endof
+ 504 of ." Case of 504 " endof
+ 505 of ." Case of 505 " endof
+ 506 of ." Case of 506 " endof
+ 507 of ." Case of 507 " endof
+ 508 of ." Case of 508 " endof
+ 509 of ." Case of 509 " endof
+ 510 of ." Case of 510 " endof
+ 511 of ." Case of 511 " endof
+ 512 of ." Case of 512 " endof
+ 513 of ." Case of 513 " endof
+ 514 of ." Case of 514 " endof
+ 515 of ." Case of 515 " endof
+ 516 of ." Case of 516 " endof
+ 517 of ." Case of 517 " endof
+ 518 of ." Case of 518 " endof
+ 519 of ." Case of 519 " endof
+ 520 of ." Case of 520 " endof
+ 521 of ." Case of 521 " endof
+ 522 of ." Case of 522 " endof
+ 523 of ." Case of 523 " endof
+ 524 of ." Case of 524 " endof
+ 525 of ." Case of 525 " endof
+ 526 of ." Case of 526 " endof
+ 527 of ." Case of 527 " endof
+ 528 of ." Case of 528 " endof
+ 529 of ." Case of 529 " endof
+ 530 of ." Case of 530 " endof
+ 531 of ." Case of 531 " endof
+ 532 of ." Case of 532 " endof
+ 533 of ." Case of 533 " endof
+ 534 of ." Case of 534 " endof
+ 535 of ." Case of 535 " endof
+ 536 of ." Case of 536 " endof
+ 537 of ." Case of 537 " endof
+ 538 of ." Case of 538 " endof
+ 539 of ." Case of 539 " endof
+ 540 of ." Case of 540 " endof
+ 541 of ." Case of 541 " endof
+ 542 of ." Case of 542 " endof
+ 543 of ." Case of 543 " endof
+ 544 of ." Case of 544 " endof
+ 545 of ." Case of 545 " endof
+ 546 of ." Case of 546 " endof
+ 547 of ." Case of 547 " endof
+ 548 of ." Case of 548 " endof
+ 549 of ." Case of 549 " endof
+ 550 of ." Case of 550 " endof
+ 551 of ." Case of 551 " endof
+ 552 of ." Case of 552 " endof
+ 553 of ." Case of 553 " endof
+ 554 of ." Case of 554 " endof
+ 555 of ." Case of 555 " endof
+ 556 of ." Case of 556 " endof
+ 557 of ." Case of 557 " endof
+ 558 of ." Case of 558 " endof
+ 559 of ." Case of 559 " endof
+ 560 of ." Case of 560 " endof
+ 561 of ." Case of 561 " endof
+ 562 of ." Case of 562 " endof
+ 563 of ." Case of 563 " endof
+ 564 of ." Case of 564 " endof
+ 565 of ." Case of 565 " endof
+ 566 of ." Case of 566 " endof
+ 567 of ." Case of 567 " endof
+ 568 of ." Case of 568 " endof
+ 569 of ." Case of 569 " endof
+ 570 of ." Case of 570 " endof
+ 571 of ." Case of 571 " endof
+ 572 of ." Case of 572 " endof
+ 573 of ." Case of 573 " endof
+ 574 of ." Case of 574 " endof
+ 575 of ." Case of 575 " endof
+ 576 of ." Case of 576 " endof
+ 577 of ." Case of 577 " endof
+ 578 of ." Case of 578 " endof
+ 579 of ." Case of 579 " endof
+ 580 of ." Case of 580 " endof
+ 581 of ." Case of 581 " endof
+ 582 of ." Case of 582 " endof
+ 583 of ." Case of 583 " endof
+ 584 of ." Case of 584 " endof
+ 585 of ." Case of 585 " endof
+ 586 of ." Case of 586 " endof
+ 587 of ." Case of 587 " endof
+ 588 of ." Case of 588 " endof
+ 589 of ." Case of 589 " endof
+ 590 of ." Case of 590 " endof
+ 591 of ." Case of 591 " endof
+ 592 of ." Case of 592 " endof
+ 593 of ." Case of 593 " endof
+ 594 of ." Case of 594 " endof
+ 595 of ." Case of 595 " endof
+ 596 of ." Case of 596 " endof
+ 597 of ." Case of 597 " endof
+ 598 of ." Case of 598 " endof
+ 599 of ." Case of 599 " endof
+ 600 of ." Case of 600 " endof
+ 601 of ." Case of 601 " endof
+ 602 of ." Case of 602 " endof
+ 603 of ." Case of 603 " endof
+ 604 of ." Case of 604 " endof
+ 605 of ." Case of 605 " endof
+ 606 of ." Case of 606 " endof
+ 607 of ." Case of 607 " endof
+ 608 of ." Case of 608 " endof
+ 609 of ." Case of 609 " endof
+ 610 of ." Case of 610 " endof
+ 611 of ." Case of 611 " endof
+ 612 of ." Case of 612 " endof
+ 613 of ." Case of 613 " endof
+ 614 of ." Case of 614 " endof
+ 615 of ." Case of 615 " endof
+ 616 of ." Case of 616 " endof
+ 617 of ." Case of 617 " endof
+ 618 of ." Case of 618 " endof
+ 619 of ." Case of 619 " endof
+ 620 of ." Case of 620 " endof
+ 621 of ." Case of 621 " endof
+ 622 of ." Case of 622 " endof
+ 623 of ." Case of 623 " endof
+ 624 of ." Case of 624 " endof
+ 625 of ." Case of 625 " endof
+ 626 of ." Case of 626 " endof
+ 627 of ." Case of 627 " endof
+ 628 of ." Case of 628 " endof
+ 629 of ." Case of 629 " endof
+ 630 of ." Case of 630 " endof
+ 631 of ." Case of 631 " endof
+ 632 of ." Case of 632 " endof
+ 633 of ." Case of 633 " endof
+ 634 of ." Case of 634 " endof
+ 635 of ." Case of 635 " endof
+ 636 of ." Case of 636 " endof
+ 637 of ." Case of 637 " endof
+ 638 of ." Case of 638 " endof
+ 639 of ." Case of 639 " endof
+ 640 of ." Case of 640 " endof
+ 641 of ." Case of 641 " endof
+ 642 of ." Case of 642 " endof
+ 643 of ." Case of 643 " endof
+ 644 of ." Case of 644 " endof
+ 645 of ." Case of 645 " endof
+ 646 of ." Case of 646 " endof
+ 647 of ." Case of 647 " endof
+ 648 of ." Case of 648 " endof
+ 649 of ." Case of 649 " endof
+ 650 of ." Case of 650 " endof
+ 651 of ." Case of 651 " endof
+ 652 of ." Case of 652 " endof
+ 653 of ." Case of 653 " endof
+ 654 of ." Case of 654 " endof
+ 655 of ." Case of 655 " endof
+ 656 of ." Case of 656 " endof
+ 657 of ." Case of 657 " endof
+ 658 of ." Case of 658 " endof
+ 659 of ." Case of 659 " endof
+ 660 of ." Case of 660 " endof
+ 661 of ." Case of 661 " endof
+ 662 of ." Case of 662 " endof
+ 663 of ." Case of 663 " endof
+ 664 of ." Case of 664 " endof
+ 665 of ." Case of 665 " endof
+ 666 of ." Case of 666 " endof
+ 667 of ." Case of 667 " endof
+ 668 of ." Case of 668 " endof
+ 669 of ." Case of 669 " endof
+ 670 of ." Case of 670 " endof
+ 671 of ." Case of 671 " endof
+ 672 of ." Case of 672 " endof
+ 673 of ." Case of 673 " endof
+ 674 of ." Case of 674 " endof
+ 675 of ." Case of 675 " endof
+ 676 of ." Case of 676 " endof
+ 677 of ." Case of 677 " endof
+ 678 of ." Case of 678 " endof
+ 679 of ." Case of 679 " endof
+ 680 of ." Case of 680 " endof
+ 681 of ." Case of 681 " endof
+ 682 of ." Case of 682 " endof
+ 683 of ." Case of 683 " endof
+ 684 of ." Case of 684 " endof
+ 685 of ." Case of 685 " endof
+ 686 of ." Case of 686 " endof
+ 687 of ." Case of 687 " endof
+ 688 of ." Case of 688 " endof
+ 689 of ." Case of 689 " endof
+ 690 of ." Case of 690 " endof
+ 691 of ." Case of 691 " endof
+ 692 of ." Case of 692 " endof
+ 693 of ." Case of 693 " endof
+ 694 of ." Case of 694 " endof
+ 695 of ." Case of 695 " endof
+ 696 of ." Case of 696 " endof
+ 697 of ." Case of 697 " endof
+ 698 of ." Case of 698 " endof
+ 699 of ." Case of 699 " endof
+ 700 of ." Case of 700 " endof
+ 701 of ." Case of 701 " endof
+ 702 of ." Case of 702 " endof
+ 703 of ." Case of 703 " endof
+ 704 of ." Case of 704 " endof
+ 705 of ." Case of 705 " endof
+ 706 of ." Case of 706 " endof
+ 707 of ." Case of 707 " endof
+ 708 of ." Case of 708 " endof
+ 709 of ." Case of 709 " endof
+ 710 of ." Case of 710 " endof
+ 711 of ." Case of 711 " endof
+ 712 of ." Case of 712 " endof
+ 713 of ." Case of 713 " endof
+ 714 of ." Case of 714 " endof
+ 715 of ." Case of 715 " endof
+ 716 of ." Case of 716 " endof
+ 717 of ." Case of 717 " endof
+ 718 of ." Case of 718 " endof
+ 719 of ." Case of 719 " endof
+ 720 of ." Case of 720 " endof
+ 721 of ." Case of 721 " endof
+ 722 of ." Case of 722 " endof
+ 723 of ." Case of 723 " endof
+ 724 of ." Case of 724 " endof
+ 725 of ." Case of 725 " endof
+ 726 of ." Case of 726 " endof
+ 727 of ." Case of 727 " endof
+ 728 of ." Case of 728 " endof
+ 729 of ." Case of 729 " endof
+ 730 of ." Case of 730 " endof
+ 731 of ." Case of 731 " endof
+ 732 of ." Case of 732 " endof
+ 733 of ." Case of 733 " endof
+ 734 of ." Case of 734 " endof
+ 735 of ." Case of 735 " endof
+ 736 of ." Case of 736 " endof
+ 737 of ." Case of 737 " endof
+ 738 of ." Case of 738 " endof
+ 739 of ." Case of 739 " endof
+ 740 of ." Case of 740 " endof
+ 741 of ." Case of 741 " endof
+ 742 of ." Case of 742 " endof
+ 743 of ." Case of 743 " endof
+ 744 of ." Case of 744 " endof
+ 745 of ." Case of 745 " endof
+ 746 of ." Case of 746 " endof
+ 747 of ." Case of 747 " endof
+ 748 of ." Case of 748 " endof
+ 749 of ." Case of 749 " endof
+ 750 of ." Case of 750 " endof
+ 751 of ." Case of 751 " endof
+ 752 of ." Case of 752 " endof
+ 753 of ." Case of 753 " endof
+ 754 of ." Case of 754 " endof
+ 755 of ." Case of 755 " endof
+ 756 of ." Case of 756 " endof
+ 757 of ." Case of 757 " endof
+ 758 of ." Case of 758 " endof
+ 759 of ." Case of 759 " endof
+ 760 of ." Case of 760 " endof
+ 761 of ." Case of 761 " endof
+ 762 of ." Case of 762 " endof
+ 763 of ." Case of 763 " endof
+ 764 of ." Case of 764 " endof
+ 765 of ." Case of 765 " endof
+ 766 of ." Case of 766 " endof
+ 767 of ." Case of 767 " endof
+ 768 of ." Case of 768 " endof
+ 769 of ." Case of 769 " endof
+ 770 of ." Case of 770 " endof
+ 771 of ." Case of 771 " endof
+ 772 of ." Case of 772 " endof
+ 773 of ." Case of 773 " endof
+ 774 of ." Case of 774 " endof
+ 775 of ." Case of 775 " endof
+ 776 of ." Case of 776 " endof
+ 777 of ." Case of 777 " endof
+ 778 of ." Case of 778 " endof
+ 779 of ." Case of 779 " endof
+ 780 of ." Case of 780 " endof
+ 781 of ." Case of 781 " endof
+ 782 of ." Case of 782 " endof
+ 783 of ." Case of 783 " endof
+ 784 of ." Case of 784 " endof
+ 785 of ." Case of 785 " endof
+ 786 of ." Case of 786 " endof
+ 787 of ." Case of 787 " endof
+ 788 of ." Case of 788 " endof
+ 789 of ." Case of 789 " endof
+ 790 of ." Case of 790 " endof
+ 791 of ." Case of 791 " endof
+ 792 of ." Case of 792 " endof
+ 793 of ." Case of 793 " endof
+ 794 of ." Case of 794 " endof
+ 795 of ." Case of 795 " endof
+ 796 of ." Case of 796 " endof
+ 797 of ." Case of 797 " endof
+ 798 of ." Case of 798 " endof
+ 799 of ." Case of 799 " endof
+ 800 of ." Case of 800 " endof
+ 801 of ." Case of 801 " endof
+ 802 of ." Case of 802 " endof
+ 803 of ." Case of 803 " endof
+ 804 of ." Case of 804 " endof
+ 805 of ." Case of 805 " endof
+ 806 of ." Case of 806 " endof
+ 807 of ." Case of 807 " endof
+ 808 of ." Case of 808 " endof
+ 809 of ." Case of 809 " endof
+ 810 of ." Case of 810 " endof
+ 811 of ." Case of 811 " endof
+ 812 of ." Case of 812 " endof
+ 813 of ." Case of 813 " endof
+ 814 of ." Case of 814 " endof
+ 815 of ." Case of 815 " endof
+ 816 of ." Case of 816 " endof
+ 817 of ." Case of 817 " endof
+ 818 of ." Case of 818 " endof
+ 819 of ." Case of 819 " endof
+ 820 of ." Case of 820 " endof
+ 821 of ." Case of 821 " endof
+ 822 of ." Case of 822 " endof
+ 823 of ." Case of 823 " endof
+ 824 of ." Case of 824 " endof
+ 825 of ." Case of 825 " endof
+ 826 of ." Case of 826 " endof
+ 827 of ." Case of 827 " endof
+ 828 of ." Case of 828 " endof
+ 829 of ." Case of 829 " endof
+ 830 of ." Case of 830 " endof
+ 831 of ." Case of 831 " endof
+ 832 of ." Case of 832 " endof
+ 833 of ." Case of 833 " endof
+ 834 of ." Case of 834 " endof
+ 835 of ." Case of 835 " endof
+ 836 of ." Case of 836 " endof
+ 837 of ." Case of 837 " endof
+ 838 of ." Case of 838 " endof
+ 839 of ." Case of 839 " endof
+ 840 of ." Case of 840 " endof
+ 841 of ." Case of 841 " endof
+ 842 of ." Case of 842 " endof
+ 843 of ." Case of 843 " endof
+ 844 of ." Case of 844 " endof
+ 845 of ." Case of 845 " endof
+ 846 of ." Case of 846 " endof
+ 847 of ." Case of 847 " endof
+ 848 of ." Case of 848 " endof
+ 849 of ." Case of 849 " endof
+ 850 of ." Case of 850 " endof
+ 851 of ." Case of 851 " endof
+ 852 of ." Case of 852 " endof
+ 853 of ." Case of 853 " endof
+ 854 of ." Case of 854 " endof
+ 855 of ." Case of 855 " endof
+ 856 of ." Case of 856 " endof
+ 857 of ." Case of 857 " endof
+ 858 of ." Case of 858 " endof
+ 859 of ." Case of 859 " endof
+ 860 of ." Case of 860 " endof
+ 861 of ." Case of 861 " endof
+ 862 of ." Case of 862 " endof
+ 863 of ." Case of 863 " endof
+ 864 of ." Case of 864 " endof
+ 865 of ." Case of 865 " endof
+ 866 of ." Case of 866 " endof
+ 867 of ." Case of 867 " endof
+ 868 of ." Case of 868 " endof
+ 869 of ." Case of 869 " endof
+ 870 of ." Case of 870 " endof
+ 871 of ." Case of 871 " endof
+ 872 of ." Case of 872 " endof
+ 873 of ." Case of 873 " endof
+ 874 of ." Case of 874 " endof
+ 875 of ." Case of 875 " endof
+ 876 of ." Case of 876 " endof
+ 877 of ." Case of 877 " endof
+ 878 of ." Case of 878 " endof
+ 879 of ." Case of 879 " endof
+ 880 of ." Case of 880 " endof
+ 881 of ." Case of 881 " endof
+ 882 of ." Case of 882 " endof
+ 883 of ." Case of 883 " endof
+ 884 of ." Case of 884 " endof
+ 885 of ." Case of 885 " endof
+ 886 of ." Case of 886 " endof
+ 887 of ." Case of 887 " endof
+ 888 of ." Case of 888 " endof
+ 889 of ." Case of 889 " endof
+ 890 of ." Case of 890 " endof
+ 891 of ." Case of 891 " endof
+ 892 of ." Case of 892 " endof
+ 893 of ." Case of 893 " endof
+ 894 of ." Case of 894 " endof
+ 895 of ." Case of 895 " endof
+ 896 of ." Case of 896 " endof
+ 897 of ." Case of 897 " endof
+ 898 of ." Case of 898 " endof
+ 899 of ." Case of 899 " endof
+ 900 of ." Case of 900 " endof
+ 901 of ." Case of 901 " endof
+ 902 of ." Case of 902 " endof
+ 903 of ." Case of 903 " endof
+ 904 of ." Case of 904 " endof
+ 905 of ." Case of 905 " endof
+ 906 of ." Case of 906 " endof
+ 907 of ." Case of 907 " endof
+ 908 of ." Case of 908 " endof
+ 909 of ." Case of 909 " endof
+ 910 of ." Case of 910 " endof
+ 911 of ." Case of 911 " endof
+ 912 of ." Case of 912 " endof
+ 913 of ." Case of 913 " endof
+ 914 of ." Case of 914 " endof
+ 915 of ." Case of 915 " endof
+ 916 of ." Case of 916 " endof
+ 917 of ." Case of 917 " endof
+ 918 of ." Case of 918 " endof
+ 919 of ." Case of 919 " endof
+ 920 of ." Case of 920 " endof
+ 921 of ." Case of 921 " endof
+ 922 of ." Case of 922 " endof
+ 923 of ." Case of 923 " endof
+ 924 of ." Case of 924 " endof
+ 925 of ." Case of 925 " endof
+ 926 of ." Case of 926 " endof
+ 927 of ." Case of 927 " endof
+ 928 of ." Case of 928 " endof
+ 929 of ." Case of 929 " endof
+ 930 of ." Case of 930 " endof
+ 931 of ." Case of 931 " endof
+ 932 of ." Case of 932 " endof
+ 933 of ." Case of 933 " endof
+ 934 of ." Case of 934 " endof
+ 935 of ." Case of 935 " endof
+ 936 of ." Case of 936 " endof
+ 937 of ." Case of 937 " endof
+ 938 of ." Case of 938 " endof
+ 939 of ." Case of 939 " endof
+ 940 of ." Case of 940 " endof
+ 941 of ." Case of 941 " endof
+ 942 of ." Case of 942 " endof
+ 943 of ." Case of 943 " endof
+ 944 of ." Case of 944 " endof
+ 945 of ." Case of 945 " endof
+ 946 of ." Case of 946 " endof
+ 947 of ." Case of 947 " endof
+ 948 of ." Case of 948 " endof
+ 949 of ." Case of 949 " endof
+ 950 of ." Case of 950 " endof
+ 951 of ." Case of 951 " endof
+ 952 of ." Case of 952 " endof
+ 953 of ." Case of 953 " endof
+ 954 of ." Case of 954 " endof
+ 955 of ." Case of 955 " endof
+ 956 of ." Case of 956 " endof
+ 957 of ." Case of 957 " endof
+ 958 of ." Case of 958 " endof
+ 959 of ." Case of 959 " endof
+ 960 of ." Case of 960 " endof
+ 961 of ." Case of 961 " endof
+ 962 of ." Case of 962 " endof
+ 963 of ." Case of 963 " endof
+ 964 of ." Case of 964 " endof
+ 965 of ." Case of 965 " endof
+ 966 of ." Case of 966 " endof
+ 967 of ." Case of 967 " endof
+ 968 of ." Case of 968 " endof
+ 969 of ." Case of 969 " endof
+ 970 of ." Case of 970 " endof
+ 971 of ." Case of 971 " endof
+ 972 of ." Case of 972 " endof
+ 973 of ." Case of 973 " endof
+ 974 of ." Case of 974 " endof
+ 975 of ." Case of 975 " endof
+ 976 of ." Case of 976 " endof
+ 977 of ." Case of 977 " endof
+ 978 of ." Case of 978 " endof
+ 979 of ." Case of 979 " endof
+ 980 of ." Case of 980 " endof
+ 981 of ." Case of 981 " endof
+ 982 of ." Case of 982 " endof
+ 983 of ." Case of 983 " endof
+ 984 of ." Case of 984 " endof
+ 985 of ." Case of 985 " endof
+ 986 of ." Case of 986 " endof
+ 987 of ." Case of 987 " endof
+ 988 of ." Case of 988 " endof
+ 989 of ." Case of 989 " endof
+ 990 of ." Case of 990 " endof
+ 991 of ." Case of 991 " endof
+ 992 of ." Case of 992 " endof
+ 993 of ." Case of 993 " endof
+ 994 of ." Case of 994 " endof
+ 995 of ." Case of 995 " endof
+ 996 of ." Case of 996 " endof
+ 997 of ." Case of 997 " endof
+ 998 of ." Case of 998 " endof
+ 999 of ." Case of 999 " endof
+ 1000 of ." Case of 1000 " endof
+ 1001 of ." Case of 1001 " endof
+ 1002 of ." Case of 1002 " endof
+ 1003 of ." Case of 1003 " endof
+ 1004 of ." Case of 1004 " endof
+ 1005 of ." Case of 1005 " endof
+ 1006 of ." Case of 1006 " endof
+ 1007 of ." Case of 1007 " endof
+ 1008 of ." Case of 1008 " endof
+ 1009 of ." Case of 1009 " endof
+ 1010 of ." Case of 1010 " endof
+ 1011 of ." Case of 1011 " endof
+ 1012 of ." Case of 1012 " endof
+ 1013 of ." Case of 1013 " endof
+ 1014 of ." Case of 1014 " endof
+ 1015 of ." Case of 1015 " endof
+ 1016 of ." Case of 1016 " endof
+ 1017 of ." Case of 1017 " endof
+ 1018 of ." Case of 1018 " endof
+ 1019 of ." Case of 1019 " endof
+ 1020 of ." Case of 1020 " endof
+ 1021 of ." Case of 1021 " endof
+ 1022 of ." Case of 1022 " endof
+ 1023 of ." Case of 1023 " endof
+ 1024 of ." Case of 1024 " endof
+ 1025 of ." Case of 1025 " endof
+ 1026 of ." Case of 1026 " endof
+ 1027 of ." Case of 1027 " endof
+ 1028 of ." Case of 1028 " endof
+ 1029 of ." Case of 1029 " endof
+ 1030 of ." Case of 1030 " endof
+ 1031 of ." Case of 1031 " endof
+ 1032 of ." Case of 1032 " endof
+ 1033 of ." Case of 1033 " endof
+ 1034 of ." Case of 1034 " endof
+ 1035 of ." Case of 1035 " endof
+ 1036 of ." Case of 1036 " endof
+ 1037 of ." Case of 1037 " endof
+ 1038 of ." Case of 1038 " endof
+ 1039 of ." Case of 1039 " endof
+ 1040 of ." Case of 1040 " endof
+ 1041 of ." Case of 1041 " endof
+ 1042 of ." Case of 1042 " endof
+ 1043 of ." Case of 1043 " endof
+ 1044 of ." Case of 1044 " endof
+ 1045 of ." Case of 1045 " endof
+ 1046 of ." Case of 1046 " endof
+ 1047 of ." Case of 1047 " endof
+ 1048 of ." Case of 1048 " endof
+ 1049 of ." Case of 1049 " endof
+ 1050 of ." Case of 1050 " endof
+ 1051 of ." Case of 1051 " endof
+ 1052 of ." Case of 1052 " endof
+ 1053 of ." Case of 1053 " endof
+ 1054 of ." Case of 1054 " endof
+ 1055 of ." Case of 1055 " endof
+ 1056 of ." Case of 1056 " endof
+ 1057 of ." Case of 1057 " endof
+ 1058 of ." Case of 1058 " endof
+ 1059 of ." Case of 1059 " endof
+ 1060 of ." Case of 1060 " endof
+ 1061 of ." Case of 1061 " endof
+ 1062 of ." Case of 1062 " endof
+ 1063 of ." Case of 1063 " endof
+ 1064 of ." Case of 1064 " endof
+ 1065 of ." Case of 1065 " endof
+ 1066 of ." Case of 1066 " endof
+ 1067 of ." Case of 1067 " endof
+ 1068 of ." Case of 1068 " endof
+ 1069 of ." Case of 1069 " endof
+ 1070 of ." Case of 1070 " endof
+ 1071 of ." Case of 1071 " endof
+ 1072 of ." Case of 1072 " endof
+ 1073 of ." Case of 1073 " endof
+ 1074 of ." Case of 1074 " endof
+ 1075 of ." Case of 1075 " endof
+ 1076 of ." Case of 1076 " endof
+ 1077 of ." Case of 1077 " endof
+ 1078 of ." Case of 1078 " endof
+ 1079 of ." Case of 1079 " endof
+ 1080 of ." Case of 1080 " endof
+ 1081 of ." Case of 1081 " endof
+ 1082 of ." Case of 1082 " endof
+ 1083 of ." Case of 1083 " endof
+ 1084 of ." Case of 1084 " endof
+ 1085 of ." Case of 1085 " endof
+ 1086 of ." Case of 1086 " endof
+ 1087 of ." Case of 1087 " endof
+ 1088 of ." Case of 1088 " endof
+ 1089 of ." Case of 1089 " endof
+ 1090 of ." Case of 1090 " endof
+ 1091 of ." Case of 1091 " endof
+ 1092 of ." Case of 1092 " endof
+ 1093 of ." Case of 1093 " endof
+ 1094 of ." Case of 1094 " endof
+ 1095 of ." Case of 1095 " endof
+ 1096 of ." Case of 1096 " endof
+ 1097 of ." Case of 1097 " endof
+ 1098 of ." Case of 1098 " endof
+ 1099 of ." Case of 1099 " endof
+ 1100 of ." Case of 1100 " endof
+ 1101 of ." Case of 1101 " endof
+ 1102 of ." Case of 1102 " endof
+ 1103 of ." Case of 1103 " endof
+ 1104 of ." Case of 1104 " endof
+ 1105 of ." Case of 1105 " endof
+ 1106 of ." Case of 1106 " endof
+ 1107 of ." Case of 1107 " endof
+ 1108 of ." Case of 1108 " endof
+ 1109 of ." Case of 1109 " endof
+ 1110 of ." Case of 1110 " endof
+ 1111 of ." Case of 1111 " endof
+ 1112 of ." Case of 1112 " endof
+ 1113 of ." Case of 1113 " endof
+ 1114 of ." Case of 1114 " endof
+ 1115 of ." Case of 1115 " endof
+ 1116 of ." Case of 1116 " endof
+ 1117 of ." Case of 1117 " endof
+ 1118 of ." Case of 1118 " endof
+ 1119 of ." Case of 1119 " endof
+ 1120 of ." Case of 1120 " endof
+ 1121 of ." Case of 1121 " endof
+ 1122 of ." Case of 1122 " endof
+ 1123 of ." Case of 1123 " endof
+ 1124 of ." Case of 1124 " endof
+ 1125 of ." Case of 1125 " endof
+ 1126 of ." Case of 1126 " endof
+ 1127 of ." Case of 1127 " endof
+ 1128 of ." Case of 1128 " endof
+ 1129 of ." Case of 1129 " endof
+ 1130 of ." Case of 1130 " endof
+ 1131 of ." Case of 1131 " endof
+ 1132 of ." Case of 1132 " endof
+ 1133 of ." Case of 1133 " endof
+ 1134 of ." Case of 1134 " endof
+ 1135 of ." Case of 1135 " endof
+ 1136 of ." Case of 1136 " endof
+ 1137 of ." Case of 1137 " endof
+ 1138 of ." Case of 1138 " endof
+ 1139 of ." Case of 1139 " endof
+ 1140 of ." Case of 1140 " endof
+ 1141 of ." Case of 1141 " endof
+ 1142 of ." Case of 1142 " endof
+ 1143 of ." Case of 1143 " endof
+ 1144 of ." Case of 1144 " endof
+ 1145 of ." Case of 1145 " endof
+ 1146 of ." Case of 1146 " endof
+ 1147 of ." Case of 1147 " endof
+ 1148 of ." Case of 1148 " endof
+ 1149 of ." Case of 1149 " endof
+ 1150 of ." Case of 1150 " endof
+ 1151 of ." Case of 1151 " endof
+ 1152 of ." Case of 1152 " endof
+ 1153 of ." Case of 1153 " endof
+ 1154 of ." Case of 1154 " endof
+ 1155 of ." Case of 1155 " endof
+ 1156 of ." Case of 1156 " endof
+ 1157 of ." Case of 1157 " endof
+ 1158 of ." Case of 1158 " endof
+ 1159 of ." Case of 1159 " endof
+ 1160 of ." Case of 1160 " endof
+ 1161 of ." Case of 1161 " endof
+ 1162 of ." Case of 1162 " endof
+ 1163 of ." Case of 1163 " endof
+ 1164 of ." Case of 1164 " endof
+ 1165 of ." Case of 1165 " endof
+ 1166 of ." Case of 1166 " endof
+ 1167 of ." Case of 1167 " endof
+ 1168 of ." Case of 1168 " endof
+ 1169 of ." Case of 1169 " endof
+ 1170 of ." Case of 1170 " endof
+ 1171 of ." Case of 1171 " endof
+ 1172 of ." Case of 1172 " endof
+ 1173 of ." Case of 1173 " endof
+ 1174 of ." Case of 1174 " endof
+ 1175 of ." Case of 1175 " endof
+ 1176 of ." Case of 1176 " endof
+ 1177 of ." Case of 1177 " endof
+ 1178 of ." Case of 1178 " endof
+ 1179 of ." Case of 1179 " endof
+ 1180 of ." Case of 1180 " endof
+ 1181 of ." Case of 1181 " endof
+ 1182 of ." Case of 1182 " endof
+ 1183 of ." Case of 1183 " endof
+ 1184 of ." Case of 1184 " endof
+ 1185 of ." Case of 1185 " endof
+ 1186 of ." Case of 1186 " endof
+ 1187 of ." Case of 1187 " endof
+ 1188 of ." Case of 1188 " endof
+ 1189 of ." Case of 1189 " endof
+ 1190 of ." Case of 1190 " endof
+ 1191 of ." Case of 1191 " endof
+ 1192 of ." Case of 1192 " endof
+ 1193 of ." Case of 1193 " endof
+ 1194 of ." Case of 1194 " endof
+ 1195 of ." Case of 1195 " endof
+ 1196 of ." Case of 1196 " endof
+ 1197 of ." Case of 1197 " endof
+ 1198 of ." Case of 1198 " endof
+ 1199 of ." Case of 1199 " endof
+ 1200 of ." Case of 1200 " endof
+ 1201 of ." Case of 1201 " endof
+ 1202 of ." Case of 1202 " endof
+ 1203 of ." Case of 1203 " endof
+ 1204 of ." Case of 1204 " endof
+ 1205 of ." Case of 1205 " endof
+ 1206 of ." Case of 1206 " endof
+ 1207 of ." Case of 1207 " endof
+ 1208 of ." Case of 1208 " endof
+ 1209 of ." Case of 1209 " endof
+ 1210 of ." Case of 1210 " endof
+ 1211 of ." Case of 1211 " endof
+ 1212 of ." Case of 1212 " endof
+ 1213 of ." Case of 1213 " endof
+ 1214 of ." Case of 1214 " endof
+ 1215 of ." Case of 1215 " endof
+ 1216 of ." Case of 1216 " endof
+ 1217 of ." Case of 1217 " endof
+ 1218 of ." Case of 1218 " endof
+ 1219 of ." Case of 1219 " endof
+ 1220 of ." Case of 1220 " endof
+ 1221 of ." Case of 1221 " endof
+ 1222 of ." Case of 1222 " endof
+ 1223 of ." Case of 1223 " endof
+ 1224 of ." Case of 1224 " endof
+ 1225 of ." Case of 1225 " endof
+ 1226 of ." Case of 1226 " endof
+ 1227 of ." Case of 1227 " endof
+ 1228 of ." Case of 1228 " endof
+ 1229 of ." Case of 1229 " endof
+ 1230 of ." Case of 1230 " endof
+ 1231 of ." Case of 1231 " endof
+ 1232 of ." Case of 1232 " endof
+ 1233 of ." Case of 1233 " endof
+ 1234 of ." Case of 1234 " endof
+ 1235 of ." Case of 1235 " endof
+ 1236 of ." Case of 1236 " endof
+ 1237 of ." Case of 1237 " endof
+ 1238 of ." Case of 1238 " endof
+ 1239 of ." Case of 1239 " endof
+ 1240 of ." Case of 1240 " endof
+ 1241 of ." Case of 1241 " endof
+ 1242 of ." Case of 1242 " endof
+ 1243 of ." Case of 1243 " endof
+ 1244 of ." Case of 1244 " endof
+ 1245 of ." Case of 1245 " endof
+ 1246 of ." Case of 1246 " endof
+ 1247 of ." Case of 1247 " endof
+ 1248 of ." Case of 1248 " endof
+ 1249 of ." Case of 1249 " endof
+ 1250 of ." Case of 1250 " endof
+ 1251 of ." Case of 1251 " endof
+ 1252 of ." Case of 1252 " endof
+ 1253 of ." Case of 1253 " endof
+ 1254 of ." Case of 1254 " endof
+ 1255 of ." Case of 1255 " endof
+ \ default
+ ." Ran out of cases. Number is " dup .
+ endcase
Added: fcode-utils/testsuite/TokeErrs/TooLargePMessage.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargePMessage.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooLargePMessage.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,19 @@
+\ Test a Paren-Message that is not terminated at all and the number
+\ of characters until the end of file exceeds the buffer.
+\ A Paren-Message does not have the string-escape sequences.
+\ Enter Tokenizer-escape mode
+\ then define the required test-token as alias to .(
+\ and FLOAD the test-body file.
+
+\ Updated Tue, 09 May 2006 at 10:52 PDT by David L. Paktor
+
+headers
+global-definitions
+ f[
+
+alias test-token .(
+
+ fload LargeTextNoQte.fth
+
+ ]f
+
Added: fcode-utils/testsuite/TokeErrs/TooLargePQuote.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargePQuote.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooLargePQuote.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,22 @@
+\ Test a P-Quote that is not terminated at all and the number
+\ of characters until the end of file exceeds the buffer.
+\ A P-Quote has the string-escape sequences.
+\ Define the required test-token as alias to ."
+\ then FLOAD the test-body file.
+
+\ Updated Tue, 09 May 2006 at 10:52 PDT by David L. Paktor
+
+global-definitions
+alias test-token ."
+
+fcode-version2
+
+headers
+
+
+: foobar
+ fload LargeTextNoQte.fth
+;
+
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/TooLargeParen.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeParen.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooLargeParen.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,22 @@
+\ Test a Parenthesis-Comment that is not terminated at all and the number
+\ of characters until the end of file exceeds the buffer.
+\ Define the required test-token as alias to (
+\ then FLOAD the test-body file.
+
+\ Updated Wed, 10 May 2006 at 10:43 PDT by David L. Paktor
+
+
+global-definitions
+alias test-token (
+
+fcode-version2
+
+headers
+
+
+: foobar
+ fload LargeTextNoQte.fth
+;
+
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/TooLargeQAbort.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeQAbort.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooLargeQAbort.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,34 @@
+\ Test an Abort-Quote whose body is not terminated at all and the number
+\ of characters until the end of file exceeds the buffer.
+\ Abort-Quote may be dis-allowed. This test allows it.
+\ Define the required test-token as alias to abort"
+\ then FLOAD the test-body file.
+
+\ Updated Wed, 10 May 2006 at 11:41 PDT by David L. Paktor
+
+\ Align with counterpart...
+
+global-definitions
+alias test-token abort"
+
+fcode-version2
+
+headers
+
+: barfalot
+ true
+ fload LargeTextNoQte.fth
+;
+
+\ Let's also see how a disallowed abort" is handled when the string is
+\ legit but crosses several lines
+: ohfooey!
+ true
+ #message" The abort"" starts here." abort" This ... "\
+ is another fine mess "\
+ you've gotten me into. "\
+ Or is it a kettle of fish?"
+;
+
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/TooLargeQMessage.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeQMessage.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooLargeQMessage.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,16 @@
+\ Test a Quote-Message that is not terminated at all and the number
+\ of characters until the end of file exceeds the buffer.
+\ A Quote-Message has the string-escape sequences.
+\ Define the required test-token as alias to #message"
+\ then FLOAD the test-body file.
+
+\ Updated Tue, 09 May 2006 at 10:52 PDT by David L. Paktor
+
+global-definitions
+alias test-token #message"
+
+
+headers
+
+ fload LargeTextNoQte.fth
+
Added: fcode-utils/testsuite/TokeErrs/TooLargeQNoAbort.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeQNoAbort.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooLargeQNoAbort.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,34 @@
+\ Test an Abort-Quote whose body is not terminated at all and the number
+\ of characters until the end of file exceeds the buffer.
+\ Abort-Quote may be dis-allowed. It is dis-allowed in this test.
+\ Define the required test-token as alias to abort"
+\ then FLOAD the test-body file.
+
+\ Updated Wed, 10 May 2006 at 11:41 PDT by David L. Paktor
+
+[flag] noABORT-Quote
+
+global-definitions
+alias test-token abort"
+
+fcode-version2
+
+headers
+
+: barfalot
+ true
+ fload LargeTextNoQte.fth
+;
+
+\ Let's also see how a disallowed abort" is handled when the string is
+\ legit but crosses several lines
+: ohfooey!
+ true
+ #message" The abort"" starts here." abort" This ... "\
+ is another fine mess "\
+ you've gotten me into. "\
+ Or is it a kettle of fish?"
+;
+
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/TooLargeSQuote.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooLargeSQuote.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooLargeSQuote.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,22 @@
+\ Test an Ess-Quote that is not terminated at all and the number
+\ of characters until the end of file exceeds the buffer.
+\ An Ess-Quote does not have the string-escape sequences.
+\ Define the required test-token as alias to S"
+\ then FLOAD the test-body file.
+
+\ Updated Tue, 09 May 2006 at 10:52 PDT by David L. Paktor
+
+global-definitions
+alias test-token S"
+
+fcode-version2
+
+headers
+
+
+: foobar
+ fload LargeTextNoQte.fth
+;
+
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/TooManyFCodes.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooManyFCodes.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooManyFCodes.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,145 @@
+\ Test overlapping FCode # error checking, and reaching the max allowable.
+
+\ Updated Wed, 14 Jun 2006 at 12:54 PDT by David L. Paktor
+
+\ A macro to force showing the current nextfcode
+global-definitions
+ [macro] show-next-fcode fcode-push [if] [then] #message" ... and dropped off."
+ [ifnexist] fcode-reset
+ [macro] fcode-reset #message" Faking FCODE-RESET" f[ h# 800 next-fcode ]f
+ [endif]
+device-definitions
+
+fcode-version2
+
+decimal
+headers
+ show-next-fcode
+
+0 constant my_zero
+fload OneTwoFive.fth
+ fcode-push
+#message" one_twenty-six" 126 constant one_hundred_and_twenty-six
+#message" one_twenty-seven" 127 constant one_hundred_and_twenty-seven
+#message" one_twenty-eight" 128 constant one_hundred_and_twenty-eight
+
+ show-next-fcode
+
+ new-device
+ fcode-reset
+ 0 constant my_zero
+ fload OneTwoFive.fth
+ #message" one_twenty-six" 126 constant one_hundred_and_twenty-six
+ #message" one_twenty-seven" 127 constant one_hundred_and_twenty-seven
+ #message" one_twenty-eight" 128 constant one_hundred_and_twenty-eight
+
+ show-next-fcode
+ finish-device
+
+ new-device
+ f[ h# 08c0 next-fcode ]f
+ 0 constant my_zero
+ fload OneTwoFive.fth
+ f[ fcode-push constant dev-1-lap ]f
+ #message" one_twenty-six" 126 constant one_hundred_and_twenty-six
+ #message" one_twenty-seven" 127 constant one_hundred_and_twenty-seven
+ #message" one_twenty-eight" 128 constant one_hundred_and_twenty-eight
+ show-next-fcode
+ finish-device
+
+ new-device
+ fcode-pop
+ 0 constant my_zero
+ fload OneTwoFive.fth
+ f[ fcode-push constant dev-2-lap ]f
+ #message" one_twenty-six" 126 constant one_hundred_and_twenty-six
+ #message" one_twenty-seven" 127 constant one_hundred_and_twenty-seven
+ #message" one_twenty-eight" 128 constant one_hundred_and_twenty-eight
+ show-next-fcode
+ finish-device
+
+fcode-push \ Can we do this across FCode Blocks?
+\ And, if we can't, can we preserve it this way?
+f[ constant XFcBlkFcd
+ XFcBlkFcd \ Push it back...
+ ]f
+
+ new-device
+ f[ dev-1-lap next-fcode ]f
+ 0 constant my_zero
+ fload OneTwoFive.fth
+ fcode-push
+ #message" one_twenty-six" 126 constant one_hundred_and_twenty-six
+ fcode-pop
+ #message" one_twenty-seven" 127 constant one_hundred_and_twenty-seven
+ finish-device
+ show-next-fcode
+
+fcode-end
+
+\ Have to redefine these...
+global-definitions
+ [macro] show-next-fcode fcode-push [if] [then] #message" ... and dropped off."
+ [ifnexist] fcode-reset
+ [macro] fcode-reset #message" Faking FCODE-RESET" f[ h# 800 next-fcode ]f
+ [endif]
+device-definitions
+
+fcode-version2
+ \ Confirm that the FCode numbers continue across FCode Blocks
+ show-next-fcode
+ #message" one_twenty-eight" 128 constant one_hundred_and_twenty-eight
+
+\ Let's confirm that the reset clears out the lapping messages.
+ new-device
+ \ This is not a reset:
+ f[ h# 800 next-fcode ]f
+ 0 constant my_zero
+
+ \ This is:
+ fcode-reset
+ fload OneTwoFive.fth
+
+ finish-device
+
+\ Can we use what we pushed on the other side of the block?
+f[ constant wanna-pop
+ wanna-pop fcode-pop wanna-pop 0=
+ \ Did it succeed? If not, there's no point...
+ ]f [if]
+ #message" Could not use FCode pushed on other side of block"
+ #message" Try this... " f[ XFcBlkFcd fcode-pop ]f
+
+ [else] \ It sucked seed!
+ new-device
+ 0 constant my_zero
+ fload OneTwoFive.fth
+ show-next-fcode
+ finish-device
+ [endif]
+
+\ Final run: Exceed the FCode # limit and crash.
+\ Rather than load all the numbers from the start,
+\ let's get a jump on the FCode # assignments.
+f[ h# f80 next-fcode ]f
+
+\ Get all but the last few...
+
+0 constant my_zero
+fload OneTwoFive.fth
+
+ show-next-fcode
+#message" one_twenty-six" 126 constant one_hundred_and_twenty-six
+ show-next-fcode
+#message" one_twenty-seven" 127 constant one_hundred_and_twenty-seven
+ show-next-fcode
+
+\ This next one pushes the FCode # over the limit and causes a crash.
+\ Let's leave ourselves a way around that, so we can use this in other ways
+\ Allow a command-line symbol called nocrash to prevent this.
+[ifndef] NoCrash
+ #message" one_twenty-eight" 128 constant one_hundred_and_twenty-eight
+ show-next-fcode
+[endif]
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/TooTooLargeBuffer.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooTooLargeBuffer.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooTooLargeBuffer.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,58 @@
+\ Test case, not only of a branch going over too, too large a range
+\ but also of overflowing the output buffer
+\ Body generated by the same script used for the too-large branch test,
+\ but with much larger arguments.
+\ (Argument of 924 just does it.)
+
+fcode-version2 \ Sixteen-bit offsets.
+
+headers
+
+: too-large-case ( n -- )
+
+ ." Let's give it a large back-reference too."
+ begin ." We've just begun"
+ ." 1 0 do " cr 1 0 do
+ dup ." if " cr
+ if
+ dup ." case"
+ case
+ 0 of ." Just a short case" cr endof
+ ." default. The Big One!" cr
+
+ fload TooTooLargeBuffer_body.fth
+
+ endcase
+ ." then"
+ then
+ ." Loop back and forward" cr loop
+
+ ." And here we are!"
+ exit
+ ." Well, we needed some way out!"
+
+ again ." Back to the fuchsia."
+;
+
+\ Let's make a small jump, just to see what normal looks like
+: control-example
+ ." Small non-loop"
+ begin ." Here's the beguine"
+
+ dup ." if "
+ if
+ dup ." case"
+ case
+ 0 of ." Just a short case" cr endof
+ ." default. Normal one!" cr
+ endcase
+ ." then"
+ then
+
+ ." and the way out"
+ exit
+ ." and the jump back"
+ again ." Never do this" cr
+;
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/TooTooLargeBuffer_body.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/TooTooLargeBuffer_body.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/TooTooLargeBuffer_body.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,3698 @@
+." Oh, 924 Bottles of Beer on the wall," cr
+." 924 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 923 Bottles of Beer on the wall." cr
+." Oh, 923 Bottles of Beer on the wall," cr
+." 923 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 922 Bottles of Beer on the wall." cr
+." Oh, 922 Bottles of Beer on the wall," cr
+." 922 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 921 Bottles of Beer on the wall." cr
+." Oh, 921 Bottles of Beer on the wall," cr
+." 921 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 920 Bottles of Beer on the wall." cr
+." Oh, 920 Bottles of Beer on the wall," cr
+." 920 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 919 Bottles of Beer on the wall." cr
+." Oh, 919 Bottles of Beer on the wall," cr
+." 919 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 918 Bottles of Beer on the wall." cr
+." Oh, 918 Bottles of Beer on the wall," cr
+." 918 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 917 Bottles of Beer on the wall." cr
+." Oh, 917 Bottles of Beer on the wall," cr
+." 917 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 916 Bottles of Beer on the wall." cr
+." Oh, 916 Bottles of Beer on the wall," cr
+." 916 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 915 Bottles of Beer on the wall." cr
+." Oh, 915 Bottles of Beer on the wall," cr
+." 915 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 914 Bottles of Beer on the wall." cr
+." Oh, 914 Bottles of Beer on the wall," cr
+." 914 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 913 Bottles of Beer on the wall." cr
+." Oh, 913 Bottles of Beer on the wall," cr
+." 913 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 912 Bottles of Beer on the wall." cr
+." Oh, 912 Bottles of Beer on the wall," cr
+." 912 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 911 Bottles of Beer on the wall." cr
+." Oh, 911 Bottles of Beer on the wall," cr
+." 911 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 910 Bottles of Beer on the wall." cr
+." Oh, 910 Bottles of Beer on the wall," cr
+." 910 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 909 Bottles of Beer on the wall." cr
+." Oh, 909 Bottles of Beer on the wall," cr
+." 909 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 908 Bottles of Beer on the wall." cr
+." Oh, 908 Bottles of Beer on the wall," cr
+." 908 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 907 Bottles of Beer on the wall." cr
+." Oh, 907 Bottles of Beer on the wall," cr
+." 907 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 906 Bottles of Beer on the wall." cr
+." Oh, 906 Bottles of Beer on the wall," cr
+." 906 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 905 Bottles of Beer on the wall." cr
+." Oh, 905 Bottles of Beer on the wall," cr
+." 905 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 904 Bottles of Beer on the wall." cr
+." Oh, 904 Bottles of Beer on the wall," cr
+." 904 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 903 Bottles of Beer on the wall." cr
+." Oh, 903 Bottles of Beer on the wall," cr
+." 903 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 902 Bottles of Beer on the wall." cr
+." Oh, 902 Bottles of Beer on the wall," cr
+." 902 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 901 Bottles of Beer on the wall." cr
+." Oh, 901 Bottles of Beer on the wall," cr
+." 901 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 900 Bottles of Beer on the wall." cr
+." Oh, 900 Bottles of Beer on the wall," cr
+." 900 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 899 Bottles of Beer on the wall." cr
+." Oh, 899 Bottles of Beer on the wall," cr
+." 899 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 898 Bottles of Beer on the wall." cr
+." Oh, 898 Bottles of Beer on the wall," cr
+." 898 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 897 Bottles of Beer on the wall." cr
+." Oh, 897 Bottles of Beer on the wall," cr
+." 897 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 896 Bottles of Beer on the wall." cr
+." Oh, 896 Bottles of Beer on the wall," cr
+." 896 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 895 Bottles of Beer on the wall." cr
+." Oh, 895 Bottles of Beer on the wall," cr
+." 895 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 894 Bottles of Beer on the wall." cr
+." Oh, 894 Bottles of Beer on the wall," cr
+." 894 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 893 Bottles of Beer on the wall." cr
+." Oh, 893 Bottles of Beer on the wall," cr
+." 893 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 892 Bottles of Beer on the wall." cr
+." Oh, 892 Bottles of Beer on the wall," cr
+." 892 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 891 Bottles of Beer on the wall." cr
+." Oh, 891 Bottles of Beer on the wall," cr
+." 891 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 890 Bottles of Beer on the wall." cr
+." Oh, 890 Bottles of Beer on the wall," cr
+." 890 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 889 Bottles of Beer on the wall." cr
+." Oh, 889 Bottles of Beer on the wall," cr
+." 889 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 888 Bottles of Beer on the wall." cr
+." Oh, 888 Bottles of Beer on the wall," cr
+." 888 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 887 Bottles of Beer on the wall." cr
+." Oh, 887 Bottles of Beer on the wall," cr
+." 887 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 886 Bottles of Beer on the wall." cr
+." Oh, 886 Bottles of Beer on the wall," cr
+." 886 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 885 Bottles of Beer on the wall." cr
+." Oh, 885 Bottles of Beer on the wall," cr
+." 885 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 884 Bottles of Beer on the wall." cr
+." Oh, 884 Bottles of Beer on the wall," cr
+." 884 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 883 Bottles of Beer on the wall." cr
+." Oh, 883 Bottles of Beer on the wall," cr
+." 883 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 882 Bottles of Beer on the wall." cr
+." Oh, 882 Bottles of Beer on the wall," cr
+." 882 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 881 Bottles of Beer on the wall." cr
+." Oh, 881 Bottles of Beer on the wall," cr
+." 881 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 880 Bottles of Beer on the wall." cr
+." Oh, 880 Bottles of Beer on the wall," cr
+." 880 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 879 Bottles of Beer on the wall." cr
+." Oh, 879 Bottles of Beer on the wall," cr
+." 879 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 878 Bottles of Beer on the wall." cr
+." Oh, 878 Bottles of Beer on the wall," cr
+." 878 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 877 Bottles of Beer on the wall." cr
+." Oh, 877 Bottles of Beer on the wall," cr
+." 877 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 876 Bottles of Beer on the wall." cr
+." Oh, 876 Bottles of Beer on the wall," cr
+." 876 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 875 Bottles of Beer on the wall." cr
+." Oh, 875 Bottles of Beer on the wall," cr
+." 875 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 874 Bottles of Beer on the wall." cr
+." Oh, 874 Bottles of Beer on the wall," cr
+." 874 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 873 Bottles of Beer on the wall." cr
+." Oh, 873 Bottles of Beer on the wall," cr
+." 873 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 872 Bottles of Beer on the wall." cr
+." Oh, 872 Bottles of Beer on the wall," cr
+." 872 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 871 Bottles of Beer on the wall." cr
+." Oh, 871 Bottles of Beer on the wall," cr
+." 871 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 870 Bottles of Beer on the wall." cr
+." Oh, 870 Bottles of Beer on the wall," cr
+." 870 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 869 Bottles of Beer on the wall." cr
+." Oh, 869 Bottles of Beer on the wall," cr
+." 869 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 868 Bottles of Beer on the wall." cr
+." Oh, 868 Bottles of Beer on the wall," cr
+." 868 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 867 Bottles of Beer on the wall." cr
+." Oh, 867 Bottles of Beer on the wall," cr
+." 867 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 866 Bottles of Beer on the wall." cr
+." Oh, 866 Bottles of Beer on the wall," cr
+." 866 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 865 Bottles of Beer on the wall." cr
+." Oh, 865 Bottles of Beer on the wall," cr
+." 865 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 864 Bottles of Beer on the wall." cr
+." Oh, 864 Bottles of Beer on the wall," cr
+." 864 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 863 Bottles of Beer on the wall." cr
+." Oh, 863 Bottles of Beer on the wall," cr
+." 863 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 862 Bottles of Beer on the wall." cr
+." Oh, 862 Bottles of Beer on the wall," cr
+." 862 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 861 Bottles of Beer on the wall." cr
+." Oh, 861 Bottles of Beer on the wall," cr
+." 861 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 860 Bottles of Beer on the wall." cr
+." Oh, 860 Bottles of Beer on the wall," cr
+." 860 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 859 Bottles of Beer on the wall." cr
+." Oh, 859 Bottles of Beer on the wall," cr
+." 859 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 858 Bottles of Beer on the wall." cr
+." Oh, 858 Bottles of Beer on the wall," cr
+." 858 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 857 Bottles of Beer on the wall." cr
+." Oh, 857 Bottles of Beer on the wall," cr
+." 857 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 856 Bottles of Beer on the wall." cr
+." Oh, 856 Bottles of Beer on the wall," cr
+." 856 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 855 Bottles of Beer on the wall." cr
+." Oh, 855 Bottles of Beer on the wall," cr
+." 855 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 854 Bottles of Beer on the wall." cr
+." Oh, 854 Bottles of Beer on the wall," cr
+." 854 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 853 Bottles of Beer on the wall." cr
+." Oh, 853 Bottles of Beer on the wall," cr
+." 853 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 852 Bottles of Beer on the wall." cr
+." Oh, 852 Bottles of Beer on the wall," cr
+." 852 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 851 Bottles of Beer on the wall." cr
+." Oh, 851 Bottles of Beer on the wall," cr
+." 851 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 850 Bottles of Beer on the wall." cr
+." Oh, 850 Bottles of Beer on the wall," cr
+." 850 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 849 Bottles of Beer on the wall." cr
+." Oh, 849 Bottles of Beer on the wall," cr
+." 849 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 848 Bottles of Beer on the wall." cr
+." Oh, 848 Bottles of Beer on the wall," cr
+." 848 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 847 Bottles of Beer on the wall." cr
+." Oh, 847 Bottles of Beer on the wall," cr
+." 847 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 846 Bottles of Beer on the wall." cr
+." Oh, 846 Bottles of Beer on the wall," cr
+." 846 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 845 Bottles of Beer on the wall." cr
+." Oh, 845 Bottles of Beer on the wall," cr
+." 845 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 844 Bottles of Beer on the wall." cr
+." Oh, 844 Bottles of Beer on the wall," cr
+." 844 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 843 Bottles of Beer on the wall." cr
+." Oh, 843 Bottles of Beer on the wall," cr
+." 843 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 842 Bottles of Beer on the wall." cr
+." Oh, 842 Bottles of Beer on the wall," cr
+." 842 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 841 Bottles of Beer on the wall." cr
+." Oh, 841 Bottles of Beer on the wall," cr
+." 841 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 840 Bottles of Beer on the wall." cr
+." Oh, 840 Bottles of Beer on the wall," cr
+." 840 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 839 Bottles of Beer on the wall." cr
+." Oh, 839 Bottles of Beer on the wall," cr
+." 839 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 838 Bottles of Beer on the wall." cr
+." Oh, 838 Bottles of Beer on the wall," cr
+." 838 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 837 Bottles of Beer on the wall." cr
+." Oh, 837 Bottles of Beer on the wall," cr
+." 837 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 836 Bottles of Beer on the wall." cr
+." Oh, 836 Bottles of Beer on the wall," cr
+." 836 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 835 Bottles of Beer on the wall." cr
+." Oh, 835 Bottles of Beer on the wall," cr
+." 835 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 834 Bottles of Beer on the wall." cr
+." Oh, 834 Bottles of Beer on the wall," cr
+." 834 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 833 Bottles of Beer on the wall." cr
+." Oh, 833 Bottles of Beer on the wall," cr
+." 833 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 832 Bottles of Beer on the wall." cr
+." Oh, 832 Bottles of Beer on the wall," cr
+." 832 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 831 Bottles of Beer on the wall." cr
+." Oh, 831 Bottles of Beer on the wall," cr
+." 831 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 830 Bottles of Beer on the wall." cr
+." Oh, 830 Bottles of Beer on the wall," cr
+." 830 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 829 Bottles of Beer on the wall." cr
+." Oh, 829 Bottles of Beer on the wall," cr
+." 829 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 828 Bottles of Beer on the wall." cr
+." Oh, 828 Bottles of Beer on the wall," cr
+." 828 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 827 Bottles of Beer on the wall." cr
+." Oh, 827 Bottles of Beer on the wall," cr
+." 827 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 826 Bottles of Beer on the wall." cr
+." Oh, 826 Bottles of Beer on the wall," cr
+." 826 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 825 Bottles of Beer on the wall." cr
+." Oh, 825 Bottles of Beer on the wall," cr
+." 825 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 824 Bottles of Beer on the wall." cr
+." Oh, 824 Bottles of Beer on the wall," cr
+." 824 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 823 Bottles of Beer on the wall." cr
+." Oh, 823 Bottles of Beer on the wall," cr
+." 823 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 822 Bottles of Beer on the wall." cr
+." Oh, 822 Bottles of Beer on the wall," cr
+." 822 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 821 Bottles of Beer on the wall." cr
+." Oh, 821 Bottles of Beer on the wall," cr
+." 821 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 820 Bottles of Beer on the wall." cr
+." Oh, 820 Bottles of Beer on the wall," cr
+." 820 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 819 Bottles of Beer on the wall." cr
+." Oh, 819 Bottles of Beer on the wall," cr
+." 819 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 818 Bottles of Beer on the wall." cr
+." Oh, 818 Bottles of Beer on the wall," cr
+." 818 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 817 Bottles of Beer on the wall." cr
+." Oh, 817 Bottles of Beer on the wall," cr
+." 817 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 816 Bottles of Beer on the wall." cr
+." Oh, 816 Bottles of Beer on the wall," cr
+." 816 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 815 Bottles of Beer on the wall." cr
+." Oh, 815 Bottles of Beer on the wall," cr
+." 815 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 814 Bottles of Beer on the wall." cr
+." Oh, 814 Bottles of Beer on the wall," cr
+." 814 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 813 Bottles of Beer on the wall." cr
+." Oh, 813 Bottles of Beer on the wall," cr
+." 813 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 812 Bottles of Beer on the wall." cr
+." Oh, 812 Bottles of Beer on the wall," cr
+." 812 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 811 Bottles of Beer on the wall." cr
+." Oh, 811 Bottles of Beer on the wall," cr
+." 811 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 810 Bottles of Beer on the wall." cr
+." Oh, 810 Bottles of Beer on the wall," cr
+." 810 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 809 Bottles of Beer on the wall." cr
+." Oh, 809 Bottles of Beer on the wall," cr
+." 809 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 808 Bottles of Beer on the wall." cr
+." Oh, 808 Bottles of Beer on the wall," cr
+." 808 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 807 Bottles of Beer on the wall." cr
+." Oh, 807 Bottles of Beer on the wall," cr
+." 807 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 806 Bottles of Beer on the wall." cr
+." Oh, 806 Bottles of Beer on the wall," cr
+." 806 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 805 Bottles of Beer on the wall." cr
+." Oh, 805 Bottles of Beer on the wall," cr
+." 805 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 804 Bottles of Beer on the wall." cr
+." Oh, 804 Bottles of Beer on the wall," cr
+." 804 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 803 Bottles of Beer on the wall." cr
+." Oh, 803 Bottles of Beer on the wall," cr
+." 803 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 802 Bottles of Beer on the wall." cr
+." Oh, 802 Bottles of Beer on the wall," cr
+." 802 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 801 Bottles of Beer on the wall." cr
+." Oh, 801 Bottles of Beer on the wall," cr
+." 801 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 800 Bottles of Beer on the wall." cr
+." Oh, 800 Bottles of Beer on the wall," cr
+." 800 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 799 Bottles of Beer on the wall." cr
+." Oh, 799 Bottles of Beer on the wall," cr
+." 799 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 798 Bottles of Beer on the wall." cr
+." Oh, 798 Bottles of Beer on the wall," cr
+." 798 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 797 Bottles of Beer on the wall." cr
+." Oh, 797 Bottles of Beer on the wall," cr
+." 797 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 796 Bottles of Beer on the wall." cr
+." Oh, 796 Bottles of Beer on the wall," cr
+." 796 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 795 Bottles of Beer on the wall." cr
+." Oh, 795 Bottles of Beer on the wall," cr
+." 795 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 794 Bottles of Beer on the wall." cr
+." Oh, 794 Bottles of Beer on the wall," cr
+." 794 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 793 Bottles of Beer on the wall." cr
+." Oh, 793 Bottles of Beer on the wall," cr
+." 793 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 792 Bottles of Beer on the wall." cr
+." Oh, 792 Bottles of Beer on the wall," cr
+." 792 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 791 Bottles of Beer on the wall." cr
+." Oh, 791 Bottles of Beer on the wall," cr
+." 791 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 790 Bottles of Beer on the wall." cr
+." Oh, 790 Bottles of Beer on the wall," cr
+." 790 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 789 Bottles of Beer on the wall." cr
+." Oh, 789 Bottles of Beer on the wall," cr
+." 789 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 788 Bottles of Beer on the wall." cr
+." Oh, 788 Bottles of Beer on the wall," cr
+." 788 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 787 Bottles of Beer on the wall." cr
+." Oh, 787 Bottles of Beer on the wall," cr
+." 787 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 786 Bottles of Beer on the wall." cr
+." Oh, 786 Bottles of Beer on the wall," cr
+." 786 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 785 Bottles of Beer on the wall." cr
+." Oh, 785 Bottles of Beer on the wall," cr
+." 785 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 784 Bottles of Beer on the wall." cr
+." Oh, 784 Bottles of Beer on the wall," cr
+." 784 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 783 Bottles of Beer on the wall." cr
+." Oh, 783 Bottles of Beer on the wall," cr
+." 783 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 782 Bottles of Beer on the wall." cr
+." Oh, 782 Bottles of Beer on the wall," cr
+." 782 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 781 Bottles of Beer on the wall." cr
+." Oh, 781 Bottles of Beer on the wall," cr
+." 781 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 780 Bottles of Beer on the wall." cr
+." Oh, 780 Bottles of Beer on the wall," cr
+." 780 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 779 Bottles of Beer on the wall." cr
+." Oh, 779 Bottles of Beer on the wall," cr
+." 779 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 778 Bottles of Beer on the wall." cr
+." Oh, 778 Bottles of Beer on the wall," cr
+." 778 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 777 Bottles of Beer on the wall." cr
+." Oh, 777 Bottles of Beer on the wall," cr
+." 777 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 776 Bottles of Beer on the wall." cr
+." Oh, 776 Bottles of Beer on the wall," cr
+." 776 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 775 Bottles of Beer on the wall." cr
+." Oh, 775 Bottles of Beer on the wall," cr
+." 775 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 774 Bottles of Beer on the wall." cr
+." Oh, 774 Bottles of Beer on the wall," cr
+." 774 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 773 Bottles of Beer on the wall." cr
+." Oh, 773 Bottles of Beer on the wall," cr
+." 773 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 772 Bottles of Beer on the wall." cr
+." Oh, 772 Bottles of Beer on the wall," cr
+." 772 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 771 Bottles of Beer on the wall." cr
+." Oh, 771 Bottles of Beer on the wall," cr
+." 771 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 770 Bottles of Beer on the wall." cr
+." Oh, 770 Bottles of Beer on the wall," cr
+." 770 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 769 Bottles of Beer on the wall." cr
+." Oh, 769 Bottles of Beer on the wall," cr
+." 769 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 768 Bottles of Beer on the wall." cr
+." Oh, 768 Bottles of Beer on the wall," cr
+." 768 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 767 Bottles of Beer on the wall." cr
+." Oh, 767 Bottles of Beer on the wall," cr
+." 767 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 766 Bottles of Beer on the wall." cr
+." Oh, 766 Bottles of Beer on the wall," cr
+." 766 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 765 Bottles of Beer on the wall." cr
+." Oh, 765 Bottles of Beer on the wall," cr
+." 765 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 764 Bottles of Beer on the wall." cr
+." Oh, 764 Bottles of Beer on the wall," cr
+." 764 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 763 Bottles of Beer on the wall." cr
+." Oh, 763 Bottles of Beer on the wall," cr
+." 763 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 762 Bottles of Beer on the wall." cr
+." Oh, 762 Bottles of Beer on the wall," cr
+." 762 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 761 Bottles of Beer on the wall." cr
+." Oh, 761 Bottles of Beer on the wall," cr
+." 761 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 760 Bottles of Beer on the wall." cr
+." Oh, 760 Bottles of Beer on the wall," cr
+." 760 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 759 Bottles of Beer on the wall." cr
+." Oh, 759 Bottles of Beer on the wall," cr
+." 759 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 758 Bottles of Beer on the wall." cr
+." Oh, 758 Bottles of Beer on the wall," cr
+." 758 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 757 Bottles of Beer on the wall." cr
+." Oh, 757 Bottles of Beer on the wall," cr
+." 757 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 756 Bottles of Beer on the wall." cr
+." Oh, 756 Bottles of Beer on the wall," cr
+." 756 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 755 Bottles of Beer on the wall." cr
+." Oh, 755 Bottles of Beer on the wall," cr
+." 755 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 754 Bottles of Beer on the wall." cr
+." Oh, 754 Bottles of Beer on the wall," cr
+." 754 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 753 Bottles of Beer on the wall." cr
+." Oh, 753 Bottles of Beer on the wall," cr
+." 753 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 752 Bottles of Beer on the wall." cr
+." Oh, 752 Bottles of Beer on the wall," cr
+." 752 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 751 Bottles of Beer on the wall." cr
+." Oh, 751 Bottles of Beer on the wall," cr
+." 751 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 750 Bottles of Beer on the wall." cr
+." Oh, 750 Bottles of Beer on the wall," cr
+." 750 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 749 Bottles of Beer on the wall." cr
+." Oh, 749 Bottles of Beer on the wall," cr
+." 749 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 748 Bottles of Beer on the wall." cr
+." Oh, 748 Bottles of Beer on the wall," cr
+." 748 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 747 Bottles of Beer on the wall." cr
+." Oh, 747 Bottles of Beer on the wall," cr
+." 747 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 746 Bottles of Beer on the wall." cr
+." Oh, 746 Bottles of Beer on the wall," cr
+." 746 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 745 Bottles of Beer on the wall." cr
+." Oh, 745 Bottles of Beer on the wall," cr
+." 745 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 744 Bottles of Beer on the wall." cr
+." Oh, 744 Bottles of Beer on the wall," cr
+." 744 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 743 Bottles of Beer on the wall." cr
+." Oh, 743 Bottles of Beer on the wall," cr
+." 743 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 742 Bottles of Beer on the wall." cr
+." Oh, 742 Bottles of Beer on the wall," cr
+." 742 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 741 Bottles of Beer on the wall." cr
+." Oh, 741 Bottles of Beer on the wall," cr
+." 741 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 740 Bottles of Beer on the wall." cr
+." Oh, 740 Bottles of Beer on the wall," cr
+." 740 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 739 Bottles of Beer on the wall." cr
+." Oh, 739 Bottles of Beer on the wall," cr
+." 739 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 738 Bottles of Beer on the wall." cr
+." Oh, 738 Bottles of Beer on the wall," cr
+." 738 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 737 Bottles of Beer on the wall." cr
+." Oh, 737 Bottles of Beer on the wall," cr
+." 737 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 736 Bottles of Beer on the wall." cr
+." Oh, 736 Bottles of Beer on the wall," cr
+." 736 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 735 Bottles of Beer on the wall." cr
+." Oh, 735 Bottles of Beer on the wall," cr
+." 735 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 734 Bottles of Beer on the wall." cr
+." Oh, 734 Bottles of Beer on the wall," cr
+." 734 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 733 Bottles of Beer on the wall." cr
+." Oh, 733 Bottles of Beer on the wall," cr
+." 733 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 732 Bottles of Beer on the wall." cr
+." Oh, 732 Bottles of Beer on the wall," cr
+." 732 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 731 Bottles of Beer on the wall." cr
+." Oh, 731 Bottles of Beer on the wall," cr
+." 731 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 730 Bottles of Beer on the wall." cr
+." Oh, 730 Bottles of Beer on the wall," cr
+." 730 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 729 Bottles of Beer on the wall." cr
+." Oh, 729 Bottles of Beer on the wall," cr
+." 729 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 728 Bottles of Beer on the wall." cr
+." Oh, 728 Bottles of Beer on the wall," cr
+." 728 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 727 Bottles of Beer on the wall." cr
+." Oh, 727 Bottles of Beer on the wall," cr
+." 727 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 726 Bottles of Beer on the wall." cr
+." Oh, 726 Bottles of Beer on the wall," cr
+." 726 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 725 Bottles of Beer on the wall." cr
+." Oh, 725 Bottles of Beer on the wall," cr
+." 725 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 724 Bottles of Beer on the wall." cr
+." Oh, 724 Bottles of Beer on the wall," cr
+." 724 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 723 Bottles of Beer on the wall." cr
+." Oh, 723 Bottles of Beer on the wall," cr
+." 723 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 722 Bottles of Beer on the wall." cr
+." Oh, 722 Bottles of Beer on the wall," cr
+." 722 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 721 Bottles of Beer on the wall." cr
+." Oh, 721 Bottles of Beer on the wall," cr
+." 721 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 720 Bottles of Beer on the wall." cr
+." Oh, 720 Bottles of Beer on the wall," cr
+." 720 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 719 Bottles of Beer on the wall." cr
+." Oh, 719 Bottles of Beer on the wall," cr
+." 719 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 718 Bottles of Beer on the wall." cr
+." Oh, 718 Bottles of Beer on the wall," cr
+." 718 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 717 Bottles of Beer on the wall." cr
+." Oh, 717 Bottles of Beer on the wall," cr
+." 717 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 716 Bottles of Beer on the wall." cr
+." Oh, 716 Bottles of Beer on the wall," cr
+." 716 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 715 Bottles of Beer on the wall." cr
+." Oh, 715 Bottles of Beer on the wall," cr
+." 715 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 714 Bottles of Beer on the wall." cr
+." Oh, 714 Bottles of Beer on the wall," cr
+." 714 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 713 Bottles of Beer on the wall." cr
+." Oh, 713 Bottles of Beer on the wall," cr
+." 713 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 712 Bottles of Beer on the wall." cr
+." Oh, 712 Bottles of Beer on the wall," cr
+." 712 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 711 Bottles of Beer on the wall." cr
+." Oh, 711 Bottles of Beer on the wall," cr
+." 711 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 710 Bottles of Beer on the wall." cr
+." Oh, 710 Bottles of Beer on the wall," cr
+." 710 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 709 Bottles of Beer on the wall." cr
+." Oh, 709 Bottles of Beer on the wall," cr
+." 709 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 708 Bottles of Beer on the wall." cr
+." Oh, 708 Bottles of Beer on the wall," cr
+." 708 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 707 Bottles of Beer on the wall." cr
+." Oh, 707 Bottles of Beer on the wall," cr
+." 707 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 706 Bottles of Beer on the wall." cr
+." Oh, 706 Bottles of Beer on the wall," cr
+." 706 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 705 Bottles of Beer on the wall." cr
+." Oh, 705 Bottles of Beer on the wall," cr
+." 705 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 704 Bottles of Beer on the wall." cr
+." Oh, 704 Bottles of Beer on the wall," cr
+." 704 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 703 Bottles of Beer on the wall." cr
+." Oh, 703 Bottles of Beer on the wall," cr
+." 703 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 702 Bottles of Beer on the wall." cr
+." Oh, 702 Bottles of Beer on the wall," cr
+." 702 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 701 Bottles of Beer on the wall." cr
+." Oh, 701 Bottles of Beer on the wall," cr
+." 701 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 700 Bottles of Beer on the wall." cr
+." Oh, 700 Bottles of Beer on the wall," cr
+." 700 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 699 Bottles of Beer on the wall." cr
+." Oh, 699 Bottles of Beer on the wall," cr
+." 699 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 698 Bottles of Beer on the wall." cr
+." Oh, 698 Bottles of Beer on the wall," cr
+." 698 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 697 Bottles of Beer on the wall." cr
+." Oh, 697 Bottles of Beer on the wall," cr
+." 697 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 696 Bottles of Beer on the wall." cr
+." Oh, 696 Bottles of Beer on the wall," cr
+." 696 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 695 Bottles of Beer on the wall." cr
+." Oh, 695 Bottles of Beer on the wall," cr
+." 695 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 694 Bottles of Beer on the wall." cr
+." Oh, 694 Bottles of Beer on the wall," cr
+." 694 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 693 Bottles of Beer on the wall." cr
+." Oh, 693 Bottles of Beer on the wall," cr
+." 693 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 692 Bottles of Beer on the wall." cr
+." Oh, 692 Bottles of Beer on the wall," cr
+." 692 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 691 Bottles of Beer on the wall." cr
+." Oh, 691 Bottles of Beer on the wall," cr
+." 691 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 690 Bottles of Beer on the wall." cr
+." Oh, 690 Bottles of Beer on the wall," cr
+." 690 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 689 Bottles of Beer on the wall." cr
+." Oh, 689 Bottles of Beer on the wall," cr
+." 689 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 688 Bottles of Beer on the wall." cr
+." Oh, 688 Bottles of Beer on the wall," cr
+." 688 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 687 Bottles of Beer on the wall." cr
+." Oh, 687 Bottles of Beer on the wall," cr
+." 687 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 686 Bottles of Beer on the wall." cr
+." Oh, 686 Bottles of Beer on the wall," cr
+." 686 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 685 Bottles of Beer on the wall." cr
+." Oh, 685 Bottles of Beer on the wall," cr
+." 685 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 684 Bottles of Beer on the wall." cr
+." Oh, 684 Bottles of Beer on the wall," cr
+." 684 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 683 Bottles of Beer on the wall." cr
+." Oh, 683 Bottles of Beer on the wall," cr
+." 683 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 682 Bottles of Beer on the wall." cr
+." Oh, 682 Bottles of Beer on the wall," cr
+." 682 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 681 Bottles of Beer on the wall." cr
+." Oh, 681 Bottles of Beer on the wall," cr
+." 681 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 680 Bottles of Beer on the wall." cr
+." Oh, 680 Bottles of Beer on the wall," cr
+." 680 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 679 Bottles of Beer on the wall." cr
+." Oh, 679 Bottles of Beer on the wall," cr
+." 679 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 678 Bottles of Beer on the wall." cr
+." Oh, 678 Bottles of Beer on the wall," cr
+." 678 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 677 Bottles of Beer on the wall." cr
+." Oh, 677 Bottles of Beer on the wall," cr
+." 677 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 676 Bottles of Beer on the wall." cr
+." Oh, 676 Bottles of Beer on the wall," cr
+." 676 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 675 Bottles of Beer on the wall." cr
+." Oh, 675 Bottles of Beer on the wall," cr
+." 675 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 674 Bottles of Beer on the wall." cr
+." Oh, 674 Bottles of Beer on the wall," cr
+." 674 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 673 Bottles of Beer on the wall." cr
+." Oh, 673 Bottles of Beer on the wall," cr
+." 673 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 672 Bottles of Beer on the wall." cr
+." Oh, 672 Bottles of Beer on the wall," cr
+." 672 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 671 Bottles of Beer on the wall." cr
+." Oh, 671 Bottles of Beer on the wall," cr
+." 671 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 670 Bottles of Beer on the wall." cr
+." Oh, 670 Bottles of Beer on the wall," cr
+." 670 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 669 Bottles of Beer on the wall." cr
+." Oh, 669 Bottles of Beer on the wall," cr
+." 669 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 668 Bottles of Beer on the wall." cr
+." Oh, 668 Bottles of Beer on the wall," cr
+." 668 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 667 Bottles of Beer on the wall." cr
+." Oh, 667 Bottles of Beer on the wall," cr
+." 667 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 666 Bottles of Beer on the wall." cr
+." Oh, 666 Bottles of Beer on the wall," cr
+." 666 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 665 Bottles of Beer on the wall." cr
+." Oh, 665 Bottles of Beer on the wall," cr
+." 665 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 664 Bottles of Beer on the wall." cr
+." Oh, 664 Bottles of Beer on the wall," cr
+." 664 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 663 Bottles of Beer on the wall." cr
+." Oh, 663 Bottles of Beer on the wall," cr
+." 663 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 662 Bottles of Beer on the wall." cr
+." Oh, 662 Bottles of Beer on the wall," cr
+." 662 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 661 Bottles of Beer on the wall." cr
+." Oh, 661 Bottles of Beer on the wall," cr
+." 661 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 660 Bottles of Beer on the wall." cr
+." Oh, 660 Bottles of Beer on the wall," cr
+." 660 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 659 Bottles of Beer on the wall." cr
+." Oh, 659 Bottles of Beer on the wall," cr
+." 659 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 658 Bottles of Beer on the wall." cr
+." Oh, 658 Bottles of Beer on the wall," cr
+." 658 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 657 Bottles of Beer on the wall." cr
+." Oh, 657 Bottles of Beer on the wall," cr
+." 657 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 656 Bottles of Beer on the wall." cr
+." Oh, 656 Bottles of Beer on the wall," cr
+." 656 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 655 Bottles of Beer on the wall." cr
+." Oh, 655 Bottles of Beer on the wall," cr
+." 655 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 654 Bottles of Beer on the wall." cr
+." Oh, 654 Bottles of Beer on the wall," cr
+." 654 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 653 Bottles of Beer on the wall." cr
+." Oh, 653 Bottles of Beer on the wall," cr
+." 653 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 652 Bottles of Beer on the wall." cr
+." Oh, 652 Bottles of Beer on the wall," cr
+." 652 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 651 Bottles of Beer on the wall." cr
+." Oh, 651 Bottles of Beer on the wall," cr
+." 651 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 650 Bottles of Beer on the wall." cr
+." Oh, 650 Bottles of Beer on the wall," cr
+." 650 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 649 Bottles of Beer on the wall." cr
+." Oh, 649 Bottles of Beer on the wall," cr
+." 649 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 648 Bottles of Beer on the wall." cr
+." Oh, 648 Bottles of Beer on the wall," cr
+." 648 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 647 Bottles of Beer on the wall." cr
+." Oh, 647 Bottles of Beer on the wall," cr
+." 647 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 646 Bottles of Beer on the wall." cr
+." Oh, 646 Bottles of Beer on the wall," cr
+." 646 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 645 Bottles of Beer on the wall." cr
+." Oh, 645 Bottles of Beer on the wall," cr
+." 645 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 644 Bottles of Beer on the wall." cr
+." Oh, 644 Bottles of Beer on the wall," cr
+." 644 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 643 Bottles of Beer on the wall." cr
+." Oh, 643 Bottles of Beer on the wall," cr
+." 643 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 642 Bottles of Beer on the wall." cr
+." Oh, 642 Bottles of Beer on the wall," cr
+." 642 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 641 Bottles of Beer on the wall." cr
+." Oh, 641 Bottles of Beer on the wall," cr
+." 641 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 640 Bottles of Beer on the wall." cr
+." Oh, 640 Bottles of Beer on the wall," cr
+." 640 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 639 Bottles of Beer on the wall." cr
+." Oh, 639 Bottles of Beer on the wall," cr
+." 639 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 638 Bottles of Beer on the wall." cr
+." Oh, 638 Bottles of Beer on the wall," cr
+." 638 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 637 Bottles of Beer on the wall." cr
+." Oh, 637 Bottles of Beer on the wall," cr
+." 637 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 636 Bottles of Beer on the wall." cr
+." Oh, 636 Bottles of Beer on the wall," cr
+." 636 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 635 Bottles of Beer on the wall." cr
+." Oh, 635 Bottles of Beer on the wall," cr
+." 635 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 634 Bottles of Beer on the wall." cr
+." Oh, 634 Bottles of Beer on the wall," cr
+." 634 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 633 Bottles of Beer on the wall." cr
+." Oh, 633 Bottles of Beer on the wall," cr
+." 633 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 632 Bottles of Beer on the wall." cr
+." Oh, 632 Bottles of Beer on the wall," cr
+." 632 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 631 Bottles of Beer on the wall." cr
+." Oh, 631 Bottles of Beer on the wall," cr
+." 631 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 630 Bottles of Beer on the wall." cr
+." Oh, 630 Bottles of Beer on the wall," cr
+." 630 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 629 Bottles of Beer on the wall." cr
+." Oh, 629 Bottles of Beer on the wall," cr
+." 629 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 628 Bottles of Beer on the wall." cr
+." Oh, 628 Bottles of Beer on the wall," cr
+." 628 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 627 Bottles of Beer on the wall." cr
+." Oh, 627 Bottles of Beer on the wall," cr
+." 627 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 626 Bottles of Beer on the wall." cr
+." Oh, 626 Bottles of Beer on the wall," cr
+." 626 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 625 Bottles of Beer on the wall." cr
+." Oh, 625 Bottles of Beer on the wall," cr
+." 625 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 624 Bottles of Beer on the wall." cr
+." Oh, 624 Bottles of Beer on the wall," cr
+." 624 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 623 Bottles of Beer on the wall." cr
+." Oh, 623 Bottles of Beer on the wall," cr
+." 623 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 622 Bottles of Beer on the wall." cr
+." Oh, 622 Bottles of Beer on the wall," cr
+." 622 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 621 Bottles of Beer on the wall." cr
+." Oh, 621 Bottles of Beer on the wall," cr
+." 621 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 620 Bottles of Beer on the wall." cr
+." Oh, 620 Bottles of Beer on the wall," cr
+." 620 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 619 Bottles of Beer on the wall." cr
+." Oh, 619 Bottles of Beer on the wall," cr
+." 619 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 618 Bottles of Beer on the wall." cr
+." Oh, 618 Bottles of Beer on the wall," cr
+." 618 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 617 Bottles of Beer on the wall." cr
+." Oh, 617 Bottles of Beer on the wall," cr
+." 617 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 616 Bottles of Beer on the wall." cr
+." Oh, 616 Bottles of Beer on the wall," cr
+." 616 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 615 Bottles of Beer on the wall." cr
+." Oh, 615 Bottles of Beer on the wall," cr
+." 615 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 614 Bottles of Beer on the wall." cr
+." Oh, 614 Bottles of Beer on the wall," cr
+." 614 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 613 Bottles of Beer on the wall." cr
+." Oh, 613 Bottles of Beer on the wall," cr
+." 613 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 612 Bottles of Beer on the wall." cr
+." Oh, 612 Bottles of Beer on the wall," cr
+." 612 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 611 Bottles of Beer on the wall." cr
+." Oh, 611 Bottles of Beer on the wall," cr
+." 611 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 610 Bottles of Beer on the wall." cr
+." Oh, 610 Bottles of Beer on the wall," cr
+." 610 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 609 Bottles of Beer on the wall." cr
+." Oh, 609 Bottles of Beer on the wall," cr
+." 609 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 608 Bottles of Beer on the wall." cr
+." Oh, 608 Bottles of Beer on the wall," cr
+." 608 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 607 Bottles of Beer on the wall." cr
+." Oh, 607 Bottles of Beer on the wall," cr
+." 607 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 606 Bottles of Beer on the wall." cr
+." Oh, 606 Bottles of Beer on the wall," cr
+." 606 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 605 Bottles of Beer on the wall." cr
+." Oh, 605 Bottles of Beer on the wall," cr
+." 605 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 604 Bottles of Beer on the wall." cr
+." Oh, 604 Bottles of Beer on the wall," cr
+." 604 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 603 Bottles of Beer on the wall." cr
+." Oh, 603 Bottles of Beer on the wall," cr
+." 603 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 602 Bottles of Beer on the wall." cr
+." Oh, 602 Bottles of Beer on the wall," cr
+." 602 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 601 Bottles of Beer on the wall." cr
+." Oh, 601 Bottles of Beer on the wall," cr
+." 601 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 600 Bottles of Beer on the wall." cr
+." Oh, 600 Bottles of Beer on the wall," cr
+." 600 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 599 Bottles of Beer on the wall." cr
+." Oh, 599 Bottles of Beer on the wall," cr
+." 599 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 598 Bottles of Beer on the wall." cr
+." Oh, 598 Bottles of Beer on the wall," cr
+." 598 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 597 Bottles of Beer on the wall." cr
+." Oh, 597 Bottles of Beer on the wall," cr
+." 597 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 596 Bottles of Beer on the wall." cr
+." Oh, 596 Bottles of Beer on the wall," cr
+." 596 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 595 Bottles of Beer on the wall." cr
+." Oh, 595 Bottles of Beer on the wall," cr
+." 595 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 594 Bottles of Beer on the wall." cr
+." Oh, 594 Bottles of Beer on the wall," cr
+." 594 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 593 Bottles of Beer on the wall." cr
+." Oh, 593 Bottles of Beer on the wall," cr
+." 593 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 592 Bottles of Beer on the wall." cr
+." Oh, 592 Bottles of Beer on the wall," cr
+." 592 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 591 Bottles of Beer on the wall." cr
+." Oh, 591 Bottles of Beer on the wall," cr
+." 591 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 590 Bottles of Beer on the wall." cr
+." Oh, 590 Bottles of Beer on the wall," cr
+." 590 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 589 Bottles of Beer on the wall." cr
+." Oh, 589 Bottles of Beer on the wall," cr
+." 589 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 588 Bottles of Beer on the wall." cr
+." Oh, 588 Bottles of Beer on the wall," cr
+." 588 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 587 Bottles of Beer on the wall." cr
+." Oh, 587 Bottles of Beer on the wall," cr
+." 587 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 586 Bottles of Beer on the wall." cr
+." Oh, 586 Bottles of Beer on the wall," cr
+." 586 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 585 Bottles of Beer on the wall." cr
+." Oh, 585 Bottles of Beer on the wall," cr
+." 585 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 584 Bottles of Beer on the wall." cr
+." Oh, 584 Bottles of Beer on the wall," cr
+." 584 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 583 Bottles of Beer on the wall." cr
+." Oh, 583 Bottles of Beer on the wall," cr
+." 583 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 582 Bottles of Beer on the wall." cr
+." Oh, 582 Bottles of Beer on the wall," cr
+." 582 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 581 Bottles of Beer on the wall." cr
+." Oh, 581 Bottles of Beer on the wall," cr
+." 581 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 580 Bottles of Beer on the wall." cr
+." Oh, 580 Bottles of Beer on the wall," cr
+." 580 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 579 Bottles of Beer on the wall." cr
+." Oh, 579 Bottles of Beer on the wall," cr
+." 579 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 578 Bottles of Beer on the wall." cr
+." Oh, 578 Bottles of Beer on the wall," cr
+." 578 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 577 Bottles of Beer on the wall." cr
+." Oh, 577 Bottles of Beer on the wall," cr
+." 577 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 576 Bottles of Beer on the wall." cr
+." Oh, 576 Bottles of Beer on the wall," cr
+." 576 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 575 Bottles of Beer on the wall." cr
+." Oh, 575 Bottles of Beer on the wall," cr
+." 575 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 574 Bottles of Beer on the wall." cr
+." Oh, 574 Bottles of Beer on the wall," cr
+." 574 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 573 Bottles of Beer on the wall." cr
+." Oh, 573 Bottles of Beer on the wall," cr
+." 573 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 572 Bottles of Beer on the wall." cr
+." Oh, 572 Bottles of Beer on the wall," cr
+." 572 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 571 Bottles of Beer on the wall." cr
+." Oh, 571 Bottles of Beer on the wall," cr
+." 571 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 570 Bottles of Beer on the wall." cr
+." Oh, 570 Bottles of Beer on the wall," cr
+." 570 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 569 Bottles of Beer on the wall." cr
+." Oh, 569 Bottles of Beer on the wall," cr
+." 569 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 568 Bottles of Beer on the wall." cr
+." Oh, 568 Bottles of Beer on the wall," cr
+." 568 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 567 Bottles of Beer on the wall." cr
+." Oh, 567 Bottles of Beer on the wall," cr
+." 567 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 566 Bottles of Beer on the wall." cr
+." Oh, 566 Bottles of Beer on the wall," cr
+." 566 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 565 Bottles of Beer on the wall." cr
+." Oh, 565 Bottles of Beer on the wall," cr
+." 565 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 564 Bottles of Beer on the wall." cr
+." Oh, 564 Bottles of Beer on the wall," cr
+." 564 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 563 Bottles of Beer on the wall." cr
+." Oh, 563 Bottles of Beer on the wall," cr
+." 563 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 562 Bottles of Beer on the wall." cr
+." Oh, 562 Bottles of Beer on the wall," cr
+." 562 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 561 Bottles of Beer on the wall." cr
+." Oh, 561 Bottles of Beer on the wall," cr
+." 561 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 560 Bottles of Beer on the wall." cr
+." Oh, 560 Bottles of Beer on the wall," cr
+." 560 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 559 Bottles of Beer on the wall." cr
+." Oh, 559 Bottles of Beer on the wall," cr
+." 559 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 558 Bottles of Beer on the wall." cr
+." Oh, 558 Bottles of Beer on the wall," cr
+." 558 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 557 Bottles of Beer on the wall." cr
+." Oh, 557 Bottles of Beer on the wall," cr
+." 557 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 556 Bottles of Beer on the wall." cr
+." Oh, 556 Bottles of Beer on the wall," cr
+." 556 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 555 Bottles of Beer on the wall." cr
+." Oh, 555 Bottles of Beer on the wall," cr
+." 555 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 554 Bottles of Beer on the wall." cr
+." Oh, 554 Bottles of Beer on the wall," cr
+." 554 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 553 Bottles of Beer on the wall." cr
+." Oh, 553 Bottles of Beer on the wall," cr
+." 553 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 552 Bottles of Beer on the wall." cr
+." Oh, 552 Bottles of Beer on the wall," cr
+." 552 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 551 Bottles of Beer on the wall." cr
+." Oh, 551 Bottles of Beer on the wall," cr
+." 551 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 550 Bottles of Beer on the wall." cr
+." Oh, 550 Bottles of Beer on the wall," cr
+." 550 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 549 Bottles of Beer on the wall." cr
+." Oh, 549 Bottles of Beer on the wall," cr
+." 549 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 548 Bottles of Beer on the wall." cr
+." Oh, 548 Bottles of Beer on the wall," cr
+." 548 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 547 Bottles of Beer on the wall." cr
+." Oh, 547 Bottles of Beer on the wall," cr
+." 547 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 546 Bottles of Beer on the wall." cr
+." Oh, 546 Bottles of Beer on the wall," cr
+." 546 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 545 Bottles of Beer on the wall." cr
+." Oh, 545 Bottles of Beer on the wall," cr
+." 545 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 544 Bottles of Beer on the wall." cr
+." Oh, 544 Bottles of Beer on the wall," cr
+." 544 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 543 Bottles of Beer on the wall." cr
+." Oh, 543 Bottles of Beer on the wall," cr
+." 543 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 542 Bottles of Beer on the wall." cr
+." Oh, 542 Bottles of Beer on the wall," cr
+." 542 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 541 Bottles of Beer on the wall." cr
+." Oh, 541 Bottles of Beer on the wall," cr
+." 541 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 540 Bottles of Beer on the wall." cr
+." Oh, 540 Bottles of Beer on the wall," cr
+." 540 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 539 Bottles of Beer on the wall." cr
+." Oh, 539 Bottles of Beer on the wall," cr
+." 539 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 538 Bottles of Beer on the wall." cr
+." Oh, 538 Bottles of Beer on the wall," cr
+." 538 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 537 Bottles of Beer on the wall." cr
+." Oh, 537 Bottles of Beer on the wall," cr
+." 537 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 536 Bottles of Beer on the wall." cr
+." Oh, 536 Bottles of Beer on the wall," cr
+." 536 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 535 Bottles of Beer on the wall." cr
+." Oh, 535 Bottles of Beer on the wall," cr
+." 535 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 534 Bottles of Beer on the wall." cr
+." Oh, 534 Bottles of Beer on the wall," cr
+." 534 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 533 Bottles of Beer on the wall." cr
+." Oh, 533 Bottles of Beer on the wall," cr
+." 533 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 532 Bottles of Beer on the wall." cr
+." Oh, 532 Bottles of Beer on the wall," cr
+." 532 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 531 Bottles of Beer on the wall." cr
+." Oh, 531 Bottles of Beer on the wall," cr
+." 531 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 530 Bottles of Beer on the wall." cr
+." Oh, 530 Bottles of Beer on the wall," cr
+." 530 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 529 Bottles of Beer on the wall." cr
+." Oh, 529 Bottles of Beer on the wall," cr
+." 529 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 528 Bottles of Beer on the wall." cr
+." Oh, 528 Bottles of Beer on the wall," cr
+." 528 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 527 Bottles of Beer on the wall." cr
+." Oh, 527 Bottles of Beer on the wall," cr
+." 527 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 526 Bottles of Beer on the wall." cr
+." Oh, 526 Bottles of Beer on the wall," cr
+." 526 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 525 Bottles of Beer on the wall." cr
+." Oh, 525 Bottles of Beer on the wall," cr
+." 525 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 524 Bottles of Beer on the wall." cr
+." Oh, 524 Bottles of Beer on the wall," cr
+." 524 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 523 Bottles of Beer on the wall." cr
+." Oh, 523 Bottles of Beer on the wall," cr
+." 523 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 522 Bottles of Beer on the wall." cr
+." Oh, 522 Bottles of Beer on the wall," cr
+." 522 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 521 Bottles of Beer on the wall." cr
+." Oh, 521 Bottles of Beer on the wall," cr
+." 521 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 520 Bottles of Beer on the wall." cr
+." Oh, 520 Bottles of Beer on the wall," cr
+." 520 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 519 Bottles of Beer on the wall." cr
+." Oh, 519 Bottles of Beer on the wall," cr
+." 519 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 518 Bottles of Beer on the wall." cr
+." Oh, 518 Bottles of Beer on the wall," cr
+." 518 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 517 Bottles of Beer on the wall." cr
+." Oh, 517 Bottles of Beer on the wall," cr
+." 517 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 516 Bottles of Beer on the wall." cr
+." Oh, 516 Bottles of Beer on the wall," cr
+." 516 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 515 Bottles of Beer on the wall." cr
+." Oh, 515 Bottles of Beer on the wall," cr
+." 515 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 514 Bottles of Beer on the wall." cr
+." Oh, 514 Bottles of Beer on the wall," cr
+." 514 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 513 Bottles of Beer on the wall." cr
+." Oh, 513 Bottles of Beer on the wall," cr
+." 513 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 512 Bottles of Beer on the wall." cr
+." Oh, 512 Bottles of Beer on the wall," cr
+." 512 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 511 Bottles of Beer on the wall." cr
+." Oh, 511 Bottles of Beer on the wall," cr
+." 511 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 510 Bottles of Beer on the wall." cr
+." Oh, 510 Bottles of Beer on the wall," cr
+." 510 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 509 Bottles of Beer on the wall." cr
+." Oh, 509 Bottles of Beer on the wall," cr
+." 509 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 508 Bottles of Beer on the wall." cr
+." Oh, 508 Bottles of Beer on the wall," cr
+." 508 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 507 Bottles of Beer on the wall." cr
+." Oh, 507 Bottles of Beer on the wall," cr
+." 507 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 506 Bottles of Beer on the wall." cr
+." Oh, 506 Bottles of Beer on the wall," cr
+." 506 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 505 Bottles of Beer on the wall." cr
+." Oh, 505 Bottles of Beer on the wall," cr
+." 505 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 504 Bottles of Beer on the wall." cr
+." Oh, 504 Bottles of Beer on the wall," cr
+." 504 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 503 Bottles of Beer on the wall." cr
+." Oh, 503 Bottles of Beer on the wall," cr
+." 503 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 502 Bottles of Beer on the wall." cr
+." Oh, 502 Bottles of Beer on the wall," cr
+." 502 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 501 Bottles of Beer on the wall." cr
+." Oh, 501 Bottles of Beer on the wall," cr
+." 501 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 500 Bottles of Beer on the wall." cr
+." Oh, 500 Bottles of Beer on the wall," cr
+." 500 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 499 Bottles of Beer on the wall." cr
+." Oh, 499 Bottles of Beer on the wall," cr
+." 499 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 498 Bottles of Beer on the wall." cr
+." Oh, 498 Bottles of Beer on the wall," cr
+." 498 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 497 Bottles of Beer on the wall." cr
+." Oh, 497 Bottles of Beer on the wall," cr
+." 497 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 496 Bottles of Beer on the wall." cr
+." Oh, 496 Bottles of Beer on the wall," cr
+." 496 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 495 Bottles of Beer on the wall." cr
+." Oh, 495 Bottles of Beer on the wall," cr
+." 495 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 494 Bottles of Beer on the wall." cr
+." Oh, 494 Bottles of Beer on the wall," cr
+." 494 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 493 Bottles of Beer on the wall." cr
+." Oh, 493 Bottles of Beer on the wall," cr
+." 493 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 492 Bottles of Beer on the wall." cr
+." Oh, 492 Bottles of Beer on the wall," cr
+." 492 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 491 Bottles of Beer on the wall." cr
+." Oh, 491 Bottles of Beer on the wall," cr
+." 491 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 490 Bottles of Beer on the wall." cr
+." Oh, 490 Bottles of Beer on the wall," cr
+." 490 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 489 Bottles of Beer on the wall." cr
+." Oh, 489 Bottles of Beer on the wall," cr
+." 489 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 488 Bottles of Beer on the wall." cr
+." Oh, 488 Bottles of Beer on the wall," cr
+." 488 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 487 Bottles of Beer on the wall." cr
+." Oh, 487 Bottles of Beer on the wall," cr
+." 487 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 486 Bottles of Beer on the wall." cr
+." Oh, 486 Bottles of Beer on the wall," cr
+." 486 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 485 Bottles of Beer on the wall." cr
+." Oh, 485 Bottles of Beer on the wall," cr
+." 485 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 484 Bottles of Beer on the wall." cr
+." Oh, 484 Bottles of Beer on the wall," cr
+." 484 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 483 Bottles of Beer on the wall." cr
+." Oh, 483 Bottles of Beer on the wall," cr
+." 483 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 482 Bottles of Beer on the wall." cr
+." Oh, 482 Bottles of Beer on the wall," cr
+." 482 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 481 Bottles of Beer on the wall." cr
+." Oh, 481 Bottles of Beer on the wall," cr
+." 481 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 480 Bottles of Beer on the wall." cr
+." Oh, 480 Bottles of Beer on the wall," cr
+." 480 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 479 Bottles of Beer on the wall." cr
+." Oh, 479 Bottles of Beer on the wall," cr
+." 479 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 478 Bottles of Beer on the wall." cr
+." Oh, 478 Bottles of Beer on the wall," cr
+." 478 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 477 Bottles of Beer on the wall." cr
+." Oh, 477 Bottles of Beer on the wall," cr
+." 477 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 476 Bottles of Beer on the wall." cr
+." Oh, 476 Bottles of Beer on the wall," cr
+." 476 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 475 Bottles of Beer on the wall." cr
+." Oh, 475 Bottles of Beer on the wall," cr
+." 475 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 474 Bottles of Beer on the wall." cr
+." Oh, 474 Bottles of Beer on the wall," cr
+." 474 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 473 Bottles of Beer on the wall." cr
+." Oh, 473 Bottles of Beer on the wall," cr
+." 473 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 472 Bottles of Beer on the wall." cr
+." Oh, 472 Bottles of Beer on the wall," cr
+." 472 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 471 Bottles of Beer on the wall." cr
+." Oh, 471 Bottles of Beer on the wall," cr
+." 471 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 470 Bottles of Beer on the wall." cr
+." Oh, 470 Bottles of Beer on the wall," cr
+." 470 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 469 Bottles of Beer on the wall." cr
+." Oh, 469 Bottles of Beer on the wall," cr
+." 469 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 468 Bottles of Beer on the wall." cr
+." Oh, 468 Bottles of Beer on the wall," cr
+." 468 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 467 Bottles of Beer on the wall." cr
+." Oh, 467 Bottles of Beer on the wall," cr
+." 467 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 466 Bottles of Beer on the wall." cr
+." Oh, 466 Bottles of Beer on the wall," cr
+." 466 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 465 Bottles of Beer on the wall." cr
+." Oh, 465 Bottles of Beer on the wall," cr
+." 465 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 464 Bottles of Beer on the wall." cr
+." Oh, 464 Bottles of Beer on the wall," cr
+." 464 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 463 Bottles of Beer on the wall." cr
+." Oh, 463 Bottles of Beer on the wall," cr
+." 463 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 462 Bottles of Beer on the wall." cr
+." Oh, 462 Bottles of Beer on the wall," cr
+." 462 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 461 Bottles of Beer on the wall." cr
+." Oh, 461 Bottles of Beer on the wall," cr
+." 461 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 460 Bottles of Beer on the wall." cr
+." Oh, 460 Bottles of Beer on the wall," cr
+." 460 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 459 Bottles of Beer on the wall." cr
+." Oh, 459 Bottles of Beer on the wall," cr
+." 459 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 458 Bottles of Beer on the wall." cr
+." Oh, 458 Bottles of Beer on the wall," cr
+." 458 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 457 Bottles of Beer on the wall." cr
+." Oh, 457 Bottles of Beer on the wall," cr
+." 457 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 456 Bottles of Beer on the wall." cr
+." Oh, 456 Bottles of Beer on the wall," cr
+." 456 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 455 Bottles of Beer on the wall." cr
+." Oh, 455 Bottles of Beer on the wall," cr
+." 455 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 454 Bottles of Beer on the wall." cr
+." Oh, 454 Bottles of Beer on the wall," cr
+." 454 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 453 Bottles of Beer on the wall." cr
+." Oh, 453 Bottles of Beer on the wall," cr
+." 453 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 452 Bottles of Beer on the wall." cr
+." Oh, 452 Bottles of Beer on the wall," cr
+." 452 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 451 Bottles of Beer on the wall." cr
+." Oh, 451 Bottles of Beer on the wall," cr
+." 451 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 450 Bottles of Beer on the wall." cr
+." Oh, 450 Bottles of Beer on the wall," cr
+." 450 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 449 Bottles of Beer on the wall." cr
+." Oh, 449 Bottles of Beer on the wall," cr
+." 449 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 448 Bottles of Beer on the wall." cr
+." Oh, 448 Bottles of Beer on the wall," cr
+." 448 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 447 Bottles of Beer on the wall." cr
+." Oh, 447 Bottles of Beer on the wall," cr
+." 447 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 446 Bottles of Beer on the wall." cr
+." Oh, 446 Bottles of Beer on the wall," cr
+." 446 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 445 Bottles of Beer on the wall." cr
+." Oh, 445 Bottles of Beer on the wall," cr
+." 445 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 444 Bottles of Beer on the wall." cr
+." Oh, 444 Bottles of Beer on the wall," cr
+." 444 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 443 Bottles of Beer on the wall." cr
+." Oh, 443 Bottles of Beer on the wall," cr
+." 443 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 442 Bottles of Beer on the wall." cr
+." Oh, 442 Bottles of Beer on the wall," cr
+." 442 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 441 Bottles of Beer on the wall." cr
+." Oh, 441 Bottles of Beer on the wall," cr
+." 441 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 440 Bottles of Beer on the wall." cr
+." Oh, 440 Bottles of Beer on the wall," cr
+." 440 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 439 Bottles of Beer on the wall." cr
+." Oh, 439 Bottles of Beer on the wall," cr
+." 439 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 438 Bottles of Beer on the wall." cr
+." Oh, 438 Bottles of Beer on the wall," cr
+." 438 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 437 Bottles of Beer on the wall." cr
+." Oh, 437 Bottles of Beer on the wall," cr
+." 437 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 436 Bottles of Beer on the wall." cr
+." Oh, 436 Bottles of Beer on the wall," cr
+." 436 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 435 Bottles of Beer on the wall." cr
+." Oh, 435 Bottles of Beer on the wall," cr
+." 435 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 434 Bottles of Beer on the wall." cr
+." Oh, 434 Bottles of Beer on the wall," cr
+." 434 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 433 Bottles of Beer on the wall." cr
+." Oh, 433 Bottles of Beer on the wall," cr
+." 433 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 432 Bottles of Beer on the wall." cr
+." Oh, 432 Bottles of Beer on the wall," cr
+." 432 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 431 Bottles of Beer on the wall." cr
+." Oh, 431 Bottles of Beer on the wall," cr
+." 431 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 430 Bottles of Beer on the wall." cr
+." Oh, 430 Bottles of Beer on the wall," cr
+." 430 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 429 Bottles of Beer on the wall." cr
+." Oh, 429 Bottles of Beer on the wall," cr
+." 429 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 428 Bottles of Beer on the wall." cr
+." Oh, 428 Bottles of Beer on the wall," cr
+." 428 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 427 Bottles of Beer on the wall." cr
+." Oh, 427 Bottles of Beer on the wall," cr
+." 427 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 426 Bottles of Beer on the wall." cr
+." Oh, 426 Bottles of Beer on the wall," cr
+." 426 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 425 Bottles of Beer on the wall." cr
+." Oh, 425 Bottles of Beer on the wall," cr
+." 425 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 424 Bottles of Beer on the wall." cr
+." Oh, 424 Bottles of Beer on the wall," cr
+." 424 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 423 Bottles of Beer on the wall." cr
+." Oh, 423 Bottles of Beer on the wall," cr
+." 423 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 422 Bottles of Beer on the wall." cr
+." Oh, 422 Bottles of Beer on the wall," cr
+." 422 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 421 Bottles of Beer on the wall." cr
+." Oh, 421 Bottles of Beer on the wall," cr
+." 421 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 420 Bottles of Beer on the wall." cr
+." Oh, 420 Bottles of Beer on the wall," cr
+." 420 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 419 Bottles of Beer on the wall." cr
+." Oh, 419 Bottles of Beer on the wall," cr
+." 419 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 418 Bottles of Beer on the wall." cr
+." Oh, 418 Bottles of Beer on the wall," cr
+." 418 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 417 Bottles of Beer on the wall." cr
+." Oh, 417 Bottles of Beer on the wall," cr
+." 417 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 416 Bottles of Beer on the wall." cr
+." Oh, 416 Bottles of Beer on the wall," cr
+." 416 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 415 Bottles of Beer on the wall." cr
+." Oh, 415 Bottles of Beer on the wall," cr
+." 415 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 414 Bottles of Beer on the wall." cr
+." Oh, 414 Bottles of Beer on the wall," cr
+." 414 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 413 Bottles of Beer on the wall." cr
+." Oh, 413 Bottles of Beer on the wall," cr
+." 413 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 412 Bottles of Beer on the wall." cr
+." Oh, 412 Bottles of Beer on the wall," cr
+." 412 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 411 Bottles of Beer on the wall." cr
+." Oh, 411 Bottles of Beer on the wall," cr
+." 411 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 410 Bottles of Beer on the wall." cr
+." Oh, 410 Bottles of Beer on the wall," cr
+." 410 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 409 Bottles of Beer on the wall." cr
+." Oh, 409 Bottles of Beer on the wall," cr
+." 409 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 408 Bottles of Beer on the wall." cr
+." Oh, 408 Bottles of Beer on the wall," cr
+." 408 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 407 Bottles of Beer on the wall." cr
+." Oh, 407 Bottles of Beer on the wall," cr
+." 407 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 406 Bottles of Beer on the wall." cr
+." Oh, 406 Bottles of Beer on the wall," cr
+." 406 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 405 Bottles of Beer on the wall." cr
+." Oh, 405 Bottles of Beer on the wall," cr
+." 405 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 404 Bottles of Beer on the wall." cr
+." Oh, 404 Bottles of Beer on the wall," cr
+." 404 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 403 Bottles of Beer on the wall." cr
+." Oh, 403 Bottles of Beer on the wall," cr
+." 403 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 402 Bottles of Beer on the wall." cr
+." Oh, 402 Bottles of Beer on the wall," cr
+." 402 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 401 Bottles of Beer on the wall." cr
+." Oh, 401 Bottles of Beer on the wall," cr
+." 401 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 400 Bottles of Beer on the wall." cr
+." Oh, 400 Bottles of Beer on the wall," cr
+." 400 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 399 Bottles of Beer on the wall." cr
+." Oh, 399 Bottles of Beer on the wall," cr
+." 399 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 398 Bottles of Beer on the wall." cr
+." Oh, 398 Bottles of Beer on the wall," cr
+." 398 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 397 Bottles of Beer on the wall." cr
+." Oh, 397 Bottles of Beer on the wall," cr
+." 397 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 396 Bottles of Beer on the wall." cr
+." Oh, 396 Bottles of Beer on the wall," cr
+." 396 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 395 Bottles of Beer on the wall." cr
+." Oh, 395 Bottles of Beer on the wall," cr
+." 395 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 394 Bottles of Beer on the wall." cr
+." Oh, 394 Bottles of Beer on the wall," cr
+." 394 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 393 Bottles of Beer on the wall." cr
+." Oh, 393 Bottles of Beer on the wall," cr
+." 393 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 392 Bottles of Beer on the wall." cr
+." Oh, 392 Bottles of Beer on the wall," cr
+." 392 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 391 Bottles of Beer on the wall." cr
+." Oh, 391 Bottles of Beer on the wall," cr
+." 391 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 390 Bottles of Beer on the wall." cr
+." Oh, 390 Bottles of Beer on the wall," cr
+." 390 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 389 Bottles of Beer on the wall." cr
+." Oh, 389 Bottles of Beer on the wall," cr
+." 389 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 388 Bottles of Beer on the wall." cr
+." Oh, 388 Bottles of Beer on the wall," cr
+." 388 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 387 Bottles of Beer on the wall." cr
+." Oh, 387 Bottles of Beer on the wall," cr
+." 387 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 386 Bottles of Beer on the wall." cr
+." Oh, 386 Bottles of Beer on the wall," cr
+." 386 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 385 Bottles of Beer on the wall." cr
+." Oh, 385 Bottles of Beer on the wall," cr
+." 385 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 384 Bottles of Beer on the wall." cr
+." Oh, 384 Bottles of Beer on the wall," cr
+." 384 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 383 Bottles of Beer on the wall." cr
+." Oh, 383 Bottles of Beer on the wall," cr
+." 383 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 382 Bottles of Beer on the wall." cr
+." Oh, 382 Bottles of Beer on the wall," cr
+." 382 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 381 Bottles of Beer on the wall." cr
+." Oh, 381 Bottles of Beer on the wall," cr
+." 381 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 380 Bottles of Beer on the wall." cr
+." Oh, 380 Bottles of Beer on the wall," cr
+." 380 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 379 Bottles of Beer on the wall." cr
+." Oh, 379 Bottles of Beer on the wall," cr
+." 379 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 378 Bottles of Beer on the wall." cr
+." Oh, 378 Bottles of Beer on the wall," cr
+." 378 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 377 Bottles of Beer on the wall." cr
+." Oh, 377 Bottles of Beer on the wall," cr
+." 377 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 376 Bottles of Beer on the wall." cr
+." Oh, 376 Bottles of Beer on the wall," cr
+." 376 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 375 Bottles of Beer on the wall." cr
+." Oh, 375 Bottles of Beer on the wall," cr
+." 375 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 374 Bottles of Beer on the wall." cr
+." Oh, 374 Bottles of Beer on the wall," cr
+." 374 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 373 Bottles of Beer on the wall." cr
+." Oh, 373 Bottles of Beer on the wall," cr
+." 373 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 372 Bottles of Beer on the wall." cr
+." Oh, 372 Bottles of Beer on the wall," cr
+." 372 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 371 Bottles of Beer on the wall." cr
+." Oh, 371 Bottles of Beer on the wall," cr
+." 371 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 370 Bottles of Beer on the wall." cr
+." Oh, 370 Bottles of Beer on the wall," cr
+." 370 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 369 Bottles of Beer on the wall." cr
+." Oh, 369 Bottles of Beer on the wall," cr
+." 369 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 368 Bottles of Beer on the wall." cr
+." Oh, 368 Bottles of Beer on the wall," cr
+." 368 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 367 Bottles of Beer on the wall." cr
+." Oh, 367 Bottles of Beer on the wall," cr
+." 367 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 366 Bottles of Beer on the wall." cr
+." Oh, 366 Bottles of Beer on the wall," cr
+." 366 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 365 Bottles of Beer on the wall." cr
+." Oh, 365 Bottles of Beer on the wall," cr
+." 365 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 364 Bottles of Beer on the wall." cr
+." Oh, 364 Bottles of Beer on the wall," cr
+." 364 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 363 Bottles of Beer on the wall." cr
+." Oh, 363 Bottles of Beer on the wall," cr
+." 363 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 362 Bottles of Beer on the wall." cr
+." Oh, 362 Bottles of Beer on the wall," cr
+." 362 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 361 Bottles of Beer on the wall." cr
+." Oh, 361 Bottles of Beer on the wall," cr
+." 361 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 360 Bottles of Beer on the wall." cr
+." Oh, 360 Bottles of Beer on the wall," cr
+." 360 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 359 Bottles of Beer on the wall." cr
+." Oh, 359 Bottles of Beer on the wall," cr
+." 359 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 358 Bottles of Beer on the wall." cr
+." Oh, 358 Bottles of Beer on the wall," cr
+." 358 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 357 Bottles of Beer on the wall." cr
+." Oh, 357 Bottles of Beer on the wall," cr
+." 357 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 356 Bottles of Beer on the wall." cr
+." Oh, 356 Bottles of Beer on the wall," cr
+." 356 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 355 Bottles of Beer on the wall." cr
+." Oh, 355 Bottles of Beer on the wall," cr
+." 355 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 354 Bottles of Beer on the wall." cr
+." Oh, 354 Bottles of Beer on the wall," cr
+." 354 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 353 Bottles of Beer on the wall." cr
+." Oh, 353 Bottles of Beer on the wall," cr
+." 353 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 352 Bottles of Beer on the wall." cr
+." Oh, 352 Bottles of Beer on the wall," cr
+." 352 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 351 Bottles of Beer on the wall." cr
+." Oh, 351 Bottles of Beer on the wall," cr
+." 351 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 350 Bottles of Beer on the wall." cr
+." Oh, 350 Bottles of Beer on the wall," cr
+." 350 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 349 Bottles of Beer on the wall." cr
+." Oh, 349 Bottles of Beer on the wall," cr
+." 349 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 348 Bottles of Beer on the wall." cr
+." Oh, 348 Bottles of Beer on the wall," cr
+." 348 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 347 Bottles of Beer on the wall." cr
+." Oh, 347 Bottles of Beer on the wall," cr
+." 347 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 346 Bottles of Beer on the wall." cr
+." Oh, 346 Bottles of Beer on the wall," cr
+." 346 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 345 Bottles of Beer on the wall." cr
+." Oh, 345 Bottles of Beer on the wall," cr
+." 345 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 344 Bottles of Beer on the wall." cr
+." Oh, 344 Bottles of Beer on the wall," cr
+." 344 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 343 Bottles of Beer on the wall." cr
+." Oh, 343 Bottles of Beer on the wall," cr
+." 343 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 342 Bottles of Beer on the wall." cr
+." Oh, 342 Bottles of Beer on the wall," cr
+." 342 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 341 Bottles of Beer on the wall." cr
+." Oh, 341 Bottles of Beer on the wall," cr
+." 341 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 340 Bottles of Beer on the wall." cr
+." Oh, 340 Bottles of Beer on the wall," cr
+." 340 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 339 Bottles of Beer on the wall." cr
+." Oh, 339 Bottles of Beer on the wall," cr
+." 339 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 338 Bottles of Beer on the wall." cr
+." Oh, 338 Bottles of Beer on the wall," cr
+." 338 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 337 Bottles of Beer on the wall." cr
+." Oh, 337 Bottles of Beer on the wall," cr
+." 337 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 336 Bottles of Beer on the wall." cr
+." Oh, 336 Bottles of Beer on the wall," cr
+." 336 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 335 Bottles of Beer on the wall." cr
+." Oh, 335 Bottles of Beer on the wall," cr
+." 335 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 334 Bottles of Beer on the wall." cr
+." Oh, 334 Bottles of Beer on the wall," cr
+." 334 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 333 Bottles of Beer on the wall." cr
+." Oh, 333 Bottles of Beer on the wall," cr
+." 333 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 332 Bottles of Beer on the wall." cr
+." Oh, 332 Bottles of Beer on the wall," cr
+." 332 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 331 Bottles of Beer on the wall." cr
+." Oh, 331 Bottles of Beer on the wall," cr
+." 331 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 330 Bottles of Beer on the wall." cr
+." Oh, 330 Bottles of Beer on the wall," cr
+." 330 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 329 Bottles of Beer on the wall." cr
+." Oh, 329 Bottles of Beer on the wall," cr
+." 329 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 328 Bottles of Beer on the wall." cr
+." Oh, 328 Bottles of Beer on the wall," cr
+." 328 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 327 Bottles of Beer on the wall." cr
+." Oh, 327 Bottles of Beer on the wall," cr
+." 327 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 326 Bottles of Beer on the wall." cr
+." Oh, 326 Bottles of Beer on the wall," cr
+." 326 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 325 Bottles of Beer on the wall." cr
+." Oh, 325 Bottles of Beer on the wall," cr
+." 325 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 324 Bottles of Beer on the wall." cr
+." Oh, 324 Bottles of Beer on the wall," cr
+." 324 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 323 Bottles of Beer on the wall." cr
+." Oh, 323 Bottles of Beer on the wall," cr
+." 323 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 322 Bottles of Beer on the wall." cr
+." Oh, 322 Bottles of Beer on the wall," cr
+." 322 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 321 Bottles of Beer on the wall." cr
+." Oh, 321 Bottles of Beer on the wall," cr
+." 321 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 320 Bottles of Beer on the wall." cr
+." Oh, 320 Bottles of Beer on the wall," cr
+." 320 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 319 Bottles of Beer on the wall." cr
+." Oh, 319 Bottles of Beer on the wall," cr
+." 319 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 318 Bottles of Beer on the wall." cr
+." Oh, 318 Bottles of Beer on the wall," cr
+." 318 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 317 Bottles of Beer on the wall." cr
+." Oh, 317 Bottles of Beer on the wall," cr
+." 317 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 316 Bottles of Beer on the wall." cr
+." Oh, 316 Bottles of Beer on the wall," cr
+." 316 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 315 Bottles of Beer on the wall." cr
+." Oh, 315 Bottles of Beer on the wall," cr
+." 315 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 314 Bottles of Beer on the wall." cr
+." Oh, 314 Bottles of Beer on the wall," cr
+." 314 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 313 Bottles of Beer on the wall." cr
+." Oh, 313 Bottles of Beer on the wall," cr
+." 313 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 312 Bottles of Beer on the wall." cr
+." Oh, 312 Bottles of Beer on the wall," cr
+." 312 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 311 Bottles of Beer on the wall." cr
+." Oh, 311 Bottles of Beer on the wall," cr
+." 311 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 310 Bottles of Beer on the wall." cr
+." Oh, 310 Bottles of Beer on the wall," cr
+." 310 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 309 Bottles of Beer on the wall." cr
+." Oh, 309 Bottles of Beer on the wall," cr
+." 309 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 308 Bottles of Beer on the wall." cr
+." Oh, 308 Bottles of Beer on the wall," cr
+." 308 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 307 Bottles of Beer on the wall." cr
+." Oh, 307 Bottles of Beer on the wall," cr
+." 307 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 306 Bottles of Beer on the wall." cr
+." Oh, 306 Bottles of Beer on the wall," cr
+." 306 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 305 Bottles of Beer on the wall." cr
+." Oh, 305 Bottles of Beer on the wall," cr
+." 305 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 304 Bottles of Beer on the wall." cr
+." Oh, 304 Bottles of Beer on the wall," cr
+." 304 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 303 Bottles of Beer on the wall." cr
+." Oh, 303 Bottles of Beer on the wall," cr
+." 303 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 302 Bottles of Beer on the wall." cr
+." Oh, 302 Bottles of Beer on the wall," cr
+." 302 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 301 Bottles of Beer on the wall." cr
+." Oh, 301 Bottles of Beer on the wall," cr
+." 301 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 300 Bottles of Beer on the wall." cr
+." Oh, 300 Bottles of Beer on the wall," cr
+." 300 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 299 Bottles of Beer on the wall." cr
+." Oh, 299 Bottles of Beer on the wall," cr
+." 299 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 298 Bottles of Beer on the wall." cr
+." Oh, 298 Bottles of Beer on the wall," cr
+." 298 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 297 Bottles of Beer on the wall." cr
+." Oh, 297 Bottles of Beer on the wall," cr
+." 297 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 296 Bottles of Beer on the wall." cr
+." Oh, 296 Bottles of Beer on the wall," cr
+." 296 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 295 Bottles of Beer on the wall." cr
+." Oh, 295 Bottles of Beer on the wall," cr
+." 295 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 294 Bottles of Beer on the wall." cr
+." Oh, 294 Bottles of Beer on the wall," cr
+." 294 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 293 Bottles of Beer on the wall." cr
+." Oh, 293 Bottles of Beer on the wall," cr
+." 293 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 292 Bottles of Beer on the wall." cr
+." Oh, 292 Bottles of Beer on the wall," cr
+." 292 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 291 Bottles of Beer on the wall." cr
+." Oh, 291 Bottles of Beer on the wall," cr
+." 291 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 290 Bottles of Beer on the wall." cr
+." Oh, 290 Bottles of Beer on the wall," cr
+." 290 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 289 Bottles of Beer on the wall." cr
+." Oh, 289 Bottles of Beer on the wall," cr
+." 289 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 288 Bottles of Beer on the wall." cr
+." Oh, 288 Bottles of Beer on the wall," cr
+." 288 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 287 Bottles of Beer on the wall." cr
+." Oh, 287 Bottles of Beer on the wall," cr
+." 287 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 286 Bottles of Beer on the wall." cr
+." Oh, 286 Bottles of Beer on the wall," cr
+." 286 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 285 Bottles of Beer on the wall." cr
+." Oh, 285 Bottles of Beer on the wall," cr
+." 285 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 284 Bottles of Beer on the wall." cr
+." Oh, 284 Bottles of Beer on the wall," cr
+." 284 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 283 Bottles of Beer on the wall." cr
+." Oh, 283 Bottles of Beer on the wall," cr
+." 283 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 282 Bottles of Beer on the wall." cr
+." Oh, 282 Bottles of Beer on the wall," cr
+." 282 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 281 Bottles of Beer on the wall." cr
+." Oh, 281 Bottles of Beer on the wall," cr
+." 281 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 280 Bottles of Beer on the wall." cr
+." Oh, 280 Bottles of Beer on the wall," cr
+." 280 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 279 Bottles of Beer on the wall." cr
+." Oh, 279 Bottles of Beer on the wall," cr
+." 279 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 278 Bottles of Beer on the wall." cr
+." Oh, 278 Bottles of Beer on the wall," cr
+." 278 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 277 Bottles of Beer on the wall." cr
+." Oh, 277 Bottles of Beer on the wall," cr
+." 277 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 276 Bottles of Beer on the wall." cr
+." Oh, 276 Bottles of Beer on the wall," cr
+." 276 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 275 Bottles of Beer on the wall." cr
+." Oh, 275 Bottles of Beer on the wall," cr
+." 275 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 274 Bottles of Beer on the wall." cr
+." Oh, 274 Bottles of Beer on the wall," cr
+." 274 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 273 Bottles of Beer on the wall." cr
+." Oh, 273 Bottles of Beer on the wall," cr
+." 273 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 272 Bottles of Beer on the wall." cr
+." Oh, 272 Bottles of Beer on the wall," cr
+." 272 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 271 Bottles of Beer on the wall." cr
+." Oh, 271 Bottles of Beer on the wall," cr
+." 271 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 270 Bottles of Beer on the wall." cr
+." Oh, 270 Bottles of Beer on the wall," cr
+." 270 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 269 Bottles of Beer on the wall." cr
+." Oh, 269 Bottles of Beer on the wall," cr
+." 269 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 268 Bottles of Beer on the wall." cr
+." Oh, 268 Bottles of Beer on the wall," cr
+." 268 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 267 Bottles of Beer on the wall." cr
+." Oh, 267 Bottles of Beer on the wall," cr
+." 267 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 266 Bottles of Beer on the wall." cr
+." Oh, 266 Bottles of Beer on the wall," cr
+." 266 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 265 Bottles of Beer on the wall." cr
+." Oh, 265 Bottles of Beer on the wall," cr
+." 265 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 264 Bottles of Beer on the wall." cr
+." Oh, 264 Bottles of Beer on the wall," cr
+." 264 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 263 Bottles of Beer on the wall." cr
+." Oh, 263 Bottles of Beer on the wall," cr
+." 263 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 262 Bottles of Beer on the wall." cr
+." Oh, 262 Bottles of Beer on the wall," cr
+." 262 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 261 Bottles of Beer on the wall." cr
+." Oh, 261 Bottles of Beer on the wall," cr
+." 261 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 260 Bottles of Beer on the wall." cr
+." Oh, 260 Bottles of Beer on the wall," cr
+." 260 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 259 Bottles of Beer on the wall." cr
+." Oh, 259 Bottles of Beer on the wall," cr
+." 259 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 258 Bottles of Beer on the wall." cr
+." Oh, 258 Bottles of Beer on the wall," cr
+." 258 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 257 Bottles of Beer on the wall." cr
+." Oh, 257 Bottles of Beer on the wall," cr
+." 257 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 256 Bottles of Beer on the wall." cr
+." Oh, 256 Bottles of Beer on the wall," cr
+." 256 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 255 Bottles of Beer on the wall." cr
+." Oh, 255 Bottles of Beer on the wall," cr
+." 255 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 254 Bottles of Beer on the wall." cr
+." Oh, 254 Bottles of Beer on the wall," cr
+." 254 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 253 Bottles of Beer on the wall." cr
+." Oh, 253 Bottles of Beer on the wall," cr
+." 253 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 252 Bottles of Beer on the wall." cr
+." Oh, 252 Bottles of Beer on the wall," cr
+." 252 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 251 Bottles of Beer on the wall." cr
+." Oh, 251 Bottles of Beer on the wall," cr
+." 251 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 250 Bottles of Beer on the wall." cr
+." Oh, 250 Bottles of Beer on the wall," cr
+." 250 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 249 Bottles of Beer on the wall." cr
+." Oh, 249 Bottles of Beer on the wall," cr
+." 249 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 248 Bottles of Beer on the wall." cr
+." Oh, 248 Bottles of Beer on the wall," cr
+." 248 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 247 Bottles of Beer on the wall." cr
+." Oh, 247 Bottles of Beer on the wall," cr
+." 247 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 246 Bottles of Beer on the wall." cr
+." Oh, 246 Bottles of Beer on the wall," cr
+." 246 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 245 Bottles of Beer on the wall." cr
+." Oh, 245 Bottles of Beer on the wall," cr
+." 245 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 244 Bottles of Beer on the wall." cr
+." Oh, 244 Bottles of Beer on the wall," cr
+." 244 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 243 Bottles of Beer on the wall." cr
+." Oh, 243 Bottles of Beer on the wall," cr
+." 243 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 242 Bottles of Beer on the wall." cr
+." Oh, 242 Bottles of Beer on the wall," cr
+." 242 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 241 Bottles of Beer on the wall." cr
+." Oh, 241 Bottles of Beer on the wall," cr
+." 241 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 240 Bottles of Beer on the wall." cr
+." Oh, 240 Bottles of Beer on the wall," cr
+." 240 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 239 Bottles of Beer on the wall." cr
+." Oh, 239 Bottles of Beer on the wall," cr
+." 239 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 238 Bottles of Beer on the wall." cr
+." Oh, 238 Bottles of Beer on the wall," cr
+." 238 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 237 Bottles of Beer on the wall." cr
+." Oh, 237 Bottles of Beer on the wall," cr
+." 237 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 236 Bottles of Beer on the wall." cr
+." Oh, 236 Bottles of Beer on the wall," cr
+." 236 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 235 Bottles of Beer on the wall." cr
+." Oh, 235 Bottles of Beer on the wall," cr
+." 235 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 234 Bottles of Beer on the wall." cr
+." Oh, 234 Bottles of Beer on the wall," cr
+." 234 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 233 Bottles of Beer on the wall." cr
+." Oh, 233 Bottles of Beer on the wall," cr
+." 233 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 232 Bottles of Beer on the wall." cr
+." Oh, 232 Bottles of Beer on the wall," cr
+." 232 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 231 Bottles of Beer on the wall." cr
+." Oh, 231 Bottles of Beer on the wall," cr
+." 231 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 230 Bottles of Beer on the wall." cr
+." Oh, 230 Bottles of Beer on the wall," cr
+." 230 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 229 Bottles of Beer on the wall." cr
+." Oh, 229 Bottles of Beer on the wall," cr
+." 229 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 228 Bottles of Beer on the wall." cr
+." Oh, 228 Bottles of Beer on the wall," cr
+." 228 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 227 Bottles of Beer on the wall." cr
+." Oh, 227 Bottles of Beer on the wall," cr
+." 227 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 226 Bottles of Beer on the wall." cr
+." Oh, 226 Bottles of Beer on the wall," cr
+." 226 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 225 Bottles of Beer on the wall." cr
+." Oh, 225 Bottles of Beer on the wall," cr
+." 225 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 224 Bottles of Beer on the wall." cr
+." Oh, 224 Bottles of Beer on the wall," cr
+." 224 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 223 Bottles of Beer on the wall." cr
+." Oh, 223 Bottles of Beer on the wall," cr
+." 223 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 222 Bottles of Beer on the wall." cr
+." Oh, 222 Bottles of Beer on the wall," cr
+." 222 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 221 Bottles of Beer on the wall." cr
+." Oh, 221 Bottles of Beer on the wall," cr
+." 221 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 220 Bottles of Beer on the wall." cr
+." Oh, 220 Bottles of Beer on the wall," cr
+." 220 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 219 Bottles of Beer on the wall." cr
+." Oh, 219 Bottles of Beer on the wall," cr
+." 219 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 218 Bottles of Beer on the wall." cr
+." Oh, 218 Bottles of Beer on the wall," cr
+." 218 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 217 Bottles of Beer on the wall." cr
+." Oh, 217 Bottles of Beer on the wall," cr
+." 217 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 216 Bottles of Beer on the wall." cr
+." Oh, 216 Bottles of Beer on the wall," cr
+." 216 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 215 Bottles of Beer on the wall." cr
+." Oh, 215 Bottles of Beer on the wall," cr
+." 215 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 214 Bottles of Beer on the wall." cr
+." Oh, 214 Bottles of Beer on the wall," cr
+." 214 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 213 Bottles of Beer on the wall." cr
+." Oh, 213 Bottles of Beer on the wall," cr
+." 213 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 212 Bottles of Beer on the wall." cr
+." Oh, 212 Bottles of Beer on the wall," cr
+." 212 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 211 Bottles of Beer on the wall." cr
+." Oh, 211 Bottles of Beer on the wall," cr
+." 211 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 210 Bottles of Beer on the wall." cr
+." Oh, 210 Bottles of Beer on the wall," cr
+." 210 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 209 Bottles of Beer on the wall." cr
+." Oh, 209 Bottles of Beer on the wall," cr
+." 209 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 208 Bottles of Beer on the wall." cr
+." Oh, 208 Bottles of Beer on the wall," cr
+." 208 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 207 Bottles of Beer on the wall." cr
+." Oh, 207 Bottles of Beer on the wall," cr
+." 207 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 206 Bottles of Beer on the wall." cr
+." Oh, 206 Bottles of Beer on the wall," cr
+." 206 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 205 Bottles of Beer on the wall." cr
+." Oh, 205 Bottles of Beer on the wall," cr
+." 205 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 204 Bottles of Beer on the wall." cr
+." Oh, 204 Bottles of Beer on the wall," cr
+." 204 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 203 Bottles of Beer on the wall." cr
+." Oh, 203 Bottles of Beer on the wall," cr
+." 203 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 202 Bottles of Beer on the wall." cr
+." Oh, 202 Bottles of Beer on the wall," cr
+." 202 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 201 Bottles of Beer on the wall." cr
+." Oh, 201 Bottles of Beer on the wall," cr
+." 201 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 200 Bottles of Beer on the wall." cr
+." Oh, 200 Bottles of Beer on the wall," cr
+." 200 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 199 Bottles of Beer on the wall." cr
+." Oh, 199 Bottles of Beer on the wall," cr
+." 199 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 198 Bottles of Beer on the wall." cr
+." Oh, 198 Bottles of Beer on the wall," cr
+." 198 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 197 Bottles of Beer on the wall." cr
+." Oh, 197 Bottles of Beer on the wall," cr
+." 197 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 196 Bottles of Beer on the wall." cr
+." Oh, 196 Bottles of Beer on the wall," cr
+." 196 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 195 Bottles of Beer on the wall." cr
+." Oh, 195 Bottles of Beer on the wall," cr
+." 195 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 194 Bottles of Beer on the wall." cr
+." Oh, 194 Bottles of Beer on the wall," cr
+." 194 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 193 Bottles of Beer on the wall." cr
+." Oh, 193 Bottles of Beer on the wall," cr
+." 193 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 192 Bottles of Beer on the wall." cr
+." Oh, 192 Bottles of Beer on the wall," cr
+." 192 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 191 Bottles of Beer on the wall." cr
+." Oh, 191 Bottles of Beer on the wall," cr
+." 191 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 190 Bottles of Beer on the wall." cr
+." Oh, 190 Bottles of Beer on the wall," cr
+." 190 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 189 Bottles of Beer on the wall." cr
+." Oh, 189 Bottles of Beer on the wall," cr
+." 189 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 188 Bottles of Beer on the wall." cr
+." Oh, 188 Bottles of Beer on the wall," cr
+." 188 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 187 Bottles of Beer on the wall." cr
+." Oh, 187 Bottles of Beer on the wall," cr
+." 187 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 186 Bottles of Beer on the wall." cr
+." Oh, 186 Bottles of Beer on the wall," cr
+." 186 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 185 Bottles of Beer on the wall." cr
+." Oh, 185 Bottles of Beer on the wall," cr
+." 185 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 184 Bottles of Beer on the wall." cr
+." Oh, 184 Bottles of Beer on the wall," cr
+." 184 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 183 Bottles of Beer on the wall." cr
+." Oh, 183 Bottles of Beer on the wall," cr
+." 183 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 182 Bottles of Beer on the wall." cr
+." Oh, 182 Bottles of Beer on the wall," cr
+." 182 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 181 Bottles of Beer on the wall." cr
+." Oh, 181 Bottles of Beer on the wall," cr
+." 181 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 180 Bottles of Beer on the wall." cr
+." Oh, 180 Bottles of Beer on the wall," cr
+." 180 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 179 Bottles of Beer on the wall." cr
+." Oh, 179 Bottles of Beer on the wall," cr
+." 179 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 178 Bottles of Beer on the wall." cr
+." Oh, 178 Bottles of Beer on the wall," cr
+." 178 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 177 Bottles of Beer on the wall." cr
+." Oh, 177 Bottles of Beer on the wall," cr
+." 177 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 176 Bottles of Beer on the wall." cr
+." Oh, 176 Bottles of Beer on the wall," cr
+." 176 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 175 Bottles of Beer on the wall." cr
+." Oh, 175 Bottles of Beer on the wall," cr
+." 175 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 174 Bottles of Beer on the wall." cr
+." Oh, 174 Bottles of Beer on the wall," cr
+." 174 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 173 Bottles of Beer on the wall." cr
+." Oh, 173 Bottles of Beer on the wall," cr
+." 173 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 172 Bottles of Beer on the wall." cr
+." Oh, 172 Bottles of Beer on the wall," cr
+." 172 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 171 Bottles of Beer on the wall." cr
+." Oh, 171 Bottles of Beer on the wall," cr
+." 171 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 170 Bottles of Beer on the wall." cr
+." Oh, 170 Bottles of Beer on the wall," cr
+." 170 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 169 Bottles of Beer on the wall." cr
+." Oh, 169 Bottles of Beer on the wall," cr
+." 169 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 168 Bottles of Beer on the wall." cr
+." Oh, 168 Bottles of Beer on the wall," cr
+." 168 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 167 Bottles of Beer on the wall." cr
+." Oh, 167 Bottles of Beer on the wall," cr
+." 167 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 166 Bottles of Beer on the wall." cr
+." Oh, 166 Bottles of Beer on the wall," cr
+." 166 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 165 Bottles of Beer on the wall." cr
+." Oh, 165 Bottles of Beer on the wall," cr
+." 165 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 164 Bottles of Beer on the wall." cr
+." Oh, 164 Bottles of Beer on the wall," cr
+." 164 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 163 Bottles of Beer on the wall." cr
+." Oh, 163 Bottles of Beer on the wall," cr
+." 163 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 162 Bottles of Beer on the wall." cr
+." Oh, 162 Bottles of Beer on the wall," cr
+." 162 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 161 Bottles of Beer on the wall." cr
+." Oh, 161 Bottles of Beer on the wall," cr
+." 161 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 160 Bottles of Beer on the wall." cr
+." Oh, 160 Bottles of Beer on the wall," cr
+." 160 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 159 Bottles of Beer on the wall." cr
+." Oh, 159 Bottles of Beer on the wall," cr
+." 159 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 158 Bottles of Beer on the wall." cr
+." Oh, 158 Bottles of Beer on the wall," cr
+." 158 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 157 Bottles of Beer on the wall." cr
+." Oh, 157 Bottles of Beer on the wall," cr
+." 157 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 156 Bottles of Beer on the wall." cr
+." Oh, 156 Bottles of Beer on the wall," cr
+." 156 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 155 Bottles of Beer on the wall." cr
+." Oh, 155 Bottles of Beer on the wall," cr
+." 155 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 154 Bottles of Beer on the wall." cr
+." Oh, 154 Bottles of Beer on the wall," cr
+." 154 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 153 Bottles of Beer on the wall." cr
+." Oh, 153 Bottles of Beer on the wall," cr
+." 153 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 152 Bottles of Beer on the wall." cr
+." Oh, 152 Bottles of Beer on the wall," cr
+." 152 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 151 Bottles of Beer on the wall." cr
+." Oh, 151 Bottles of Beer on the wall," cr
+." 151 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 150 Bottles of Beer on the wall." cr
+." Oh, 150 Bottles of Beer on the wall," cr
+." 150 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 149 Bottles of Beer on the wall." cr
+." Oh, 149 Bottles of Beer on the wall," cr
+." 149 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 148 Bottles of Beer on the wall." cr
+." Oh, 148 Bottles of Beer on the wall," cr
+." 148 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 147 Bottles of Beer on the wall." cr
+." Oh, 147 Bottles of Beer on the wall," cr
+." 147 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 146 Bottles of Beer on the wall." cr
+." Oh, 146 Bottles of Beer on the wall," cr
+." 146 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 145 Bottles of Beer on the wall." cr
+." Oh, 145 Bottles of Beer on the wall," cr
+." 145 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 144 Bottles of Beer on the wall." cr
+." Oh, 144 Bottles of Beer on the wall," cr
+." 144 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 143 Bottles of Beer on the wall." cr
+." Oh, 143 Bottles of Beer on the wall," cr
+." 143 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 142 Bottles of Beer on the wall." cr
+." Oh, 142 Bottles of Beer on the wall," cr
+." 142 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 141 Bottles of Beer on the wall." cr
+." Oh, 141 Bottles of Beer on the wall," cr
+." 141 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 140 Bottles of Beer on the wall." cr
+." Oh, 140 Bottles of Beer on the wall," cr
+." 140 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 139 Bottles of Beer on the wall." cr
+." Oh, 139 Bottles of Beer on the wall," cr
+." 139 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 138 Bottles of Beer on the wall." cr
+." Oh, 138 Bottles of Beer on the wall," cr
+." 138 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 137 Bottles of Beer on the wall." cr
+." Oh, 137 Bottles of Beer on the wall," cr
+." 137 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 136 Bottles of Beer on the wall." cr
+." Oh, 136 Bottles of Beer on the wall," cr
+." 136 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 135 Bottles of Beer on the wall." cr
+." Oh, 135 Bottles of Beer on the wall," cr
+." 135 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 134 Bottles of Beer on the wall." cr
+." Oh, 134 Bottles of Beer on the wall," cr
+." 134 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 133 Bottles of Beer on the wall." cr
+." Oh, 133 Bottles of Beer on the wall," cr
+." 133 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 132 Bottles of Beer on the wall." cr
+." Oh, 132 Bottles of Beer on the wall," cr
+." 132 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 131 Bottles of Beer on the wall." cr
+." Oh, 131 Bottles of Beer on the wall," cr
+." 131 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 130 Bottles of Beer on the wall." cr
+." Oh, 130 Bottles of Beer on the wall," cr
+." 130 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 129 Bottles of Beer on the wall." cr
+." Oh, 129 Bottles of Beer on the wall," cr
+." 129 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 128 Bottles of Beer on the wall." cr
+." Oh, 128 Bottles of Beer on the wall," cr
+." 128 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 127 Bottles of Beer on the wall." cr
+." Oh, 127 Bottles of Beer on the wall," cr
+." 127 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 126 Bottles of Beer on the wall." cr
+." Oh, 126 Bottles of Beer on the wall," cr
+." 126 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 125 Bottles of Beer on the wall." cr
+." Oh, 125 Bottles of Beer on the wall," cr
+." 125 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 124 Bottles of Beer on the wall." cr
+." Oh, 124 Bottles of Beer on the wall," cr
+." 124 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 123 Bottles of Beer on the wall." cr
+." Oh, 123 Bottles of Beer on the wall," cr
+." 123 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 122 Bottles of Beer on the wall." cr
+." Oh, 122 Bottles of Beer on the wall," cr
+." 122 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 121 Bottles of Beer on the wall." cr
+." Oh, 121 Bottles of Beer on the wall," cr
+." 121 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 120 Bottles of Beer on the wall." cr
+." Oh, 120 Bottles of Beer on the wall," cr
+." 120 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 119 Bottles of Beer on the wall." cr
+." Oh, 119 Bottles of Beer on the wall," cr
+." 119 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 118 Bottles of Beer on the wall." cr
+." Oh, 118 Bottles of Beer on the wall," cr
+." 118 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 117 Bottles of Beer on the wall." cr
+." Oh, 117 Bottles of Beer on the wall," cr
+." 117 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 116 Bottles of Beer on the wall." cr
+." Oh, 116 Bottles of Beer on the wall," cr
+." 116 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 115 Bottles of Beer on the wall." cr
+." Oh, 115 Bottles of Beer on the wall," cr
+." 115 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 114 Bottles of Beer on the wall." cr
+." Oh, 114 Bottles of Beer on the wall," cr
+." 114 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 113 Bottles of Beer on the wall." cr
+." Oh, 113 Bottles of Beer on the wall," cr
+." 113 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 112 Bottles of Beer on the wall." cr
+." Oh, 112 Bottles of Beer on the wall," cr
+." 112 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 111 Bottles of Beer on the wall." cr
+." Oh, 111 Bottles of Beer on the wall," cr
+." 111 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 110 Bottles of Beer on the wall." cr
+." Oh, 110 Bottles of Beer on the wall," cr
+." 110 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 109 Bottles of Beer on the wall." cr
+." Oh, 109 Bottles of Beer on the wall," cr
+." 109 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 108 Bottles of Beer on the wall." cr
+." Oh, 108 Bottles of Beer on the wall," cr
+." 108 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 107 Bottles of Beer on the wall." cr
+." Oh, 107 Bottles of Beer on the wall," cr
+." 107 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 106 Bottles of Beer on the wall." cr
+." Oh, 106 Bottles of Beer on the wall," cr
+." 106 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 105 Bottles of Beer on the wall." cr
+." Oh, 105 Bottles of Beer on the wall," cr
+." 105 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 104 Bottles of Beer on the wall." cr
+." Oh, 104 Bottles of Beer on the wall," cr
+." 104 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 103 Bottles of Beer on the wall." cr
+." Oh, 103 Bottles of Beer on the wall," cr
+." 103 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 102 Bottles of Beer on the wall." cr
+." Oh, 102 Bottles of Beer on the wall," cr
+." 102 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 101 Bottles of Beer on the wall." cr
+." Oh, 101 Bottles of Beer on the wall," cr
+." 101 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 100 Bottles of Beer on the wall." cr
+." Oh, 100 Bottles of Beer on the wall," cr
+." 100 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 99 Bottles of Beer on the wall." cr
+." Oh, 99 Bottles of Beer on the wall," cr
+." 99 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 98 Bottles of Beer on the wall." cr
+." Oh, 98 Bottles of Beer on the wall," cr
+." 98 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 97 Bottles of Beer on the wall." cr
+." Oh, 97 Bottles of Beer on the wall," cr
+." 97 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 96 Bottles of Beer on the wall." cr
+." Oh, 96 Bottles of Beer on the wall," cr
+." 96 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 95 Bottles of Beer on the wall." cr
+." Oh, 95 Bottles of Beer on the wall," cr
+." 95 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 94 Bottles of Beer on the wall." cr
+." Oh, 94 Bottles of Beer on the wall," cr
+." 94 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 93 Bottles of Beer on the wall." cr
+." Oh, 93 Bottles of Beer on the wall," cr
+." 93 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 92 Bottles of Beer on the wall." cr
+." Oh, 92 Bottles of Beer on the wall," cr
+." 92 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 91 Bottles of Beer on the wall." cr
+." Oh, 91 Bottles of Beer on the wall," cr
+." 91 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 90 Bottles of Beer on the wall." cr
+." Oh, 90 Bottles of Beer on the wall," cr
+." 90 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 89 Bottles of Beer on the wall." cr
+." Oh, 89 Bottles of Beer on the wall," cr
+." 89 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 88 Bottles of Beer on the wall." cr
+." Oh, 88 Bottles of Beer on the wall," cr
+." 88 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 87 Bottles of Beer on the wall." cr
+." Oh, 87 Bottles of Beer on the wall," cr
+." 87 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 86 Bottles of Beer on the wall." cr
+." Oh, 86 Bottles of Beer on the wall," cr
+." 86 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 85 Bottles of Beer on the wall." cr
+." Oh, 85 Bottles of Beer on the wall," cr
+." 85 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 84 Bottles of Beer on the wall." cr
+." Oh, 84 Bottles of Beer on the wall," cr
+." 84 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 83 Bottles of Beer on the wall." cr
+." Oh, 83 Bottles of Beer on the wall," cr
+." 83 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 82 Bottles of Beer on the wall." cr
+." Oh, 82 Bottles of Beer on the wall," cr
+." 82 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 81 Bottles of Beer on the wall." cr
+." Oh, 81 Bottles of Beer on the wall," cr
+." 81 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 80 Bottles of Beer on the wall." cr
+." Oh, 80 Bottles of Beer on the wall," cr
+." 80 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 79 Bottles of Beer on the wall." cr
+." Oh, 79 Bottles of Beer on the wall," cr
+." 79 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 78 Bottles of Beer on the wall." cr
+." Oh, 78 Bottles of Beer on the wall," cr
+." 78 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 77 Bottles of Beer on the wall." cr
+." Oh, 77 Bottles of Beer on the wall," cr
+." 77 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 76 Bottles of Beer on the wall." cr
+." Oh, 76 Bottles of Beer on the wall," cr
+." 76 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 75 Bottles of Beer on the wall." cr
+." Oh, 75 Bottles of Beer on the wall," cr
+." 75 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 74 Bottles of Beer on the wall." cr
+." Oh, 74 Bottles of Beer on the wall," cr
+." 74 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 73 Bottles of Beer on the wall." cr
+." Oh, 73 Bottles of Beer on the wall," cr
+." 73 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 72 Bottles of Beer on the wall." cr
+." Oh, 72 Bottles of Beer on the wall," cr
+." 72 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 71 Bottles of Beer on the wall." cr
+." Oh, 71 Bottles of Beer on the wall," cr
+." 71 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 70 Bottles of Beer on the wall." cr
+." Oh, 70 Bottles of Beer on the wall," cr
+." 70 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 69 Bottles of Beer on the wall." cr
+." Oh, 69 Bottles of Beer on the wall," cr
+." 69 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 68 Bottles of Beer on the wall." cr
+." Oh, 68 Bottles of Beer on the wall," cr
+." 68 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 67 Bottles of Beer on the wall." cr
+." Oh, 67 Bottles of Beer on the wall," cr
+." 67 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 66 Bottles of Beer on the wall." cr
+." Oh, 66 Bottles of Beer on the wall," cr
+." 66 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 65 Bottles of Beer on the wall." cr
+." Oh, 65 Bottles of Beer on the wall," cr
+." 65 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 64 Bottles of Beer on the wall." cr
+." Oh, 64 Bottles of Beer on the wall," cr
+." 64 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 63 Bottles of Beer on the wall." cr
+." Oh, 63 Bottles of Beer on the wall," cr
+." 63 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 62 Bottles of Beer on the wall." cr
+." Oh, 62 Bottles of Beer on the wall," cr
+." 62 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 61 Bottles of Beer on the wall." cr
+." Oh, 61 Bottles of Beer on the wall," cr
+." 61 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 60 Bottles of Beer on the wall." cr
+." Oh, 60 Bottles of Beer on the wall," cr
+." 60 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 59 Bottles of Beer on the wall." cr
+." Oh, 59 Bottles of Beer on the wall," cr
+." 59 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 58 Bottles of Beer on the wall." cr
+." Oh, 58 Bottles of Beer on the wall," cr
+." 58 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 57 Bottles of Beer on the wall." cr
+." Oh, 57 Bottles of Beer on the wall," cr
+." 57 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 56 Bottles of Beer on the wall." cr
+." Oh, 56 Bottles of Beer on the wall," cr
+." 56 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 55 Bottles of Beer on the wall." cr
+." Oh, 55 Bottles of Beer on the wall," cr
+." 55 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 54 Bottles of Beer on the wall." cr
+." Oh, 54 Bottles of Beer on the wall," cr
+." 54 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 53 Bottles of Beer on the wall." cr
+." Oh, 53 Bottles of Beer on the wall," cr
+." 53 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 52 Bottles of Beer on the wall." cr
+." Oh, 52 Bottles of Beer on the wall," cr
+." 52 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 51 Bottles of Beer on the wall." cr
+." Oh, 51 Bottles of Beer on the wall," cr
+." 51 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 50 Bottles of Beer on the wall." cr
+." Oh, 50 Bottles of Beer on the wall," cr
+." 50 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 49 Bottles of Beer on the wall." cr
+." Oh, 49 Bottles of Beer on the wall," cr
+." 49 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 48 Bottles of Beer on the wall." cr
+." Oh, 48 Bottles of Beer on the wall," cr
+." 48 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 47 Bottles of Beer on the wall." cr
+." Oh, 47 Bottles of Beer on the wall," cr
+." 47 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 46 Bottles of Beer on the wall." cr
+." Oh, 46 Bottles of Beer on the wall," cr
+." 46 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 45 Bottles of Beer on the wall." cr
+." Oh, 45 Bottles of Beer on the wall," cr
+." 45 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 44 Bottles of Beer on the wall." cr
+." Oh, 44 Bottles of Beer on the wall," cr
+." 44 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 43 Bottles of Beer on the wall." cr
+." Oh, 43 Bottles of Beer on the wall," cr
+." 43 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 42 Bottles of Beer on the wall." cr
+." Oh, 42 Bottles of Beer on the wall," cr
+." 42 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 41 Bottles of Beer on the wall." cr
+." Oh, 41 Bottles of Beer on the wall," cr
+." 41 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 40 Bottles of Beer on the wall." cr
+." Oh, 40 Bottles of Beer on the wall," cr
+." 40 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 39 Bottles of Beer on the wall." cr
+." Oh, 39 Bottles of Beer on the wall," cr
+." 39 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 38 Bottles of Beer on the wall." cr
+." Oh, 38 Bottles of Beer on the wall," cr
+." 38 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 37 Bottles of Beer on the wall." cr
+." Oh, 37 Bottles of Beer on the wall," cr
+." 37 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 36 Bottles of Beer on the wall." cr
+." Oh, 36 Bottles of Beer on the wall," cr
+." 36 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 35 Bottles of Beer on the wall." cr
+." Oh, 35 Bottles of Beer on the wall," cr
+." 35 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 34 Bottles of Beer on the wall." cr
+." Oh, 34 Bottles of Beer on the wall," cr
+." 34 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 33 Bottles of Beer on the wall." cr
+." Oh, 33 Bottles of Beer on the wall," cr
+." 33 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 32 Bottles of Beer on the wall." cr
+." Oh, 32 Bottles of Beer on the wall," cr
+." 32 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 31 Bottles of Beer on the wall." cr
+." Oh, 31 Bottles of Beer on the wall," cr
+." 31 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 30 Bottles of Beer on the wall." cr
+." Oh, 30 Bottles of Beer on the wall," cr
+." 30 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 29 Bottles of Beer on the wall." cr
+." Oh, 29 Bottles of Beer on the wall," cr
+." 29 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 28 Bottles of Beer on the wall." cr
+." Oh, 28 Bottles of Beer on the wall," cr
+." 28 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 27 Bottles of Beer on the wall." cr
+." Oh, 27 Bottles of Beer on the wall," cr
+." 27 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 26 Bottles of Beer on the wall." cr
+." Oh, 26 Bottles of Beer on the wall," cr
+." 26 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 25 Bottles of Beer on the wall." cr
+." Oh, 25 Bottles of Beer on the wall," cr
+." 25 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 24 Bottles of Beer on the wall." cr
+." Oh, 24 Bottles of Beer on the wall," cr
+." 24 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 23 Bottles of Beer on the wall." cr
+." Oh, 23 Bottles of Beer on the wall," cr
+." 23 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 22 Bottles of Beer on the wall." cr
+." Oh, 22 Bottles of Beer on the wall," cr
+." 22 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 21 Bottles of Beer on the wall." cr
+." Oh, 21 Bottles of Beer on the wall," cr
+." 21 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 20 Bottles of Beer on the wall." cr
+." Oh, 20 Bottles of Beer on the wall," cr
+." 20 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 19 Bottles of Beer on the wall." cr
+." Oh, 19 Bottles of Beer on the wall," cr
+." 19 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 18 Bottles of Beer on the wall." cr
+." Oh, 18 Bottles of Beer on the wall," cr
+." 18 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 17 Bottles of Beer on the wall." cr
+." Oh, 17 Bottles of Beer on the wall," cr
+." 17 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 16 Bottles of Beer on the wall." cr
+." Oh, 16 Bottles of Beer on the wall," cr
+." 16 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 15 Bottles of Beer on the wall." cr
+." Oh, 15 Bottles of Beer on the wall," cr
+." 15 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 14 Bottles of Beer on the wall." cr
+." Oh, 14 Bottles of Beer on the wall," cr
+." 14 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 13 Bottles of Beer on the wall." cr
+." Oh, 13 Bottles of Beer on the wall," cr
+." 13 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 12 Bottles of Beer on the wall." cr
+." Oh, 12 Bottles of Beer on the wall," cr
+." 12 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 11 Bottles of Beer on the wall." cr
+." Oh, 11 Bottles of Beer on the wall," cr
+." 11 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 10 Bottles of Beer on the wall." cr
+." Oh, 10 Bottles of Beer on the wall," cr
+." 10 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 9 Bottles of Beer on the wall." cr
+." Oh, 9 Bottles of Beer on the wall," cr
+." 9 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 8 Bottles of Beer on the wall." cr
+." Oh, 8 Bottles of Beer on the wall," cr
+." 8 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 7 Bottles of Beer on the wall." cr
+." Oh, 7 Bottles of Beer on the wall," cr
+." 7 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 6 Bottles of Beer on the wall." cr
+." Oh, 6 Bottles of Beer on the wall," cr
+." 6 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 5 Bottles of Beer on the wall." cr
+." Oh, 5 Bottles of Beer on the wall," cr
+." 5 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 4 Bottles of Beer on the wall." cr
+." Oh, 4 Bottles of Beer on the wall," cr
+." 4 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 3 Bottles of Beer on the wall." cr
+." Oh, 3 Bottles of Beer on the wall," cr
+." 3 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 2 Bottles of Beer on the wall." cr
+." Oh, 2 Bottles of Beer on the wall," cr
+." 2 Bottles of Beer!," cr
+." Take one down and pass it around," cr
+." 1 Bottle of Beer on the wall." cr
+." Oh, 1 Bottle of Beer on the wall," cr
+." 1 Bottle of Beer!," cr
+." Take it down and pass it around..." cr
+." How dry I am! How dry I am!" cr
+." No body knows how dry I am." cr
+." How ... Dry I ... Aaaammm." cr
Added: fcode-utils/testsuite/TokeErrs/UserMacroErrors.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/UserMacroErrors.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/UserMacroErrors.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,47 @@
+\ Test Error-catching for user-defined macros and other new features.
+\ Including: erroneous attempt at recursive macro invocation...
+\ Updated Tue, 17 Jan 2006 at 11:25 PST by David L. Paktor
+
+global-definitions
+
+[macro] lookma
+[macro]
+[macro] lookpa .( Hey, Pa! Hands! HaHa! )
+[macro] heylookmeover .( What's clover?) \ It's money, honey!
+[macro] lookout .( Look out, look out look out!
+[macro] f[looknoquote f[ ." I forgot
+#message Are you ready?
+alias foop dup
+overload [macro] dup #message" Faking a DUP here" foop
+
+device-definitions
+
+fcode-version2
+headers
+
+lookpa
+heylookmeover
+lookpa
+
+lookout
+f[looknoquote ]f
+
+: whatzit
+ heylookmeover
+ dup
+ to heylookmeover
+ dup
+ to 2+
+;
+
+ a#
+
+#message Here comes a little bit of macro recursion.
+[macro] foop #message" It's a call to dup, but which one?" dup
+
+: now-what?
+ #message Don't try this at home, kids...
+ dup
+;
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/errtest1.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/errtest1.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/errtest1.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,15 @@
+\ fload errtestcase1.fth
+
+fcode-version2
+
+: girasffe ( a bd ce -- )
+ begin
+ { fee fie ; fo fum }
+ fee fie + -> fo
+ fee fie - -> fum
+ fum fee <>
+ fum fee = or
+ until
+;
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/errtest2.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/errtest2.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/errtest2.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,15 @@
+\ fload errtestcase2.fth
+
+
+fcode-version2
+
+: gorilla ( a b c -- ?? )
+ dup if
+ { fee fie ; fo fum }
+ fee fie + -> fo
+ fee fie - -> fum
+ then
+;
+
+
+fcode-end
Added: fcode-utils/testsuite/TokeErrs/testLocDevSupG.fth
===================================================================
--- fcode-utils/testsuite/TokeErrs/testLocDevSupG.fth (rev 0)
+++ fcode-utils/testsuite/TokeErrs/testLocDevSupG.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,27 @@
+\ Test whether the Local-Values Support file will tokeniz ok
+\ with a Global setting -- and an error.
+
+\ Updated Mon, 23 Jan 2006 at 18:50 PST by David L. Paktor
+
+fcode-version2
+
+external
+h# 30 constant _local-storage-size_
+\ Ooopsie!
+\ That's not the same scope as where LocalValuesSupport.fth will look for it!
+headers
+instance variable gumbage
+instance variable guggley
+instance variable burglar
+instance variable hot-dog
+: update " Updated Mon, 23 Jan 2006 at 18:50 PST by David L. Paktor" ;
+
+global-definitions
+fload LocalValuesSupport.fth
+fload LocalValuesDevelSupport.fth
+device-definitions
+
+: downdate ['] update catch ;
+
+fcode-end
+
Added: fcode-utils/testsuite/TokoLoco/GlobalLocalValues.fth
===================================================================
--- fcode-utils/testsuite/TokoLoco/GlobalLocalValues.fth (rev 0)
+++ fcode-utils/testsuite/TokoLoco/GlobalLocalValues.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,22 @@
+\ Load Locals Support under Global-Definitions. Bypass Instance warning
+
+\ Updated Fri, 10 Mar 2006 at 14:47 PST by David L. Paktor
+
+\ Make sure this option is turned on.
+[flag] Local-Values
+
+global-definitions
+
+\ Bypass warning about Instance without altering LocalValuesSupport file
+alias generic-instance instance
+[macro] bypass-instance f[ noop .( Bypassed instance!) f]
+
+overload alias instance bypass-instance
+
+fload LocalValuesSupport.fth
+
+\ Replace normal meaning of Instance, still in Global scope.
+overload alias instance generic-instance
+
+\ Restore Device-Definitions scope.
+device-definitions
Added: fcode-utils/testsuite/TokoLoco/SupportedLocalTest.fth
===================================================================
--- fcode-utils/testsuite/TokoLoco/SupportedLocalTest.fth (rev 0)
+++ fcode-utils/testsuite/TokoLoco/SupportedLocalTest.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,60 @@
+\ SupportedLocalTest.fth
+\ Updated Thu, 29 Sep 2005 at 11:34 PDT by David L. Paktor
+
+
+fcode-version2
+
+headers
+hex 20 drop
+decimal 32 drop
+octal 40 drop
+decimal
+o# 40 40 2drop
+d# 32 32 2drop
+h# 20 20 2drop
+
+d# 32 constant _local-storage-size_
+
+fload LocalValuesSupport.fth
+
+
+: faber ( n3 n2 n1 -- alloc-addr size $addr,len )
+ { _otter _weasel _skunk ; _muskrat _mole }
+ \ _otter is initialized with the value of n3
+ \ _weasel is initialized with the value of n2
+ \ _skunk is initialized with the value of n1
+ \ _muskrat and _mole are uninitialized
+
+ \ Use n1 to determine an amount of memory to allocate, and
+ \ stuff the address into _mole
+ _skunk 40 * -> _muskrat
+ _muskrat alloc-mem -> _mole
+ _weasel .h type
+ _otter .d type
+ _mole _muskrat _mole count
+;
+
+: miracle ( n3 n2 n1 -- m3 m2 m1 )
+ { _curly _larry _moe | _shemp _besser _joe }
+ ." Nyuk! " _curly .h cr
+ ." Why, you... " _moe .d cr
+ ." Ouch! " _larry .
+ _curly _moe + -> _shemp
+ _larry _moe + -> _besser
+ _besser _curly + -> _joe
+ _joe _besser 8 faber type free-mem
+ _moe _larry 8 faber type free-mem
+ _curly _besser 8 faber type free-mem
+ _larry _shemp
+;
+
+: ordinary ( -- )
+ 123 456 789 miracle
+;
+
+fload SupportedLocalTest2.fth
+
+h# ordinary
+
+fcode-end
+
Added: fcode-utils/testsuite/TokoLoco/SupportedLocalTest2.fth
===================================================================
--- fcode-utils/testsuite/TokoLoco/SupportedLocalTest2.fth (rev 0)
+++ fcode-utils/testsuite/TokoLoco/SupportedLocalTest2.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,37 @@
+\ SupportedLocalTest2.fth
+\ Updated Fri, 18 Mar 2005 at 14:47 by David L. Paktor
+
+: ducksoup ( n1 n2 n3 n4 -- m1 m2 )
+ { _harpo _chico \
+ _groucho _zeppo }
+ _groucho _harpo *
+ _chico _zeppo +
+ _groucho _zeppo = if swap exit then
+ _groucho + swap _zeppo +
+;
+
+: coconuts ( m1 m2 -- m3 m4 m5 )
+ { ( No initted locals ) ; q \ Try a one-character name
+ _gummo \ The little-known Marx brother
+ _karl \ Was he part of the comedy act, too?
+ }
+ 2dup < if swap then
+ 2dup / -> _gummo
+ 2dup - -> _karl
+ * -> q
+ _karl _gummo q
+;
+
+: spaulding ( x y -- u v w ){ _lfn _pjs | _ill _never _know }
+ _pjs _lfn - -> _never
+ _never _pjs * -> _ill
+ _ill _lfn / -> _know
+ _ill _never _know
+ ;
+
+: dumont ( a b -- c )
+ { _dont _ask
+ | _why }
+ _ask _dont / -> _why
+ _why _ask - _dont *
+;
Added: fcode-utils/testsuite/TokoLoco/SupportedLocalTest3.fth
===================================================================
--- fcode-utils/testsuite/TokoLoco/SupportedLocalTest3.fth (rev 0)
+++ fcode-utils/testsuite/TokoLoco/SupportedLocalTest3.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,21 @@
+\ SupportedLocalTest3.fth
+\ Updated Thu, 29 Sep 2005 at 11:34 PDT by David L. Paktor
+
+
+fcode-version2
+
+headers
+
+d# 32 constant _local-storage-size_
+
+fload LocalValuesSupport.fth
+
+: ducksoup ( n1 n2 n3 n4 -- m1 m2 )
+ { _harpo _chico _groucho | _zeppo _karl }
+ _groucho _harpo *
+ _chico +
+ _groucho _zeppo = if swap exit then
+ _groucho + swap _zeppo +
+;
+
+fcode-end
Added: fcode-utils/testsuite/TokoLoco/SupportedLocalTest4.fth
===================================================================
--- fcode-utils/testsuite/TokoLoco/SupportedLocalTest4.fth (rev 0)
+++ fcode-utils/testsuite/TokoLoco/SupportedLocalTest4.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,63 @@
+\ SupportedLocalTest4.fth
+\ Updated Thu, 29 Sep 2005 at 11:34 PDT by David L. Paktor
+
+
+fcode-version2
+
+headers
+hex 20 drop
+decimal 32 drop
+octal 40 drop
+decimal
+o# 40 40 2drop
+d# 32 32 2drop
+h# 20 20 2drop
+
+d# 32 constant _local-storage-size_
+
+fload LocalValuesSupport.fth
+
+
+: faber ( m4 m3 n2 n1 n0 -- alloc-addr size $addr,len )
+ { _otter \ _otter is initialized with the value of n2
+ _weasel \ _weasel is initialized with the value of n1
+ _skunk \ _skunk is initialized with the value of n0
+ \ It will be used to determine
+ \ an amount of memory to allocate
+ ( Vertical Bar ends the group of Initialized Locals ) | ( m3 and m4 stay on the stack )
+ \ These are uninitialized:
+ _muskrat \ final size of the allocation
+ _mole \ address of the allocated memory
+ }
+
+ _skunk 40 * -> _muskrat
+ _muskrat alloc-mem -> _mole
+ _weasel .h type
+ _otter .d type
+ _mole _muskrat _mole count
+;
+
+
+
+: miracle ( n3 n2 n1 -- m3 m2 m1 )
+ { _curly _larry _moe | _shemp _besser _joe }
+ ." Nyuk! " _curly .h cr
+ ." Why, you... " _moe .d cr
+ ." Ouch! " _larry .
+ _curly _moe + -> _shemp
+ _larry _moe + -> _besser
+ _besser _curly + -> _joe
+ _joe _besser 8 faber type free-mem
+ _moe _larry 8 faber type free-mem
+ _curly _besser 8 faber type free-mem
+ _larry _shemp
+;
+
+: ordinary ( -- )
+ 123 456 789 miracle
+;
+
+h# ordinary
+
+fcode-end
+
Added: fcode-utils/testsuite/TokoLoco/TestArgs
===================================================================
--- fcode-utils/testsuite/TokoLoco/TestArgs (rev 0)
+++ fcode-utils/testsuite/TokoLoco/TestArgs 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,29 @@
+# Automated Test Arguments file for TokoLoco category
+# (That's short for "Tokenizer Locals")
+
+# Valid lines have four comma-separated fields:
+# Test-file base-name
+# Result-file label
+# Extra command-line switches
+# A script-command with arguments (but no commas).
+# Lines that have no label, no switches, and no script
+# do not need any commas.
+
+# All files in this category need the -f Local-Values switch
+# Some will have additional variants.
+
+# Updated Mon, 20 Mar 2006 at 11:18 PST by David L. Paktor
+
+
+testNest , , -f Local-Values -l -I. -I..
+SupportedLocalTest , , -f LOCAL-Values -l -I. -I..
+SupportedLocalTest3 , , -f Local-VALUES -l -I. -I..
+SupportedLocalTest4 , , -f Local-Values -l -I. -I..
+testDevelSupport , , -f local-values -I. -I..
+
+# Additional variants:
+SupportedLocalTest , nodupwrn , -f Local-VALUES -f NOWarn-if-DUPLicate -l -I. -I..
+SupportedLocalTest , nolegacy , -f LoCAL-VALUes -f NoLV-Legacy-Separator -l -I. -I..
+SupportedLocalTest , nolgcmsg , -f Local-ValUES -f NOLV-LEGAcy-Message -l -I. -I..
+SupportedLocalTest , nolocals , -i -f noLocal-Values -l -I. -I..
+SupportedLocalTest3 , DefLocStgSiz , -f Local-VALUes -d '_loCAL-STORagE-SIZe_=h# 42' -l -I. -I..
Added: fcode-utils/testsuite/TokoLoco/testCatch.fth
===================================================================
--- fcode-utils/testsuite/TokoLoco/testCatch.fth (rev 0)
+++ fcode-utils/testsuite/TokoLoco/testCatch.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,81 @@
+\ testcase3.fth
+\ Updated Wed 2 Mar 2005 at 09:54 by David L. Paktor
+
+marker fuggedaboudit
+
+: foobar ( n3 n2 n1 -- m1 )
+ { _eenie _meany _miney ; _moe }
+ ." Eenie = " _eenie . cr
+ ." Meany = " _meany . cr
+ ." Miney = " _miney . cr
+ _meany _miney + _eenie * -> _moe
+ " throw" confirmed? cr throw
+ ." Moe = " _moe . cr
+ _moe
+;
+
+: goobar ( n3 n2 n1 -- m1 )
+ { _eenie _meany _miney ; _moe }
+ ." GEenie = " _eenie . cr
+ ." GMeany = " _meany . cr
+ ." GMiney = " _miney . cr
+ _meany 2* _eenie 2* _miney 2* foobar 10 + -> _moe
+ ." GEenie = " _eenie . cr
+ ." GMeany = " _meany . cr
+ ." GMiney = " _miney . cr
+ ." GMoe = " _moe . cr
+ _moe
+;
+
+: loobar ( n3 n2 n1 -- m1 )
+ { _eenie _meany _miney ; _moe }
+ ." LEenie = " _eenie . cr
+ ." LMeany = " _meany . cr
+ ." LMiney = " _miney . cr
+ _miney 2* _meany 2* _eenie 2* goobar 10 + -> _moe
+ ." LEenie = " _eenie . cr
+ ." LMeany = " _meany . cr
+ ." LMiney = " _miney . cr
+ ." LMoe = " _moe . cr
+ _moe
+;
+
+: hoobar ( n3 n2 n1 -- m1 )
+ { _eenie _meany _miney ; _moe }
+ ." HEenie = " _eenie . cr
+ ." HMeany = " _meany . cr
+ ." HMiney = " _miney . cr
+ _eenie 2* _miney 2* _meany 2* loobar 10 + -> _moe
+ ." HEenie = " _eenie . cr
+ ." HMeany = " _meany . cr
+ ." HMiney = " _miney . cr
+ ." HMoe = " _moe . cr
+ _moe
+;
+
+: poobar ( n3 n2 n1 -- m1 )
+ { _eenie _meany _miney ; _moe }
+ ." PEenie = " _eenie . cr
+ ." PMeany = " _meany . cr
+ ." PMiney = " _miney . cr
+ _miney 2* _meany 2* _eenie 2*
+ ['] hoobar catch if
+ ." Caught" 3drop false
+ else 10 + -> _moe true
+ then cr
+ ." PEenie = " _eenie . cr
+ ." PMeany = " _meany . cr
+ ." PMiney = " _miney . cr
+ if
+ ." PMoe = " _moe . cr _moe
+ else 0
+ then cr
+
+;
+
+
+: ordinary ( -- )
+ 123 456 789 poobar
+ .s cr
+;
+
Added: fcode-utils/testsuite/TokoLoco/testDevelSupport.fth
===================================================================
--- fcode-utils/testsuite/TokoLoco/testDevelSupport.fth (rev 0)
+++ fcode-utils/testsuite/TokoLoco/testDevelSupport.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,22 @@
+\ Test whether the Local-Values Support file will tokenize ok.
+
+\ Updated Sat, 12 Mar 2005 at 23:18 by David L. Paktor
+
+fcode-version2
+
+external
+h# 30 constant _local-storage-size_
+headers
+instance variable gumbage
+instance variable guggley
+instance variable burglar
+instance variable hot-dog
+: update " Updated Thu, 29 Sep 2005 at 11:34 PDT by David L. Paktor" ;
+
+fload LocalValuesSupport.fth
+fload LocalValuesDevelSupport.fth
+
+: downdate ['] update catch ;
+
+fcode-end
+
Added: fcode-utils/testsuite/TokoLoco/testNest.fth
===================================================================
--- fcode-utils/testsuite/TokoLoco/testNest.fth (rev 0)
+++ fcode-utils/testsuite/TokoLoco/testNest.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,27 @@
+\ It seems that fload nesting diddent werk rite.
+\ Let's see just how bad it was...
+
+\ I fixed assigning FCode numbers, but not nesting
+\ Seemed it diddent nest more than one deep...
+
+\ Did I fix it?
+\ Yeah. It was an artifact of an error in the test sequence...
+
+fcode-version2
+
+headers
+instance variable happy
+instance variable grumpy
+instance variable sleepy
+
+fload testNest1.fth
+
+: whatsit0ya ( -- )
+ whatsit1ya
+ ." Happy is " happy @ .
+ ." Grumpy is " grumpy @ .
+ ." Sleepy is " sleepy @ .
+ ['] downdate catch
+;
+
+fcode-end
Added: fcode-utils/testsuite/TokoLoco/testNest1.fth
===================================================================
--- fcode-utils/testsuite/TokoLoco/testNest1.fth (rev 0)
+++ fcode-utils/testsuite/TokoLoco/testNest1.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,14 @@
+
+instance variable sneezy
+instance variable bashful
+instance variable dopey
+
+fload testNest2.fth
+
+: whatsit1ya ( -- )
+ whatsit2ya
+ ." Sneezy is " sneezy @ .
+ ." Bashful is " bashful @ .
+ ." Dopey is " dopey @ .
+ ['] downdate catch
+;
Added: fcode-utils/testsuite/TokoLoco/testNest2.fth
===================================================================
--- fcode-utils/testsuite/TokoLoco/testNest2.fth (rev 0)
+++ fcode-utils/testsuite/TokoLoco/testNest2.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,15 @@
+
+instance variable and_doc
+instance variable crappy
+instance variable dumpy
+
+fload testNest3.fth
+
+
+: whatsit2ya ( -- )
+ whatsit3ya
+ ." And_doc is " and_doc @ .
+ ." Crappy is " crappy @ .
+ ." Dumpy is " dumpy @ .
+ ['] downdate catch
+;
Added: fcode-utils/testsuite/TokoLoco/testNest3.fth
===================================================================
--- fcode-utils/testsuite/TokoLoco/testNest3.fth (rev 0)
+++ fcode-utils/testsuite/TokoLoco/testNest3.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,22 @@
+
+
+external
+h# 30 constant _local-storage-size_
+headers
+
+instance variable sleazy
+instance variable cheapy
+instance variable scruffy
+
+: update " Updated Thu, 29 Sep 2005 at 11:34 PDT by David L. Paktor" ;
+
+fload LocalValuesSupport.fth
+
+: downdate ['] update catch ;
+
+: whatsit3ya ( -- )
+ ." Sleazy is " sleazy @ .
+ ." Cheapy is " cheapy @ .
+ ." Scruffy is " scruffy @ .
+;
+
Added: fcode-utils/testsuite/TokoLoco/testSupport.fth
===================================================================
--- fcode-utils/testsuite/TokoLoco/testSupport.fth (rev 0)
+++ fcode-utils/testsuite/TokoLoco/testSupport.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1,19 @@
+\ Test whether the Local-Values Support file will tokenize ok.
+
+fcode-version2
+
+external
+h# 30 constant _local-storage-size_
+headers
+instance variable gumbage
+instance variable guggley
+instance variable burglar
+instance variable hot-dog
+: update " Updated Thu, 29 Sep 2005 at 11:34 PDT by David L. Paktor" ;
+
+fload LocalValuesSupport.fth
+
+: downdate ['] update catch ;
+
+fcode-end
+
Added: fcode-utils/testsuite/TotalLocalValuesSupport.fth
===================================================================
--- fcode-utils/testsuite/TotalLocalValuesSupport.fth (rev 0)
+++ fcode-utils/testsuite/TotalLocalValuesSupport.fth 2006-10-14 20:31:53 UTC (rev 91)
@@ -0,0 +1 @@
+link ../../LocalValues/TotalLocalValuesSupport.fth
\ No newline at end of file
Property changes on: fcode-utils/testsuite/TotalLocalValuesSupport.fth
___________________________________________________________________
Name: svn:special
+ *
1
0
Author: stepan
Date: 2006-10-14 22:19:21 +0200 (Sat, 14 Oct 2006)
New Revision: 90
Modified:
fcode-utils/detok/decode.c
fcode-utils/detok/detok.c
fcode-utils/toke/dictionary.c
fcode-utils/toke/scanner.c
fcode-utils/toke/strsubvocab.c
fcode-utils/toke/strsubvocab.h
fcode-utils/toke/toke.c
fcode-utils/toke/tokzesc.c
fcode-utils/toke/tokzesc.h
fcode-utils/toke/usersymbols.c
fcode-utils/toke/usersymbols.h
fcode-utils/toke/vocabfuncts.h
Log:
merge David Paktor's changes for toke 1.0.1
Modified: fcode-utils/detok/decode.c
===================================================================
--- fcode-utils/detok/decode.c 2006-10-14 20:18:07 UTC (rev 89)
+++ fcode-utils/detok/decode.c 2006-10-14 20:19:21 UTC (rev 90)
@@ -206,7 +206,7 @@
* or
* b) detok is in verbose mode.
*/
- if ( tname == unnamed )
+ if ( strcmp( tname, unnamed) == 0 )
{
printf("[0x%03x] ", fcode);
} else {
@@ -355,7 +355,7 @@
output_token();
token = next_token();
printf("0x%03x\n",token);
- add_token(token, (char *)unnamed);
+ add_token(token, strdup(unnamed));
}
static void named_token(void)
Modified: fcode-utils/detok/detok.c
===================================================================
--- fcode-utils/detok/detok.c 2006-10-14 20:18:07 UTC (rev 89)
+++ fcode-utils/detok/detok.c 2006-10-14 20:19:21 UTC (rev 90)
@@ -184,6 +184,7 @@
close_stream();
optind++;
+ reset_dictionary();
}
printf("\n");
Modified: fcode-utils/toke/dictionary.c
===================================================================
--- fcode-utils/toke/dictionary.c 2006-10-14 20:18:07 UTC (rev 89)
+++ fcode-utils/toke/dictionary.c 2006-10-14 20:19:21 UTC (rev 90)
@@ -212,61 +212,6 @@
/* **************************************************************************
*
- * Function name: exists_in_core
- * Synopsis: Confirm whether the given name exists in the
- * Global (aka "core") Vocabulary. Search the
- * Global Vocabulary exclusively.
- *
- * Inputs:
- * Parameters:
- * name The name for which to look
- * Local Static Variables:
- * global_voc_dict_ptr "Tail" of Global Vocabulary
- *
- * Outputs:
- * Returned Value: TRUE if name is found.
- *
- **************************************************************************** */
-
-bool exists_in_core( char *name)
-{
- return exists_in_tic_vocab( name, global_voc_dict_ptr );
-}
-
-/* **************************************************************************
- *
- * Function name: handle_core_word
- * Synopsis: Perform a function in the "Global" Vocabulary and
- * indicate whether the name is valid.
- *
- * Inputs:
- * Parameters:
- * tname The name to handle
- * Local Static Variables:
- * global_voc_dict_ptr "Tail" of Global Vocabulary
- *
- * Outputs:
- * Returned Value: TRUE if the given name is valid in Global Vocab
- *
- * Error Detection:
- * If the name is not in the "Global" Vocabulary, let the calling
- * routine determine whether to print an error message or to
- * try it out as a number.
- *
- **************************************************************************** */
-
-bool handle_core_word( char *tname )
-{
- bool retval;
-
- retval = handle_tic_vocab( tname, global_voc_dict_ptr );
-
- return ( retval ) ;
-}
-
-
-/* **************************************************************************
- *
* Function name: create_core_alias
* Synopsis: Create, in the "Global" ("core") Vocabulary, an entry
* for NEW_NAME that behaves the same as the latest
@@ -618,43 +563,8 @@
return( retval);
}
-
/* **************************************************************************
*
- * Function name: handle_current
- * Synopsis: Perform a function in the current device-node vocab,
- * if one is in effect, or in the "Global" Vocabulary.
- * Indicate whether the name is valid.
- *
- * Inputs:
- * Parameters:
- * tname The name to handle
- * Global Variables:
- * current_definitions Device-Node (or Global) Vocabulary
- * currently in effect.
- * scope_is_global TRUE if "global" scope is in effect
- * Local Static Variables:
- *
- * Outputs:
- * Returned Value: TRUE if the given name is valid
- *
- **************************************************************************** */
-
-bool handle_current( char *tname )
-{
- bool retval = handle_tic_vocab( tname, *current_definitions );
-
- if ( INVERSE(retval) && INVERSE(scope_is_global) )
- {
- retval = handle_core_word( tname );
- }
- return ( retval );
-
-}
-
-
-/* **************************************************************************
- *
* Function name: lookup_in_dev_node
* Synopsis: Return a pointer to the data-structure of the
* named word in the Current device node, if
@@ -1778,41 +1688,6 @@
/* **************************************************************************
*
- * Function name: handle_shared_word
- * Synopsis: Perform the function associated with the given name
- * only if it is a "Shared Word". Indicate if it was.
- *
- * Inputs:
- * Parameters:
- * tname The "target" name for which to look
- *
- * Outputs:
- * Returned Value: TRUE if the name is a valid "Shared Word"
- *
- * Extraneous Remarks:
- * This is very similar to a call to handle_tic_vocab() except
- * for the additional filtering for a "Shared Word" definer.
- *
- **************************************************************************** */
-
-bool handle_shared_word( char *tname )
-{
- tic_hdr_t *found ;
- bool retval = FALSE;
-
- found = lookup_shared_word( tname );
- if ( found != NULL )
- {
- found->funct(found->pfield);
- retval = TRUE;
- }
-
- return ( retval ) ;
-}
-
-
-/* **************************************************************************
- *
* Function name: lookup_shared_f_exec_word
* Synopsis: Return a pointer to the data-structure of the named
* word, only if it is a "Shared F-Exec Word"
Modified: fcode-utils/toke/scanner.c
===================================================================
--- fcode-utils/toke/scanner.c 2006-10-14 20:18:07 UTC (rev 89)
+++ fcode-utils/toke/scanner.c 2006-10-14 20:19:21 UTC (rev 90)
@@ -3243,7 +3243,7 @@
bool retval = FALSE;
char *defn_type_name;
- /* If already inside a colon, ERROR and discontinueprocessing */
+ /* If already inside a colon, ERROR and discontinue processing */
/* If an alias to a definer is used, show the name of the alias */
if ( test_in_colon(statbuf, FALSE, TKERROR, NULL) )
{
@@ -5011,9 +5011,9 @@
case VERSION1:
case FCODE_V1:
+ fcode_starter( "version1", 1, FALSE) ;
tokenization_error( INFO, "Using version1 header "
"(8-bit offsets).\n");
- fcode_starter( "version1", 1, FALSE) ;
break;
case START1:
Modified: fcode-utils/toke/strsubvocab.c
===================================================================
--- fcode-utils/toke/strsubvocab.c 2006-10-14 20:18:07 UTC (rev 89)
+++ fcode-utils/toke/strsubvocab.c 2006-10-14 20:19:21 UTC (rev 90)
@@ -45,14 +45,11 @@
/* **************************************************************************
*
* Functions Exported:
- * init_str_sub_vocab Initialize a String-Substitution vocab
* add_str_sub_entry Add an entry to a Str-Subst vocab
- * lookup_str_sub Look for a name in a String-Substitution
- * vocab, return the substitution string.
+ * lookup_str_sub Look for a name in a String-Subst'n vocab;
+ * return a pointer to the structure.
* exists_in_str_sub Confirm whether a given name exists in a
* String-Substitution vocabulary
- * create_str_sub_alias Duplicate the behavior of one name with
- * another name. Return a "success" flag.
* reset_str_sub_vocab Reset a given Str-Subst vocab to its initial
* "Built-In" position.
*
@@ -72,34 +69,6 @@
/* **************************************************************************
*
- * Function name: init_str_sub_vocab
- * Synopsis: Dynamically initialize the link-pointers
- * of the.given String-Substitution vocabulary
- *
- * Inputs:
- * Parameters:
- * str_sub_vocab_tbl Pointer to the initial Str-Subst vocab array
- * max_indx Maximum Index of the initial array.
- *
- * Outputs:
- * Returned Value: None
- * Global Variables:
- * The link-fields of the initial Str-Subs vocab array entries
- * will be filled in.
- *
- **************************************************************************** */
-
-void init_str_sub_vocab( str_sub_vocab_t *str_sub_vocab_tbl, int max_indx)
-{
- int indx;
- for ( indx = 1 ; indx < max_indx ; indx++ )
- {
- str_sub_vocab_tbl[indx].next = &str_sub_vocab_tbl[indx-1];
- }
-}
-
-/* **************************************************************************
- *
* Function name: add_str_sub_entry
* Synopsis: Add an entry to the given Str-Subst vocab
*
@@ -155,7 +124,8 @@
/* **************************************************************************
*
* Function name: lookup_str_sub
- * Synopsis: Look for a name in the given Str-Subst vocabulary
+ * Synopsis: Look for a name in the given Str-Subst vocabulary.
+ * Return a pointer to the structure if name was valid
*
* Inputs:
* Parameters:
@@ -163,22 +133,21 @@
* str_sub_vocab The Str-Subst vocab-list
*
* Outputs:
- * Returned Value: Pointer to the substitution string, or
- * NULL pointer if name not found.
- * May be NULL if subst'n string is NULL.
+ * Returned Value: Pointer to the substitution-string entry
+ * data-structure. NULL if not found.
*
**************************************************************************** */
-char *lookup_str_sub( char *tname, str_sub_vocab_t *str_sub_vocab )
+str_sub_vocab_t *lookup_str_sub( char *tname, str_sub_vocab_t *str_sub_vocab )
{
str_sub_vocab_t *curr;
- char *retval = NULL;
+ str_sub_vocab_t *retval = NULL;
for (curr = str_sub_vocab ; curr != NULL ; curr=curr->next)
{
if ( strcasecmp(tname, curr->name) == 0 )
{
- retval = curr->alias;
+ retval = curr;
break;
}
}
@@ -197,141 +166,21 @@
* str_sub_vocab Pointer to the Str-Subst vocab-list
*
* Outputs:
- * Returned Value: TRUE if the name is found
+ * Returned Value: TRUE if the name is found
*
- * Extraneous Remarks:
- * Because the Returned Value of lookup_str_sub() may be NULL for
- * other reasons than that the name was not found, we cannot
- * rely on that routine, and must replicate the outer-shell
- * of its structure.
- *
**************************************************************************** */
bool exists_in_str_sub( char *tname, str_sub_vocab_t *str_sub_vocab )
{
- str_sub_vocab_t *curr;
bool retval = FALSE;
+ str_sub_vocab_t *found = NULL;
- for (curr = str_sub_vocab ; curr != NULL ; curr=curr->next)
+ found = lookup_str_sub( tname, str_sub_vocab );
+ if ( found != NULL )
{
- if ( strcasecmp(tname, curr->name) == 0 )
- {
- retval = TRUE;
- break;
- }
+ retval = TRUE;
}
return ( retval );
}
-/* **************************************************************************
- *
- * Function name: create_str_sub_alias
- * Synopsis: Create an Alias in a String-Substitution vocabulary
- * Return a "success" flag.
- *
- * Associated FORTH word: ALIAS
- *
- * Inputs:
- * Parameters:
- * old_name Name of existing entry
- * new_name New name for which to create an entry
- * *str_sub_vocab Pointer to "tail" of Str-Subst vocab-list
- *
- * Outputs:
- * Returned Value: TRUE if old_name found in str_sub_vocab
- * Supplied Pointers:
- * *str_sub_vocab Will be updated to point to the new entry
- * Memory Allocated:
- * A copy of the "old" name's substitution string.
- * When Freed?
- * When reset_str_sub_vocab() is applied to the same vocab-list.
- * In some instances, the new entry will be freed when the
- * device-node in which it was created is "finish"ed; in
- * others, only on termination of the program.
- *
- * Process Explanation:
- * The "new" name is presumed to point to a stable memory-space.
- * If the given "old" name exists in the given Str-Subst vocab-list,
- * duplicate the substitution string into newly-allocated memory
- * and pass the duplicated string and the "new" name along to
- * the add_str_sub_entry() routine and return TRUE.
- * If the given "old" name does not exist in the given vocab-list,
- * return FALSE.
- *
- * Extraneous Remarks:
- * This neatly bypasses the question of re-aliasing... ;-)
- *
- * We can rely on testing for a returned NULL from lookup_str_sub()
- * because we won't be applying this routine to any vocabulary
- * that permits a NULL in its substitution string.
- *
- **************************************************************************** */
-
-bool create_str_sub_alias(char *new_name,
- char *old_name,
- str_sub_vocab_t **str_sub_vocab )
-{
- bool retval = FALSE;
- char *old_subst_str = lookup_str_sub( old_name, *str_sub_vocab );
- if ( old_subst_str != NULL )
- {
- char *new_subst_str = strdup(old_subst_str );
- add_str_sub_entry(new_name, new_subst_str, str_sub_vocab );
- retval = TRUE ;
- }
-
- return ( retval );
-}
-
-
-/* **************************************************************************
- *
- * Function name: reset_str_sub_vocab
- * Synopsis: Reset a given Str-Subst vocab to its initial
- * "Built-In" position.
- *
- * Inputs:
- * Parameters:
- * *str_sub_vocab Pointer to the Str-Subst vocab-list
- * reset_position Position to which to reset the list
- *
- * Outputs:
- * Returned Value: NONE
- * Supplied Pointers:
- * *str_sub_vocab Reset to given "Built-In" position.
- * Memory Freed
- * All memory allocated by user-definitions will be freed
- *
- * Process Explanation:
- * The "stable memory-spaces" to which the name and substitution
- * string pointers point are presumed to have been acquired
- * by allocation of memory, which is reasonable for entries
- * created by the user as opposed to the built-in entries,
- * which we are, in any case, not releasing.
- * The substitution-string pointer may be null; watch out when
- * we free() it; not all C implementations forgive that.
- *
- **************************************************************************** */
-
-void reset_str_sub_vocab(
- str_sub_vocab_t **str_sub_vocab ,
- str_sub_vocab_t *reset_position )
-{
- str_sub_vocab_t *next_t;
-
- next_t = *str_sub_vocab;
- while ( next_t != reset_position )
- {
- next_t = (*str_sub_vocab)->next ;
-
- free( (*str_sub_vocab)->name );
- if ( !(*str_sub_vocab)->alias )
- {
- free( (*str_sub_vocab)->alias );
- }
- free( *str_sub_vocab );
- *str_sub_vocab = next_t ;
- }
-}
-
Modified: fcode-utils/toke/strsubvocab.h
===================================================================
--- fcode-utils/toke/strsubvocab.h 2006-10-14 20:18:07 UTC (rev 89)
+++ fcode-utils/toke/strsubvocab.h 2006-10-14 20:19:21 UTC (rev 90)
@@ -55,31 +55,12 @@
struct str_sub_vocab *next;
} str_sub_vocab_t;
-#if 0 /* On the way out */
-/*
- * BUILTIN_STR_SUB Add an entry to the initial Str-Sub vocab.
- *
- * Arguments: (Both are strings)
- * princ Principal name by which the string is known
- * subst Substitution-string that replaces the Principal.
- */
-#define BUILTIN_STR_SUB(princ, subst) \
- { princ , subst , (str_sub_vocab_t *)NULL }
-#endif /* On the way out */
-
-void init_str_sub_vocab( str_sub_vocab_t *str_sub_vocab_tbl,
- int max_indx);
void add_str_sub_entry( char *ename,
char *subst_str,
str_sub_vocab_t **str_sub_vocab );
-char *lookup_str_sub( char *tname, str_sub_vocab_t *str_sub_vocab );
-bool create_str_sub_alias(char *new_name,
- char *old_name,
- str_sub_vocab_t **str_sub_vocab );
+str_sub_vocab_t *lookup_str_sub( char *tname, str_sub_vocab_t *str_sub_vocab );
bool exists_in_str_sub( char *tname, str_sub_vocab_t *str_sub_vocab );
-void reset_str_sub_vocab( str_sub_vocab_t **str_sub_vocab ,
- str_sub_vocab_t *reset_position );
#endif /* _TOKE_STRSUBVOCAB_H */
Modified: fcode-utils/toke/toke.c
===================================================================
--- fcode-utils/toke/toke.c 2006-10-14 20:18:07 UTC (rev 89)
+++ fcode-utils/toke/toke.c 2006-10-14 20:19:21 UTC (rev 90)
@@ -46,7 +46,7 @@
#include "stack.h"
#include "emit.h"
-#define TOKE_VERSION "1.0.0"
+#define TOKE_VERSION "1.0.1"
#include "vocabfuncts.h"
#include "scanner.h"
Modified: fcode-utils/toke/tokzesc.c
===================================================================
--- fcode-utils/toke/tokzesc.c 2006-10-14 20:18:07 UTC (rev 89)
+++ fcode-utils/toke/tokzesc.c 2006-10-14 20:19:21 UTC (rev 90)
@@ -36,10 +36,6 @@
* Functions Exported:
* init_tokz_esc_vocab Initialize the relevant vocabulary.
* enter_tokz_esc Enter "Tokenizer Escape" mode
- * handle_tokz_esc Perform a function in the
- * "Tokenizer Escape" Vocabulary
- * exists_in_tokz_esc Confirm whether a given name exists in
- * the "Tokz_Esc_Vocabulary"
* create_tokz_esc_alias Add an alias to "Tokenizer Escape" space
* reset_tokz_esc Reset the "Tokenizer Escape" Vocabulary
* to its "Built-In" position.
@@ -605,37 +601,6 @@
/* **************************************************************************
*
- * Function name: handle_tokz_esc
- * Synopsis: Perform a function in the "Tokenizer Escape" Vocabulary
- * Indicate whether the name is valid in this vocabulary.
- * Handle "Tokenizer Escape" aliases implicitly.
- *
- * Inputs:
- * Parameters:
- * tname The name to handle
- * Global Variables:
- * tokz_esc_vocab Pointer to "Tokenizer Escape" Vocabulary
- *
- * Outputs:
- * Returned Value: TRUE if the given name is valid in tokz_esc
- *
- * Process Explanation:
- * Find the name and execute its associated function.
- * If the name is not in the "Tokenizer Escape" Vocabulary,
- * let the calling routine determine whether to try it
- * out as a number or to print an error message.
- *
- **************************************************************************** */
-
-bool handle_tokz_esc( char *tname )
-{
- bool retval = handle_tic_vocab( tname, tokz_esc_vocab );
- return ( retval ) ;
-}
-
-
-/* **************************************************************************
- *
* Function name: lookup_tokz_esc
* Synopsis: Return a pointer to the data-structure of the named
* word in the"Tokenizer Escape" Vocabulary
@@ -660,30 +625,6 @@
/* **************************************************************************
*
- * Function name: exists_in_tokz_esc
- * Synopsis: Confirm whether a given name exists in the
- * "Tokenizer Escape" Vocabulary
- *
- * Inputs:
- * Parameters:
- * name The given name to confirm
- * Global Variables:
- * tokz_esc_vocab Pointer to "Tokenizer Escape" Vocabulary
- *
- * Outputs:
- * Returned Value: TRUE if name is found,
- *
- **************************************************************************** */
-
-bool exists_in_tokz_esc(char *name)
-{
- bool retval = exists_in_tic_vocab( name, tokz_esc_vocab );
- return ( retval );
-}
-
-
-/* **************************************************************************
- *
* Function name: create_tokz_esc_alias
* Synopsis: Create an alias in the "Tokenizer Escape" Vocabulary
*
Modified: fcode-utils/toke/tokzesc.h
===================================================================
--- fcode-utils/toke/tokzesc.h 2006-10-14 20:18:07 UTC (rev 89)
+++ fcode-utils/toke/tokzesc.h 2006-10-14 20:19:21 UTC (rev 90)
@@ -41,9 +41,7 @@
void init_tokz_esc_vocab( void );
bool create_tokz_esc_alias(char *new_name, char *old_name);
void enter_tokz_esc( void );
-bool handle_tokz_esc( char *tname );
tic_hdr_t *lookup_tokz_esc(char *name);
-bool exists_in_tokz_esc(char *name);
void reset_tokz_esc( void );
void pop_next_fcode( void);
Modified: fcode-utils/toke/usersymbols.c
===================================================================
--- fcode-utils/toke/usersymbols.c 2006-10-14 20:18:07 UTC (rev 89)
+++ fcode-utils/toke/usersymbols.c 2006-10-14 20:19:21 UTC (rev 90)
@@ -37,7 +37,7 @@
* The syntax for user-defined command-line compilation-control symbols
* is <NAME>[=<VALUE>]
*
- * The name is always required; the equal-sign and value is optional.
+ * The name is always required; the equal-sign and value are optional.
* If you wish the "value" to contain spaces or quotes, you can
* accomplish that using the shell escape conventions.
*
@@ -65,11 +65,9 @@
*
* Functions Exported:
* add_user_symbol Add a user-defined symbol to the list
- * lookup_user_symbol Look for a user-defined symbol, return
- * the assigned value.
* exists_as_user_symbol Confirm whether a given name exists
* as a user-defined symbol.
- * eval_user_symbol Tokenize the value assigned to a user
+ * eval_user_symbol Evaluate the value assigned to a user
* symbol.
* list_user_symbols Print the list of user-defined symbols
* for the Logfile.
@@ -90,7 +88,7 @@
* were created on the command-line; if we ever allow symbols
* to be defined in the Source file, they should be as volatile
* as anything else that comes from a source file...
- * Putting source-file-derived user-defined symbols into the Global
+ * Appending source-file-derived user-defined symbols to the Global
* Vocabulary could be a quasi-simple way to accomplish this.)
*
* Enable the definition of user-symbols from the Source file, using
@@ -150,7 +148,7 @@
* Memory Allocated:
* for the string(s) and the new entry
* When Freed?
- * Never. Well, only on termination of the program. User-defined
+ * Never. Well, upon termination of the program. User-defined
* symbols endure for the entire batch of tokenizations.
*
* Process Explanation:
@@ -183,33 +181,6 @@
/* **************************************************************************
*
- * Function name: lookup_user_symbol
- * Synopsis: Look for the given name as user-defined symbol, return
- * the assigned value.
- *
- * Inputs:
- * Parameters:
- * symb_nam The name for which to look.
- * Local Static Variables:
- * user_symbol_list Pointer to the list of user-defined symbols.
- *
- * Outputs:
- * Returned Value: Pointer to the "value" string, or NULL
- * pointer if the name was not found.
- * May also be NULL if "value" is NULL.
- *
- **************************************************************************** */
-
-char *lookup_user_symbol(char *symb_nam)
-{
- char *symb_valu;
-
- symb_valu = lookup_str_sub(symb_nam, user_symbol_list );
- return (symb_valu);
-}
-
-/* **************************************************************************
- *
* Function name: exists_as_user_symbol
* Synopsis: Confirm whether a given name exists
* as a user-defined symbol.
@@ -236,7 +207,7 @@
/* **************************************************************************
*
* Function name: eval_user_symbol
- * Synopsis: Tokenize the value assigned to a user-symbol.
+ * Synopsis: Evaluate the value assigned to a user-symbol.
*
* Associated Tokenizer directive (synonyms): [DEFINED]
* #DEFINED
@@ -251,7 +222,7 @@
*
* Inputs:
* Parameters:
- * symbol The User-Defined-Symbol to evaluate
+ * symb_nam Name of the User-Defined-Symbol to evaluate
* Local Static Variables:
* user_symbol_list Pointer to the list of user-defined symbols.
*
@@ -262,13 +233,15 @@
* Error Detection:
* Calling routine is responsible for verifying that the user-symbol
* is on the same line as the directive.
- * WARNING if the symbol is not found or has no assigned value.
+ * ERROR if the symbol is not found
+ * WARNING if the symbol has no assigned value.
*
* Process Explanation:
- * Look up the parameter in the User Symbol List, and retrieve
- * its associated value.
- * If it is not found, or if it has no associated value, issue
- * a WARNING and do nothing further. Otherwise...
+ * Look up the parameter in the User Symbol List,
+ * If it is not found, issue an ERROR and do nothing further.
+ * If it is found, attempt to retrieve its associated value
+ * If it has no associated value, issue a WARNING and
+ * do nothing further. Otherwise...
* Interpret the associated value as though it were source.
*
* Still to be done:
@@ -277,16 +250,26 @@
*
**************************************************************************** */
-void eval_user_symbol(char *symbol )
+void eval_user_symbol( char *symb_nam)
{
- char *symb_valu;
- symb_valu = lookup_user_symbol(symbol );
- if ( symb_valu == NULL )
+ str_sub_vocab_t *found = NULL;
+
+
+ found = lookup_str_sub( symb_nam, user_symbol_list );
+ if ( found == NULL )
{
- tokenization_error ( WARNING,
- "No value assigned to command-line symbol %s\n", symbol );
+ tokenization_error ( TKERROR,
+ "Command-line symbol %s is not defined.\n", symb_nam);
}else{
- eval_string( symb_valu );
+ char *symb_valu = found->alias;
+
+ if ( symb_valu == NULL )
+ {
+ tokenization_error ( WARNING,
+ "No value assigned to command-line symbol %s\n", symb_nam );
+ }else{
+ eval_string( symb_valu );
+ }
}
}
@@ -311,13 +294,30 @@
* We will:
* Allocate a temporary array of pointers.
* Step backwards through the linked-list of symbols, and
- * enter their pointers into the array.
+ * enter their pointers into the array. The array order
+ * reflects the backward-linked order of the linked-list
+ * of symbols is kept and searched,
* Collect the maximum length of the symbol names.
- * Step through the array in the reverse order, printing
- * as we go.
- * Use the max name length to space the equal-signs evenly
+ * Step through the array in the reverse order, to follow the
+ * order in which the symbols were defined.
+ * Check for a duplicate of the current symbol name:
+ * Look backwards through the array, at the names we
+ * have not yet printed, which were defined later.
+ * Since the later-defined value will prevail, the
+ * notation should be on the earlier one.
+ * Print the current name
+ * Use the maximum name-length to space the equal-signs or
+ * duplicate-name notation, as required, evenly.
* Free the temporary array.
*
+ * Revision History:
+ * Updated Thu, 07 Sep 2006 by David L. Paktor
+ * Report duplicated symbol names.
+ *
+ * Still to be done:
+ * Space the duplicate-name notation evenly; line it up past
+ * the longest name-with-value.
+ *
**************************************************************************** */
void list_user_symbols(void )
@@ -346,16 +346,46 @@
printf("\nUser-Defined Symbols:\n");
while ( indx > 0 )
{
+ bool is_dup;
+ int dup_srch_indx;
indx--;
curr = symb_ptr[indx];
+
+ /* Detect duplicate names. */
+ dup_srch_indx = indx;
+ is_dup = FALSE;
+ while ( dup_srch_indx > 0 )
+ {
+ str_sub_vocab_t *dup_cand;
+ dup_srch_indx--;
+ dup_cand = symb_ptr[dup_srch_indx];
+ if ( strcmp( curr->name, dup_cand->name) == 0 )
+ {
+ is_dup = TRUE;
+ break;
+ }
+ }
+
printf("\t%s",curr->name);
- if ( curr->alias != NULL )
+
+ if ( ( curr->alias != NULL ) || is_dup )
{
int strindx;
for ( strindx = strlen(curr->name) ;
- strindx < maxlen ; strindx++ ) printf(" ");
+ strindx < maxlen ;
+ strindx++ )
+ {
+ printf(" ");
+ }
+ }
+ if ( curr->alias != NULL )
+ {
printf(" = %s",curr->alias);
}
+ if ( is_dup )
+ {
+ printf(" *** Over-ridden" );
+ }
printf("\n");
}
free(symb_ptr);
Modified: fcode-utils/toke/usersymbols.h
===================================================================
--- fcode-utils/toke/usersymbols.h 2006-10-14 20:18:07 UTC (rev 89)
+++ fcode-utils/toke/usersymbols.h 2006-10-14 20:19:21 UTC (rev 90)
@@ -38,7 +38,6 @@
**************************************************************************** */
void add_user_symbol(char *raw_symb);
-char *lookup_user_symbol(char *symb_nam);
bool exists_as_user_symbol(char *symb_nam);
void eval_user_symbol(char *symbol );
void list_user_symbols(void );
Modified: fcode-utils/toke/vocabfuncts.h
===================================================================
--- fcode-utils/toke/vocabfuncts.h 2006-10-14 20:18:07 UTC (rev 89)
+++ fcode-utils/toke/vocabfuncts.h 2006-10-14 20:19:21 UTC (rev 90)
@@ -56,8 +56,6 @@
tic_hdr_t *lookup_core_word( char *tname);
-bool exists_in_core( char *name);
-bool handle_core_word( char *tname );
bool create_core_alias( char *new_name, char *old_name);
void enter_global_scope( void );
@@ -65,7 +63,6 @@
tic_hdr_t *lookup_current( char *name);
bool exists_in_current( char *tname);
-bool handle_current( char *tname );
tic_hdr_t *lookup_in_dev_node( char *tname);
void add_to_current( char *name,
TIC_P_DEFLT_TYPE fc_token,
@@ -81,7 +78,6 @@
void token_entry_warning( tic_hdr_t *t_entry);
tic_hdr_t *lookup_shared_word( char *tname);
-bool handle_shared_word( char *tname );
tic_hdr_t *lookup_shared_f_exec_word( char *tname);
void init_dictionary( void );
1
0
Author: stepan
Date: 2006-10-14 22:18:07 +0200 (Sat, 14 Oct 2006)
New Revision: 89
Modified:
fcode-utils/toke/Makefile
Log:
add coverage examples to Makefile
Modified: fcode-utils/toke/Makefile
===================================================================
--- fcode-utils/toke/Makefile 2006-10-14 20:17:30 UTC (rev 88)
+++ fcode-utils/toke/Makefile 2006-10-14 20:18:07 UTC (rev 89)
@@ -27,10 +27,16 @@
CC = gcc
STRIP = strip
INCLUDES = -I../shared
+
+# No coverage:
#CFLAGS = -O2 -g -Wall
CFLAGS = -Os -Wall -Wno-pointer-sign -DSYS_IS_GNU_Linux
-LDFLAGS =
+LDFLAGS =
+# Coverage:
+#CFLAGS = -O2 -fprofile-arcs -ftest-coverage -Wall -Wno-pointer-sign -DSYS_IS_GNU_Linux
+#LDFLAGS = -lgcov
+
OBJS = clflags.o conditl.o devnode.o dictionary.o emit.o errhandler.o \
flowcontrol.o macros.o nextfcode.o parselocals.o scanner.o stack.o \
stream.o strsubvocab.o ticvocab.o toke.o tokzesc.o tracesyms.o \
1
0
Author: stepan
Date: 2006-10-14 22:17:30 +0200 (Sat, 14 Oct 2006)
New Revision: 88
Modified:
fcode-utils/shared/types.h
Log:
fix types on Mac OS X
Modified: fcode-utils/shared/types.h
===================================================================
--- fcode-utils/shared/types.h 2006-10-10 17:43:11 UTC (rev 87)
+++ fcode-utils/shared/types.h 2006-10-14 20:17:30 UTC (rev 88)
@@ -39,7 +39,20 @@
*
**************************************************************************** */
+#if defined(__ppc__) && defined(__APPLE__)
+#include <sys/types.h>
+typedef int8_t s8;
+typedef u_int8_t u8;
+
+typedef int16_t s16;
+typedef u_int16_t u16;
+
+typedef int32_t s32;
+typedef u_int32_t u32;
+
+#else
+
#include <asm/types.h>
typedef __s8 s8;
@@ -50,6 +63,7 @@
typedef __s32 s32;
typedef __u32 u32;
+#endif
#ifdef FALSE /* Hack for AIX. */
#undef FALSE
1
0
Hi,
This is my first post to this list.
I'm considering a port of OpenBIOS to a MIPS platform. (Why?
Initially, to help with a hypothetical port of OpenSolaris to MIPS, but
I think it has other applications as well. YAMON, the normal MIPS
bootloader on many platforms, is really, really crummy in many
significant respects. And Redboot has its own issues as well.) I can
see this being useful for NetBSD as well.
First target platforms would be Alchemy DBAu15xx and Cobalt RaQs,
primarily because that's what I have hardware and sources for. (Maybe
also Atheros WiSoCs, although the information I have is less complete
for those platforms.)
Anyway, I'm very interested in this, so the first thing I did was pull
down the latest OpenBIOS to check it out.
No MIPS support. Okay, no problem. That's what I want to work on
anyway. (I seem to recall seeing a post from someone else who'd done a
MIPS port. Not sure why it isn't in SVN.)
Anyway, the next thing I discovered, is that trying to build a normal
amd64 build on my Ultra 20 running Solaris 10 didn't work. Apparently
the code is only tested on Linux.
So I have some diffs to make it somewhat better. Already I have diffs
for fcode-utils, and am working on openbios-devel. What is needed to
get my diffs integrated? What is the best way to get contributions into
the tree? Sorry for my ignorance, but I'm _very_ new to the project.
-- Garrett
1
0
Maybe we should just ask them to release the OBP code from a really old
Sparcstation or early Ultra 1 model ? While Sun are feeling generous, who
knows ?
-----Original Message-----
From: openbios-bounces(a)openbios.org
[mailto:openbios-bounces@openbios.org]On Behalf Of Jose Renau
Sent: Wednesday, 11 October 2006 6:35 AM
To: Blue Swirl
Cc: openbios(a)openbios.org
Subject: Re: [OpenBIOS] SUN OBP source code released
That sucks, I guess that Sun only released the OpenSPARC version. In
that
version, the hardware implements the hypervisor (sun4v).
On Oct 10, 2006, at 1:25 PM, Blue Swirl wrote:
>> SUN has released (under BSD license I believe), the source
>> code for their OpenBoot (OPB). This includes the forth programs
>> for many of their sun machines.
>
> The mode of operation in this version is that OBP talks to a
> hypervisor, it does not access hardware directly. So for example the
> low level code could be used in making OpenBIOS run on top of the
> hypervisor, but would this be useful? Higher level code could be used
> elsewhere, but I'm no Forth expert.
>
> The hypervisor sources are very Niagara-specific.
>
> Actually I don't know what to do with this otherwise very nice package.
>
> _________________________________________________________________
> Express yourself instantly with MSN Messenger! Download today it's
> FREE! http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
>
--
Practice everything with moderation, even moderation
- Unknown
--
OpenBIOS http://openbios.org/
Mailinglist: http://lists.openbios.org/mailman/listinfo
Free your System - May the Forth be with you
1
0
The current esp code will perform partial reads on devices with sector sizes >
512. The attached patch makes it read the whole sector from the device, and
uses the additional if multiple blocks are requested.
I'm not sure if the old behavior is technically wrong, but it confused me when
debugging the qemu device emulation :-)
Paul
2
1
Author: stepan
Date: 2006-10-10 19:43:11 +0200 (Tue, 10 Oct 2006)
New Revision: 87
Modified:
openbios-devel/drivers/esp.c
Log:
>From Paul Brook <paul(a)codesourcery.com>
The current esp code will perform partial reads on devices with sector sizes
> 512. The attached patch makes it read the whole sector from the device, and
uses the additional if multiple blocks are requested.
I'm not sure if the old behavior is technically wrong, but it confused me when
debugging the qemu device emulation :-)
Paul
Modified: openbios-devel/drivers/esp.c
===================================================================
--- openbios-devel/drivers/esp.c 2006-09-20 20:12:04 UTC (rev 86)
+++ openbios-devel/drivers/esp.c 2006-10-10 17:43:11 UTC (rev 87)
@@ -149,13 +149,12 @@
return 0; // OK
}
-// offset is multiple of 512, len in bytes
+// offset is in sectors
static int
-ob_sd_read_sectors(esp_private_t *esp, sd_private_t *sd, int offset, void *dest,
- short len, short sect_offset)
+ob_sd_read_sector(esp_private_t *esp, sd_private_t *sd, int offset)
{
- DPRINTF("ob_sd_read_sectors id %d %lx sector=%d len=%d soff %d\n",
- sd->id, (unsigned long)dest, offset, len, sect_offset);
+ DPRINTF("ob_sd_read_sector id %d %lx sector=%d\n",
+ sd->id, (unsigned long)dest, offset);
// Setup command = Read(10)
memset(esp->buffer, 0, 10);
@@ -167,14 +166,12 @@
esp->buffer[5] = (offset >> 8) & 0xff;
esp->buffer[6] = offset & 0xff;
- esp->buffer[8] = (len >> 8) & 0xff;
- esp->buffer[9] = len & 0xff;
+ esp->buffer[8] = 0;
+ esp->buffer[9] = 1;
- if (do_command(esp, sd, 10, len * 512 + sect_offset))
+ if (do_command(esp, sd, 10, sd->bs))
return 0;
- memcpy(dest, esp->buffer + sect_offset, len * 512);
-
return 0;
}
@@ -249,13 +246,17 @@
sect_offset = blk / spb;
pos = (blk - sect_offset * spb) * 512;
- if (ob_sd_read_sectors(global_esp, *sd, sect_offset, dest, 1, pos)) {
+ if (ob_sd_read_sector(global_esp, *sd, sect_offset)) {
DPRINTF("ob_sd_read_blocks: error\n");
RET(0);
}
- dest += 512;
- n--;
- blk++;
+ while (n && pos < spb * 512) {
+ memcpy(dest, global_esp->buffer + pos, 512);
+ pos += 512;
+ dest += 512;
+ n--;
+ blk++;
+ }
}
PUSH(cnt);
}
1
0
>I saw your requests to the LinuxBIOS mailinglist and other lists before,
>asking interesting questions and never coming up with anything after
>that, so I keep this really short. If you are serious with your attempt
>come back with more detailed questions rather than a list of links.
>Stefan
Hi Stefan :),
I am currently a student in computer science.
Here is my ultimate goal :
http://lists.duskglow.com/open-graphics/2006-October/007834.html
Full-fledged Open Source PC based on cutting-edge stuff :
Power PC, K42 or a libOS ... on a *high-end* motherboard.
To learn only one language (powerful enough to enjoy all this computing
power :).) will be easier ( get rid of java and C ... ). => we need mature
solutions from dependent type theory and CSP for massive parallelism and
verification...
I can spend my life to support legacy stuff but this is useless, I am waiting
the right time to start up. Geneseo Initiative, Open Game Platform, SLOF,
K42, Y0 seem to be good start points and its only the beginning ...
http://www.eecs.harvard.edu/~greg/
Y0: (y-naught) A next generation functional programming language. The focus
of this project is a synthesis of good ideas from the ML, Haskell, Scheme,
and LF communities. In particular, we are designing a language that like ML
and Scheme, is primarily call-by-value, but like Haskell, provides good
support for laziness. As in Haskell and FX, we are attempting to isolate
effects and reflect them in the types. As in Haskell, O'Caml, and LF, we are
trying to push the boundaries of type systems and type inference to the next
level. Currently, I am working with Amal Ahmed, Mathew Fluet, and Aleks
Nanevski on issues involving state and effects. I am also working with
Norman Ramsey & Paul Govereau on integrating type-classes with ML-style
modules.
For example, I was interested in the Coyotos and Hurd project. But all this
stuff is too much x86 related ... The K42 team spent more 9 years of work on
this project, so we can't explore so many ways in a whole life ... That's I
post so many links and try to see what happens. I go forward, quitely but
surely ... :)
Best Regards,
Will
Give me a microcontroller, then feel the power ...
1
0
Hello,
I would want to rewrite an Open Firmware with Ficl or Factor. Will this be
possible ?
SLOF :
http://www-128.ibm.com/developerworks/power/library/pa-expert5/
Ficl :
http://ficl.sourceforge.net/
Factor :
http://factorcode.org/
Here is quote from a previous mail to one of the SLOF's developer :
> I know that Slimline OpenFirmware is written in Forth. Could Factor (
> http://factorcode.org/ ) be a good alternative , or haskell ?
Open Firmware requires Forth, and Forth is a great fit to the
specific requirements of a boot firmware anyway. Any language
that needs garbage collection of any sort is right out, completely
unsuitable.
Thank you for your answer,
Best Regards,
Will
2
1
Could somebody please enlighten me what is the idea of libc/*.c files ?
What does it mean that if -DBOOTSTRAP uses the standard C-library,
and -UBOOTSTRAP uses the openbios-libc ?
I'm asking, because I want to embed a minimal FCode interpreter into a
C-application,
which of course itself uses the standard C-library.
Thanks & regards,
Rolf.
--
------------------------------------
Rolf Schroedter
German Aerospace Center
Institute of Planetary Research
D-12489 Berlin, Rutherfordstrasse 2
Tel/Fax: (+49) (30) 67055-416/384
Email: Rolf.Schroedter(a)dlr.de
1
0
For a scientific space project I'm thinking about including an FCode
interpreter into the onboard software.
The target system is a Leon3 processor (Sparc-V8) in FPGA with serial
port(s), spacewire and a few other interfaces.
I'm able to compile & run bare C applications (gcc cross-compiler), so
it seems to me that I don't need a real BIOS.
Having some experience with Forth I would like to include a FORTH
interpreter for
- interactive hardware implementation & testing via the serial port
- executing FORTH code (precompiled bytecode ?) via telecommands during
flight.
Ideally the complete FORTH system should be in the range of 32-40 kBytes...
I'm completely new to OpenBios & FCode. Any suggestions are appreciated:
- where to start
- how to strip down the OpenBios code
- etc.
Thanks & regards,
Rolf.
--
------------------------------------
Rolf Schroedter
German Aerospace Center
Institute of Planetary Research
D-12489 Berlin, Rutherfordstrasse 2
Tel/Fax: (+49) (30) 67055-416/384
Email: Rolf.Schroedter(a)dlr.de
6
16
Author: stepan
Date: 2006-09-20 22:12:04 +0200 (Wed, 20 Sep 2006)
New Revision: 86
Modified:
openbios-devel/arch/sparc32/tree.fs
Log:
power management patch from blueswirl
Modified: openbios-devel/arch/sparc32/tree.fs
===================================================================
--- openbios-devel/arch/sparc32/tree.fs 2006-09-14 16:29:48 UTC (rev 85)
+++ openbios-devel/arch/sparc32/tree.fs 2006-09-20 20:12:04 UTC (rev 86)
@@ -148,8 +148,7 @@
" /iommu/sbus" find-device
new-device
- \ disabled with xxx, bad interactions with Linux
- " xxxpower-management" device-name
+ " power-management" device-name
h# 4 encode-int h# 0a000000 encode-int encode+ h# 00000010 encode-int encode+ " reg" property
finish-device
1
0
I understand conflicting types... but why here?
administrator@sky_bolt /bios/OpenBIOS/openbios-devel $ make build-verbose
Building...
make -f obj-amd64/Makefile "CROSSCFLAGS=-USWAP_ENDIANNESS -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH"
make[1]: Entering directory `/bios/OpenBIOS/openbios-devel'
EXTRACFLAGS="-DBOOTSTRAP" ;\
gcc $EXTRACFLAGS -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin-bcopy -fno-builtin-log2 -Iinclude -Ikernel/include -Iobj-amd64/target/include -c -o obj-amd64/target/arch/unix/unix.o arch/unix/unix.c
arch/unix/unix.c:152: error: conflicting types for 'inb'
obj-amd64/target/include/asm/io.h:45: error: previous definition of 'inb' was here
arch/unix/unix.c:164: error: conflicting types for 'inw'
obj-amd64/target/include/asm/io.h:46: error: previous definition of 'inw' was here
arch/unix/unix.c:176: error: conflicting types for 'inl'
obj-amd64/target/include/asm/io.h:47: error: previous definition of 'inl' was here
arch/unix/unix.c:188: error: conflicting types for 'outb'
obj-amd64/target/include/asm/io.h:45: error: previous definition of 'outb' was here
arch/unix/unix.c:201: error: conflicting types for 'outw'
obj-amd64/target/include/asm/io.h:46: error: previous definition of 'outw' was here
arch/unix/unix.c:213: error: conflicting types for 'outl'
obj-amd64/target/include/asm/io.h:47: error: previous definition of 'outl' was here
arch/unix/unix.c: In function 'segv_handler':
arch/unix/unix.c:268: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
arch/unix/unix.c:270: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
arch/unix/unix.c:270: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'long unsigned int'
arch/unix/unix.c:270: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'cell'
arch/unix/unix.c:270: warning: format '%x' expects type 'unsigned int', but argument 5 has type 'ucell'
arch/unix/unix.c:270: warning: format '%x' expects type 'unsigned int', but argument 6 has type 'long unsigned int'
arch/unix/unix.c:272: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'ucell'
arch/unix/unix.c: In function 'read_from_disk':
arch/unix/unix.c:348: warning: unused parameter 'channel'
arch/unix/unix.c:348: warning: unused parameter 'unit'
arch/unix/unix.c: In function 'main':
arch/unix/unix.c:503: warning: format '%d' expects type 'int', but argument 2 has type 'cell'
make[1]: *** [obj-amd64/target/arch/unix/unix.o] Error 1
make[1]: Leaving directory `/bios/OpenBIOS/openbios-devel'
make: *** [build-verbose] Error 2
administrator@sky_bolt /bios/OpenBIOS/openbios-devel $
thanks
steve
---------------------------------
Get your own web address for just $1.99/1st yr. We'll help. Yahoo! Small Business.
2
1
Hi,
Aurelien Jarno fixed Sparc32 power management I/O in Qemu, so Sparc32
emulator does not make constant 100% CPU load anymore.
This patch enables the chip from OpenBIOS, please apply.
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
1
0
Hi,
This is my first install & compile of OpenBIOS
but, I am having trouble compiling...
administrator@sky_bolt /bios/OpenBIOS/openbios-devel $ config/scripts/switch-arch amd64
administrator@sky_bolt /bios/OpenBIOS/openbios-devel $ make
Building OpenBIOS on amd64 for amd64
Cleaning up... ok
Initializing build tree...ok.
Creating target Makefile...ok.
Creating config files...ok.
Building...error:
arch/unix/unix.c: In function 'segv_handler':
arch/unix/unix.c:268: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
arch/unix/unix.c:270: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
arch/unix/unix.c:270: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'long unsigned int'
arch/unix/unix.c:270: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'cell'
arch/unix/unix.c:270: warning: format '%x' expects type 'unsigned int', but argument 5 has type 'ucell'
arch/unix/unix.c:270: warning: format '%x' expects type 'unsigned int', but argument 6 has type 'long unsigned int'
arch/unix/unix.c:272: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'ucell'
arch/unix/unix.c: In function 'read_from_disk':
arch/unix/unix.c:348: warning: unused parameter 'channel'
arch/unix/unix.c:348: warning: unused parameter 'unit'
arch/unix/unix.c: In function 'main':
arch/unix/unix.c:503: warning: format '%d' expects type 'int', but argument 2 has type 'cell'
make[1]: *** [obj-amd64/target/arch/unix/unix.o] Error 1
make[1]: Leaving directory `/bios/OpenBIOS/openbios-devel'
any help would be appreciated
thanks
steve
---------------------------------
Do you Yahoo!?
Get on board. You're invited to try the new Yahoo! Mail.
2
1
Author: stepan
Date: 2006-09-14 18:29:48 +0200 (Thu, 14 Sep 2006)
New Revision: 85
Modified:
openbios-devel/kernel/forth.c
Log:
int-fixes part II
Modified: openbios-devel/kernel/forth.c
===================================================================
--- openbios-devel/kernel/forth.c 2006-09-14 15:08:45 UTC (rev 84)
+++ openbios-devel/kernel/forth.c 2006-09-14 16:29:48 UTC (rev 85)
@@ -633,7 +633,7 @@
static void wstore(void)
{
const u16 *aaddr = (u16 *)cell2pointer(POP());
- const ucell word = POP();
+ const u16 word = POP();
write_word(aaddr, word);
}
@@ -645,7 +645,7 @@
static void lstore(void)
{
const u32 *aaddr = (u32 *)cell2pointer(POP());
- const ucell longval = POP();
+ const u32 longval = POP();
write_long(aaddr, longval);
}
@@ -750,7 +750,7 @@
static void unalignedwordread(void)
{
- unsigned char *addr = (unsigned char *) cell2pointer(POP());
+ const unsigned char *addr = (const unsigned char *) cell2pointer(POP());
PUSH(unaligned_read_word(addr));
}
@@ -761,8 +761,8 @@
static void unalignedwordwrite(void)
{
- unsigned char *addr = (unsigned char *) cell2pointer(POP());
- ucell w = POP();
+ const unsigned char *addr = (const unsigned char *) cell2pointer(POP());
+ u16 w = POP();
unaligned_write_word(addr, w);
}
@@ -773,7 +773,7 @@
static void unalignedlongread(void)
{
- unsigned char *addr = (unsigned char *) cell2pointer(POP());
+ const unsigned char *addr = (const unsigned char *) cell2pointer(POP());
PUSH(unaligned_read_long(addr));
}
@@ -785,7 +785,7 @@
static void unalignedlongwrite(void)
{
unsigned char *addr = (unsigned char *) cell2pointer(POP());
- ucell l = POP();
+ u32 l = POP();
unaligned_write_long(addr, l);
}
1
0
>any reason for removing all consts in forth.c?
Sorry, I had the confused idea of considering these as errors. Now I know
better... The attached patch contains the good pieces of the previous patch.
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
1
0
Hi,
This patch makes the serial port initialisation more realistic. In addition
to speed, set also the number of stop bits, size of character, and baud rate
generator divisor. Also enable RTS and DTR.
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
2
1
Author: stepan
Date: 2006-09-14 17:08:45 +0200 (Thu, 14 Sep 2006)
New Revision: 84
Modified:
openbios-devel/arch/sparc32/console.c
openbios-devel/config/examples/cross-sparc32_config.xml
openbios-devel/config/examples/sparc32_config.xml
Log:
Blueswirl's serial patch
Modified: openbios-devel/arch/sparc32/console.c
===================================================================
--- openbios-devel/arch/sparc32/console.c 2006-09-14 15:06:38 UTC (rev 83)
+++ openbios-devel/arch/sparc32/console.c 2006-09-14 15:08:45 UTC (rev 84)
@@ -33,9 +33,17 @@
/* Write Register 3 */
#define RxENAB 0x1 /* Rx Enable */
+#define Rx8 0xc0 /* Rx 8 Bits/Character */
+/* Write Register 4 */
+#define SB1 0x4 /* 1 stop bit/char */
+#define X16CLK 0x40 /* x16 clock mode */
+
/* Write Register 5 */
+#define RTS 0x2 /* RTS */
#define TxENAB 0x8 /* Tx Enable */
+#define Tx8 0x60 /* Tx 8 bits/character */
+#define DTR 0x80 /* DTR */
/* Write Register 14 (Misc control bits) */
#define BRENAB 1 /* Baud rate generator enable */
@@ -65,12 +73,10 @@
static void uart_init_line(int port, unsigned long baud)
{
- outb(3, CTRL(port)); // reg 3
- outb(RxENAB, CTRL(port)); // enable rx
+ outb(4, CTRL(port)); // reg 4
+ outb(SB1 | X16CLK, CTRL(port)); // no parity, async, 1 stop
+ // bit, 16x clock
- outb(5, CTRL(port)); // reg 5
- outb(TxENAB, CTRL(port)); // enable tx
-
baud = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR);
outb(12, CTRL(port)); // reg 12
@@ -79,6 +85,15 @@
outb((baud >> 8) & 0xff, CTRL(port));
outb(14, CTRL(port)); // reg 14
outb(BRSRC | BRENAB, CTRL(port));
+
+ outb(3, CTRL(port)); // reg 3
+ outb(RxENAB | Rx8, CTRL(port)); // enable rx, 8 bits/char
+
+ outb(5, CTRL(port)); // reg 5
+ outb(RTS | TxENAB | Tx8 | DTR, CTRL(port)); // enable tx, 8
+ // bits/char, set
+ // RTS & DTR
+
}
int uart_init(int port, unsigned long speed)
Modified: openbios-devel/config/examples/cross-sparc32_config.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc32_config.xml 2006-09-14 15:06:38 UTC (rev 83)
+++ openbios-devel/config/examples/cross-sparc32_config.xml 2006-09-14 15:08:45 UTC (rev 84)
@@ -32,7 +32,7 @@
<option name="CONFIG_DEBUG_OBP" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_IOMMU" type="boolean" value="false"/>
<option name="CONFIG_SERIAL_PORT" type="integer" value="0"/>
- <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/>
+ <option name="CONFIG_SERIAL_SPEED" type="integer" value="9600"/>
<!-- Module Configuration -->
Modified: openbios-devel/config/examples/sparc32_config.xml
===================================================================
--- openbios-devel/config/examples/sparc32_config.xml 2006-09-14 15:06:38 UTC (rev 83)
+++ openbios-devel/config/examples/sparc32_config.xml 2006-09-14 15:08:45 UTC (rev 84)
@@ -32,7 +32,7 @@
<option name="CONFIG_DEBUG_OBP" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_IOMMU" type="boolean" value="false"/>
<option name="CONFIG_SERIAL_PORT" type="integer" value="0"/>
- <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/>
+ <option name="CONFIG_SERIAL_SPEED" type="integer" value="9600"/>
<!-- Module Configuration -->
1
0
Hi,
This patch contains some fixes to use of 'int' instead of cell types. I'm
not totally confident about all changes, but at least Sparc32 works as
before and Sparc64 unix version actually works!
No disk found.
No cdrom found
Welcome to OpenBIOS v1.0RC1 built on Sep 9 2006 07:50
Type 'help' for detailed information
[unix] Booting default not supported.
0 > show-devs
fffff80000039cd0 /
fffff80000039ea8 /aliases
fffff80000039fd0 /openprom (BootROM)
fffff8000003a288 /openprom/client-services
fffff8000003a3b8 /options
fffff8000003a498 /chosen
fffff8000003a638 /builtin
fffff8000003a760 /builtin/console
fffff800000433a8 /packages
fffff800000438e0 /packages/client-iface
fffff80000044f90 /packages/disk-label
fffff80000045750 /packages/cmdline
fffff80000047408 /packages/deblocker
fffff80000047a10 /packages/misc-files
fffff80000047f40 /packages/sun-parts
fffff80000045ad8 /pci (pci)
fffff80000045e18 /pci/isa (isa)
fffff800000465e8 /memory
fffff80000046710 /cpus
fffff80000046eb0 /unix
fffff80000047048 /unix/block (unix-block)
fffff80000048198 /unix/block/disk
ok
0 >
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
2
1
r83 - in openbios-devel: include/libc include/openbios kernel modules
by svn＠openbios.org 14 Sep '06
by svn＠openbios.org 14 Sep '06
14 Sep '06
Author: stepan
Date: 2006-09-14 17:06:38 +0200 (Thu, 14 Sep 2006)
New Revision: 83
Modified:
openbios-devel/include/libc/byteorder.h
openbios-devel/include/openbios/bindings.h
openbios-devel/kernel/cross.h
openbios-devel/kernel/internal.c
openbios-devel/modules/bindings.c
openbios-devel/modules/deblocker.c
openbios-devel/modules/disk-label.c
openbios-devel/modules/filesystems.c
Log:
64bit fixes from blueswirl
Modified: openbios-devel/include/libc/byteorder.h
===================================================================
--- openbios-devel/include/libc/byteorder.h 2006-09-05 19:46:20 UTC (rev 82)
+++ openbios-devel/include/libc/byteorder.h 2006-09-14 15:06:38 UTC (rev 83)
@@ -18,27 +18,45 @@
(__bswap32((x) & 0xffffffff) << 32) )
#ifdef CONFIG_LITTLE_ENDIAN
+#define __cpu_to_le64(x) ((u64) (x))
+#define __le64_to_cpu(x) ((u64) (x))
#define __cpu_to_le32(x) ((u32) (x))
#define __le32_to_cpu(x) ((u32) (x))
#define __cpu_to_le16(x) ((u16) (x))
#define __le16_to_cpu(x) ((u16) (x))
+#define __cpu_to_be64(x) (__bswap64((u64) (x)))
+#define __be64_to_cpu(x) (__bswap64((u64) (x)))
#define __cpu_to_be32(x) (__bswap32((u32) (x)))
#define __be32_to_cpu(x) (__bswap32((u32) (x)))
#define __cpu_to_be16(x) (__bswap16((u16) (x)))
#define __be16_to_cpu(x) (__bswap16((u16) (x)))
#endif
#ifdef CONFIG_BIG_ENDIAN
+#define __cpu_to_le64(x) (__bswap64((u64) (x)))
+#define __le64_to_cpu(x) (__bswap64((u64) (x)))
#define __cpu_to_le32(x) (__bswap32((u32) (x)))
#define __le32_to_cpu(x) (__bswap32((u32) (x)))
#define __cpu_to_le16(x) (__bswap16((u16) (x)))
#define __le16_to_cpu(x) (__bswap16((u16) (x)))
+#define __cpu_to_be64(x) ((u64) (x))
+#define __be64_to_cpu(x) ((u64) (x))
#define __cpu_to_be32(x) ((u32) (x))
#define __be32_to_cpu(x) ((u32) (x))
#define __cpu_to_be16(x) ((u16) (x))
#define __be16_to_cpu(x) ((u16) (x))
#endif
+#if BITS==32
+#define __becell_to_cpu(x) (__be32_to_cpu(x))
+#define __lecell_to_cpu(x) (__le32_to_cpu(x))
+#define __cpu_to_becell(x) (__cpu_to_be32(x))
+#define __cpu_to_lecell(x) (__cpu_to_le32(x))
+#else
+#define __becell_to_cpu(x) (__be64_to_cpu(x))
+#define __lecell_to_cpu(x) (__le64_to_cpu(x))
+#define __cpu_to_becell(x) (__cpu_to_be64(x))
+#define __cpu_to_lecell(x) (__cpu_to_le64(x))
+#endif
-
#endif
Modified: openbios-devel/include/openbios/bindings.h
===================================================================
--- openbios-devel/include/openbios/bindings.h 2006-09-05 19:46:20 UTC (rev 82)
+++ openbios-devel/include/openbios/bindings.h 2006-09-14 15:06:38 UTC (rev 83)
@@ -61,8 +61,8 @@
extern void set_property( phandle_t ph, const char *name,
const char *buf, int len );
extern void set_int_property( phandle_t ph, const char *name,
- int val );
-extern int get_int_property( phandle_t ph, const char *name,
+ cell val );
+extern cell get_int_property( phandle_t ph, const char *name,
int *retlen );
extern char *get_property( phandle_t ph, const char *name,
int *retlen );
@@ -76,7 +76,7 @@
}
/* forth bindings */
-extern int feval( const char *str );
+extern cell feval( const char *str );
extern void bind_xtfunc( const char *name, xt_t xt,
ucell arg, void (*func)(void) );
extern void bind_func( const char *name, void (*func)(void) );
@@ -85,7 +85,7 @@
extern char *pop_fstr_copy( void );
extern int _fword( const char *word, xt_t *cache_xt );
-extern int _eword( const char *word, xt_t *cache_xt, int nargs );
+extern cell _eword( const char *word, xt_t *cache_xt, int nargs );
extern int _selfword( const char *method, xt_t *cache_xt );
extern int _parword( const char *method, xt_t *cache_xt );
Modified: openbios-devel/kernel/cross.h
===================================================================
--- openbios-devel/kernel/cross.h 2006-09-05 19:46:20 UTC (rev 82)
+++ openbios-devel/kernel/cross.h 2006-09-14 15:06:38 UTC (rev 83)
@@ -84,7 +84,7 @@
#define unaligned_write_long(addr, value) \
unaligned_write_word(addr, value & 0xffff); \
- unaligned_write_word(addr, value >> 16)
+ unaligned_write_word(addr + 2, value >> 16)
#endif
@@ -100,7 +100,7 @@
#define unaligned_write_long(addr, value) \
unaligned_write_word(addr, value >> 16); \
- unaligned_write_word(addr, value & 0xffff)
+ unaligned_write_word(addr + 2, value & 0xffff)
#endif
/* bit width handling */
Modified: openbios-devel/kernel/internal.c
===================================================================
--- openbios-devel/kernel/internal.c 2006-09-05 19:46:20 UTC (rev 82)
+++ openbios-devel/kernel/internal.c 2006-09-14 15:06:38 UTC (rev 83)
@@ -115,14 +115,14 @@
static void docon(void)
{ /* DOCON */
- ucell tmp = read_cell(cell2pointer(read_ucell(cell2pointer(PC)) + sizeof(ucell)));
+ ucell tmp = read_ucell(cell2pointer(read_ucell(cell2pointer(PC)) + sizeof(ucell)));
PUSH(tmp);
dbg_interp_printk("docon: PC=%x, value=%x\n", PC, tmp);
}
static void dovar(void)
{ /* DOVAR */
- ucell tmp = read_cell(cell2pointer(PC)) + sizeof(ucell);
+ ucell tmp = read_ucell(cell2pointer(PC)) + sizeof(ucell);
PUSH(tmp); /* returns address to variable */
dbg_interp_printk("dovar: PC: %x, %x\n", PC, tmp);
}
Modified: openbios-devel/modules/bindings.c
===================================================================
--- openbios-devel/modules/bindings.c 2006-09-05 19:46:20 UTC (rev 82)
+++ openbios-devel/modules/bindings.c 2006-09-14 15:06:38 UTC (rev 83)
@@ -33,18 +33,18 @@
}
/* WARNING: sloooow - AVOID */
-int
+cell
feval( const char *str )
{
push_str( str );
return eword("evaluate", 2);
}
-int
+cell
_eword( const char *word, xt_t *cache_xt, int nargs )
{
static xt_t catch_xt = 0;
- int ret = -1;
+ cell ret = -1;
if( !catch_xt )
catch_xt = findword("catch");
@@ -285,10 +285,10 @@
}
void
-set_int_property( phandle_t ph, const char *name, int val )
+set_int_property( phandle_t ph, const char *name, cell val )
{
- int swapped=__cpu_to_be32(val);
- set_property( ph, name, (char*)&swapped, 4 );
+ cell swapped=__cpu_to_becell(val);
+ set_property( ph, name, (char*)&swapped, sizeof(cell) );
}
char *
@@ -310,14 +310,14 @@
return (char*)POP();
}
-int
+cell
get_int_property( phandle_t ph, const char *name, int *retlen )
{
- int *p;
+ cell *p;
- if( !(p=(int*)get_property(ph, name, retlen)) )
+ if( !(p=(cell *)get_property(ph, name, retlen)) )
return 0;
- return *p;
+ return __becell_to_cpu(*p);
}
@@ -423,7 +423,7 @@
static void
call1_func( void )
{
- void (*func)(int v);
+ void (*func)(cell v);
func = (void*)POP();
(*func)( POP() );
Modified: openbios-devel/modules/deblocker.c
===================================================================
--- openbios-devel/modules/deblocker.c 2006-09-05 19:46:20 UTC (rev 82)
+++ openbios-devel/modules/deblocker.c 2006-09-14 15:06:38 UTC (rev 83)
@@ -20,7 +20,7 @@
#include "modules.h"
typedef struct {
- ullong mark;
+ ducell mark;
xt_t read_xt;
xt_t write_xt;
@@ -70,14 +70,14 @@
static void
deblk_seek( deblk_info_t *di )
{
- uint pos_hi = POP();
- uint pos_lo = POP();
- ullong mark = ((ullong)pos_hi << 32) | pos_lo;
+ ucell pos_hi = POP();
+ ucell pos_lo = POP();
+ ducell mark = ((ducell)pos_hi << BITS) | pos_lo;
/* printk("deblk_seek %x %08x\n", pos_hi, pos_lo ); */
/* -1 means seek to EOF (at least in our implementation) */
- if( (llong)mark == -1 )
+ if( (dcell)mark == -1 )
RET(-1);
di->mark = mark;
@@ -102,7 +102,7 @@
int nblks;
/* byte operation */
- int offs;
+ cell offs;
int len;
char *data; /* start of data */
} work_t;
Modified: openbios-devel/modules/disk-label.c
===================================================================
--- openbios-devel/modules/disk-label.c 2006-09-05 19:46:20 UTC (rev 82)
+++ openbios-devel/modules/disk-label.c 2006-09-14 15:06:38 UTC (rev 83)
@@ -22,8 +22,8 @@
typedef struct {
int fd;
- ullong offs;
- ullong size;
+ ducell offs;
+ ducell size;
int type; /* partition type or -1 */
ihandle_t part_ih;
Modified: openbios-devel/modules/filesystems.c
===================================================================
--- openbios-devel/modules/filesystems.c 2006-09-05 19:46:20 UTC (rev 82)
+++ openbios-devel/modules/filesystems.c 2006-09-14 15:06:38 UTC (rev 83)
@@ -203,7 +203,7 @@
files_seek( files_info_t *mi )
{
llong pos = DPOP();
- int ret;
+ cell ret;
if( mi->file ) {
int offs = (int)pos;
1
0
14 Sep '06
* David L Paktor <dlpaktor(a)us.ibm.com> [060909 01:01]:
> I changed the Test Suite to fill those gaps (there are now 167 tests, as
> counted by the AutoExec script) and removed the dead routines (except for one I
> believe should remain for possible future use -- read the top of the Data Stack
> without popping it off). I also fine-tuned some error detection in
> "User-defined command-line compilation-control symbols" (when attempting to
> access a defined value, distinguish between the case where no value is assigned
> to the symbol versus where the symbol is altogether undefined; and identify
> multiple definitions of the same symbol).
Can you please send me this new test suite? I received a bunch of files
for a new tokenizer, which I put online, but not the test suite.
> And, as we spoke, I bumped the version number to 1.0.01
Lets stick with 1.0.1, but I'll change that in the internal tree.
Please, for future submissions, use the current version of the fcode
utilities from subversion. This greatly reduces the file fiddling work
for merges and allows to include and publish the code a lot quicker.
Stefan
--
coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br.
Tel.: +49 761 7668825 • Fax: +49 761 7664613
Email: info(a)coresystems.de • http://www.coresystems.de/
1
0
Stefan Reinauer <stepan(a)coresystems.de> wrote on Fri Aug 18 17:43:44 CEST
2006
> * Stefan Reinauer <stepan(a)coresystems.de> [060818 17:06]:
> . . . . .
>
> For a quick test I ran a coverage test with our new and shiny test suite
> and here's the results:
>
> Code covered: 95.9 %
>
> That is pretty damn good for a first run. Even if it was a safety
> critical applications.
>
> The whole coverage report can be checked here:
> http://openbios.org/~stepan/toke/coverage/fcode-utils/toke/index.html
>
> As you can clearly see most of the files only have their panic code
> uncovered. Which is pretty normal. Only whats wrong with strsubvocab.c
> ;-)
>
> David, thank you very much for this high quality contribution.
>
> Stefan
>
> --
> coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br.
> Tel.: +49 761 7668825 • Fax: +49 761 7664613
> Email: info(a)coresystems.de • http://www.coresystems.de/
Stefan Reinauer <stepan(a)coresystems.de> wrote on 09/05/2006 12:04:09 PM:
> Dear David,
>
> thank you for the conference call and the nice conversation.
>
> Please go ahead and send the next round of toke files with a
> bumped version number, so that people can see the progress being made.
>
> I will merge the changes into the new tree.
>
> Stefan
I have completed the changes we discussed and will be sending them to you
separately.
The coverage report identified several areas of "dead code" (most notably
in strsubvocab.c ) as well as a few cases that weren't covered in the Test
Suite.
I changed the Test Suite to fill those gaps (there are now 167 tests, as
counted by the AutoExec script) and removed the dead routines (except for
one I believe should remain for possible future use -- read the top of the
Data Stack without popping it off). I also fine-tuned some error detection
in "User-defined command-line compilation-control symbols" (when attempting
to access a defined value, distinguish between the case where no value is
assigned to the symbol versus where the symbol is altogether undefined; and
identify multiple definitions of the same symbol).
And, as we spoke, I bumped the version number to 1.0.01
I then ran my own coverage test; it showed a satisfactory improvement. I
will not be sending you my results; your independent confirmation would be
preferable.
One other thing I'd like to request. I think the Coverage Report is a Very
Good Thing: it deserves to be displayed prominently, not just mentioned in
an item in the Mail Archives. When you complete your coverage test, could
you open up an additional section -- like the sections for "Unit-Test
Suite" and "Unit-Test Suite Logs" -- for it, at the end of the "OpenBIOS -
FCode suite" page?
Thanks.
-----
David L. Paktor System Firmware Developer
System and Technology Group Global Firmware Division
dlpaktor(a)us.ibm.com David L Paktor/Almaden/IBM@IBMUS
18880 Homestead Rd. Building 9945
Cupertino CA 95014 Room 1026
408-342-6110 T/L 560-6110
"The Bug Stops Here"
1
0
Hi,
This patch fixes SMP booting:
Entering SMP Mode...
Starting CPU 1 at f01e46e4
Calibrating delay loop... 180.63 BogoMIPS
Starting CPU 2 at f01e46f0
Calibrating delay loop... 181.86 BogoMIPS
Starting CPU 3 at f01e46fc
Calibrating delay loop... 182.68 BogoMIPS
Total of 4 Processors activated (721.71 BogoMIPS).
Though depending on version Linux usually hangs later.
Please apply.
_________________________________________________________________
FREE pop-up blocking with the new MSN Toolbar - get it now!
http://toolbar.msn.click-url.com/go/onm00200415ave/direct/01/
2
2
* Al Boldi <a1426z(a)gawab.com> [060904 20:58]:
> FILO version 0.5 ....
> Can't get memory map from firmware. Using hardcoded default.
> Press ...
> boot: uda1:/vmlinuz
> LinuxLabs USB bootloader
> New USB device, setting address 2 (repeats 1-4 times)
> boot: uda1:/vmlinuz
> LinuxLabs USB bootloader
> Out of heap space
Please try increasing the heap space in i386/ldscript by changing the
following lines:
/* 16KB heap and stack */
HEAP_SIZE = 16384;
to
/* 32KB heap and 16K stack */
HEAP_SIZE = 32768;
> And, how can filo 0.5 be fixed to boot USB?
If the message stays, try all the way up to 262144.
Regards,
Stefan
--
coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br.
Tel.: +49 761 7668825 • Fax: +49 761 7664613
Email: info(a)coresystems.de • http://www.coresystems.de/
1
0
Dear OpenBIOS community,
its been a while now since the last update of the OpenBIOS FCode suite
containing the FCode utilities Toke and Detok. Since we want to
permanently improve the tool chain to make it usable for your needs,
we are looking for folks out there who have used toke and detok.
Please contact me, on this list or privately, so we can find out how to
improve the tools further.
As a reminder: check out the latest FCode suite source code with:
svn co svn://openbios.org/openbios/fcode-utils
Thank you.
Stefan
--
coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br.
Tel.: +49 761 7668825 • Fax: +49 761 7664613
Email: info(a)coresystems.de • http://www.coresystems.de/
1
0
Author: stepan
Date: 2006-09-05 21:46:20 +0200 (Tue, 05 Sep 2006)
New Revision: 82
Modified:
openbios-devel/drivers/obio.c
Log:
From: Blue Swirl <blueswir1(a)hotmail.com>
This patch fixes SMP booting:
Entering SMP Mode...
Starting CPU 1 at f01e46e4
Calibrating delay loop... 180.63 BogoMIPS
Starting CPU 2 at f01e46f0
Calibrating delay loop... 181.86 BogoMIPS
Starting CPU 3 at f01e46fc
Calibrating delay loop... 182.68 BogoMIPS
Total of 4 Processors activated (721.71 BogoMIPS).
Though depending on version Linux usually hangs later.
Modified: openbios-devel/drivers/obio.c
===================================================================
--- openbios-devel/drivers/obio.c 2006-09-05 19:44:40 UTC (rev 81)
+++ openbios-devel/drivers/obio.c 2006-09-05 19:46:20 UTC (rev 82)
@@ -450,7 +450,7 @@
push_str("mask_rev");
fword("property");
- PUSH(i << 3);
+ PUSH(i);
fword("encode-int");
push_str("mid");
fword("property");
@@ -625,9 +625,9 @@
if (!cpu)
return -1;
- nvram[0x38] = pc;
- nvram[0x3c] = context_ptr;
- nvram[0x40] = context;
+ *(uint32_t *)&nvram[0x38] = pc;
+ *(uint32_t *)&nvram[0x3c] = context_ptr;
+ *(uint32_t *)&nvram[0x40] = context;
nvram[0x2e] = cpu & 0xff;
intregs->cpu_intregs[cpu].set = SUN4M_SOFT_INT(14);
1
0
Author: stepan
Date: 2006-09-05 21:44:40 +0200 (Tue, 05 Sep 2006)
New Revision: 81
Modified:
openbios-devel/utils/devbios/ChangeLog
openbios-devel/utils/devbios/README.bios
Log:
mark devbios officially obsolete.
Modified: openbios-devel/utils/devbios/ChangeLog
===================================================================
--- openbios-devel/utils/devbios/ChangeLog 2006-09-05 19:37:13 UTC (rev 80)
+++ openbios-devel/utils/devbios/ChangeLog 2006-09-05 19:44:40 UTC (rev 81)
@@ -1,3 +1,23 @@
+NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE!
+
+/dev/bios is obsolete and no longer under development. Please adapt all
+changes to the "flashrom" utility of LinuxBIOS. This utility can be found
+at LinuxBIOSv2/utils/flashrom in the LinuxBIOS v2 repository. LinuxBIOS
+is available at http://www.linuxbios.org/
+
+I'm also looking for volunteers to port all features available in /dev/bios
+to flashrom so /dev/bios can be dropped from the OpenBIOS tree. These features
+include
+
+- block information about flash chips
+- block wise writing of flash chips
+- lots of supported flash chips and vendors.
+
+If you have questions, contact Stefan Reinauer <stepan(a)coresystems.de>
+
+NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE!
+
+
ChangeLog for /dev/bios
** 2004/03/31 ********************************************************
Modified: openbios-devel/utils/devbios/README.bios
===================================================================
--- openbios-devel/utils/devbios/README.bios 2006-09-05 19:37:13 UTC (rev 80)
+++ openbios-devel/utils/devbios/README.bios 2006-09-05 19:44:40 UTC (rev 81)
@@ -1,3 +1,23 @@
+NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE!
+
+/dev/bios is obsolete and no longer under development. Please adapt all
+changes to the "flashrom" utility of LinuxBIOS. This utility can be found
+at LinuxBIOSv2/utils/flashrom in the LinuxBIOS v2 repository. LinuxBIOS
+is available at http://www.linuxbios.org/
+
+I'm also looking for volunteers to port all features available in /dev/bios
+to flashrom so /dev/bios can be dropped from the OpenBIOS tree. These features
+include
+
+- block information about flash chips
+- block wise writing of flash chips
+- lots of supported flash chips and vendors.
+
+If you have questions, contact Stefan Reinauer <stepan(a)coresystems.de>
+
+NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE! NOTE!
+
+
/dev/bios documentation 2002/02/19
Table of contents
@@ -232,6 +252,5 @@
* any comments
* any ideas
-
Stefan Reinauer <stepan(a)openbios.org>
1
0
Author: stepan
Date: 2006-09-05 21:37:13 +0200 (Tue, 05 Sep 2006)
New Revision: 80
Removed:
openbios-devel/toke/
openbios-devel/utils/detok/
openbios-devel/utils/fccc/
openbios-devel/utils/romheaders/
Modified:
openbios-devel/Makefile
openbios-devel/README
openbios-devel/build.xml
Log:
* remove toke, detok and romheaders and add reference to
svn://openbios.org/openbios/fcode-utils where they are located now.
* drop fccc
Modified: openbios-devel/Makefile
===================================================================
--- openbios-devel/Makefile 2006-08-20 15:59:02 UTC (rev 79)
+++ openbios-devel/Makefile 2006-09-05 19:37:13 UTC (rev 80)
@@ -3,7 +3,7 @@
CROSSCFLAGS=$(shell config/scripts/crosscflags $(HOSTARCH) $(ARCH))
ODIR=obj-$(ARCH)
-all: archtest info build
+all: requirements archtest info build
archtest: prepare
@test -r config.xml -a -r rules.xml || \
@@ -13,6 +13,14 @@
echo " cross-sparc32, sparc32, cross-sparc64, sparc64"; \
echo; exit 1 )
+requirements:
+ @which toke &>/dev/null || ( echo ; echo "Please install the OpenBIOS fcode utilities."; \
+ echo; echo "Download with :"; \
+ echo " $$ svn co svn://openbios.org/openbios/fcode-utils"; \
+ echo; exit 1 )
+ @which xsltproc &>/dev/null || ( echo ; echo "Please install libxslt2"; \
+ echo; exit 1 )
+
info:
@echo "Building OpenBIOS on $(HOSTARCH) for $(ARCH)"
@@ -42,7 +50,6 @@
@mkdir -p $(ODIR)/target/libc
@mkdir -p $(ODIR)/host/include
@mkdir -p $(ODIR)/host/kernel
- @mkdir -p $(ODIR)/host/toke
@mkdir -p $(ODIR)/forth
@ln -s $(PWD)/include/$(ARCH) $(ODIR)/target/include/asm
@#compile the host binary with target settings instead
Modified: openbios-devel/README
===================================================================
--- openbios-devel/README 2006-08-20 15:59:02 UTC (rev 79)
+++ openbios-devel/README 2006-09-05 19:37:13 UTC (rev 80)
@@ -71,6 +71,8 @@
------------
* gcc
* gnu make
+ * OpenBIOS FCode Utils
+ Download with svn co svn://openbios.org/openbios/fcode-utils
* grub or any other multiboot loader to run the multiboot
binary "openbios.multiboot" with it's module "openbios-<platform>.dict"
* xsltproc
Modified: openbios-devel/build.xml
===================================================================
--- openbios-devel/build.xml 2006-08-20 15:59:02 UTC (rev 79)
+++ openbios-devel/build.xml 2006-09-05 19:37:13 UTC (rev 80)
@@ -2,7 +2,6 @@
<xmlmake>
<project name="openbios">
<include href="kernel/build.xml"/>
- <include href="toke/build.xml"/>
<include href="forth/build.xml"/>
<include href="libc/build.xml"/>
<include href="libgcc/build.xml"/>
1
0
Yes, that's essentially what I want. The runiso target in the makefile uses qemu. So that part was easy.
Trying to decipher all the rest of it is where I'm stuck.
John
________________________________
From: Asif Haswarey [mailto:asif.haswarey@qlogic.com]
Sent: Wednesday, August 23, 2006 12:31 PM
To: Fusco, John (GE Healthcare)
Subject: RE: [OpenBIOS] Basic Questions
John,
Exercising the PCI config space is probably what you are looking to do.
Have you actually been able to install OpenBIOS in your Qemu environment/platform?
_____________
Äsif Haswaréy
QLogic Corporation
FCode Driver Development
Phone: 949.389.7607
Fax: 949.389.6308
asif.haswarey(a)qlogic.com
________________________________
From: openbios-bounces(a)openbios.org [mailto:openbios-bounces@openbios.org] On Behalf Of Fusco, John (GE Healthcare)
Sent: Wednesday, August 23, 2006 10:12 AM
To: openbios(a)openbios.org
Subject: [OpenBIOS] Basic Questions
I am investigating the possiblity of using Openbios as a tool to verify our custom PCI designs.
Specifically what I am interested in is the ability to modify the PCI base address registers and excercise the address decoders on the cards. What I'm after is some basic PCI compliance testing that is hard to do with a full blown OS.
My problem is that I'm having a tough time with the learning curve of openbios. I'm having trouble figuring out how to do some basic things, like query the BARs of a PCI device. I'm using Qemu as a sandbox to play with openbios, but I can't even figure out how print the value of configuration register zero of a particular device!
Can anyone steer me in the right direction? Am I wasting my time, or does it sound like Openbios is going to do what I want.
Thanks,
John
2
9
I am investigating the possiblity of using Openbios as a tool to verify
our custom PCI designs.
Specifically what I am interested in is the ability to modify the PCI
base address registers and excercise the address decoders on the cards.
What I'm after is some basic PCI compliance testing that is hard to do
with a full blown OS.
My problem is that I'm having a tough time with the learning curve of
openbios. I'm having trouble figuring out how to do some basic things,
like query the BARs of a PCI device. I'm using Qemu as a sandbox to play
with openbios, but I can't even figure out how print the value of
configuration register zero of a particular device!
Can anyone steer me in the right direction? Am I wasting my time, or
does it sound like Openbios is going to do what I want.
Thanks,
John
1
0
Author: stepan
Date: 2006-08-20 17:59:02 +0200 (Sun, 20 Aug 2006)
New Revision: 79
Modified:
openbios-devel/drivers/esp.c
Log:
Fix booting without CD in drive.
Modified: openbios-devel/drivers/esp.c
===================================================================
--- openbios-devel/drivers/esp.c 2006-08-18 12:57:14 UTC (rev 78)
+++ openbios-devel/drivers/esp.c 2006-08-20 15:59:02 UTC (rev 79)
@@ -118,7 +118,12 @@
// Check status
status = esp->ll->regs[ESP_STATUS];
- if ((status & ESP_STAT_TCNT) != ESP_STAT_TCNT)
+ DPRINTF("do_command: id %d, cmd[0] 0x%x, status 0x%x\n", sd->id, esp->buffer[0], status);
+
+ // Target didn't want all command data or went to status phase
+ // instead of data phase?
+ if ((status & ESP_STAT_TCNT) != ESP_STAT_TCNT
+ || (status & ESP_STAT_PMASK) == ESP_STATP)
return status;
// Get reply
@@ -136,6 +141,8 @@
// Check status
status = esp->ll->regs[ESP_STATUS];
+ DPRINTF("do_command_reply: status 0x%x\n", status);
+
if ((status & ESP_STAT_TCNT) != ESP_STAT_TCNT)
return status;
else
1
0
The attached patch fixes a booting problem when there is no CD in drive.
Please apply.
When there is no disc in drive, READ_CAPACITY command fails and there won't
be any data transfers. Trying to transfer data hangs in recent Qemu.
Remedy: check if target went to status phase instead of data transfer phase,
if so return with error.
_________________________________________________________________
FREE pop-up blocking with the new MSN Toolbar - get it now!
http://toolbar.msn.click-url.com/go/onm00200415ave/direct/01/
1
0
* David L Paktor <dlpaktor(a)us.ibm.com> [060817 21:29]:
> I would like to make two small amendments:
>
> The test suite contains exactly 162 tests. Still a lot, but let's not
> mis-advertise even to a small degree.
Sorry, this is true of course. I just did a rough estimate by counting
the .fth files, which is a little bit inaccurate.
> Modesty prohibits me from saying much more than this, but I hope a look at the
> New Features document,
> and at the Test Log files, will suffice to demonstrate that "a couple of
> significant improvements"
> is very much an understatement... ;-}
Yes, definitely. To emphasize this we have pushed the version number of
the tokenizer to 1.0.
If you want to have a look at the old and the new version, go to:
http://www.openbios.org/~stepan/toke/
Stefan
--
coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br.
Tel.: +49 761 7668825 • Fax: +49 761 7664613
Email: info(a)coresystems.de • http://www.coresystems.de/
1
1
Author: stepan
Date: 2006-08-18 14:57:14 +0200 (Fri, 18 Aug 2006)
New Revision: 78
Added:
fcode-utils/toke/toke.doxygen
Modified:
fcode-utils/toke/Makefile
Log:
add toke doxygen documentation target
Modified: fcode-utils/toke/Makefile
===================================================================
--- fcode-utils/toke/Makefile 2006-08-18 12:56:03 UTC (rev 77)
+++ fcode-utils/toke/Makefile 2006-08-18 12:57:14 UTC (rev 78)
@@ -51,6 +51,9 @@
.dependencies: *.c
@$(CC) $(CFLAGS) $(INCLUDES) -MM *.c > .dependencies
+documentation:: *.c *.h toke.doxygen
+ @doxygen toke.doxygen
+
.PHONY: all clean distclean
-include .dependencies
Added: fcode-utils/toke/toke.doxygen
===================================================================
--- fcode-utils/toke/toke.doxygen (rev 0)
+++ fcode-utils/toke/toke.doxygen 2006-08-18 12:57:14 UTC (rev 78)
@@ -0,0 +1,272 @@
+# Doxyfile 1.4.4
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME = Toke
+PROJECT_NUMBER =
+OUTPUT_DIRECTORY = .
+CREATE_SUBDIRS = YES
+OUTPUT_LANGUAGE = English
+USE_WINDOWS_ENCODING = NO
+BRIEF_MEMBER_DESC = YES
+REPEAT_BRIEF = YES
+ABBREVIATE_BRIEF = "The $name class" \
+ "The $name widget" \
+ "The $name file" \
+ is \
+ provides \
+ specifies \
+ contains \
+ represents \
+ a \
+ an \
+ the
+ALWAYS_DETAILED_SEC = NO
+INLINE_INHERITED_MEMB = NO
+FULL_PATH_NAMES = NO
+STRIP_FROM_PATH =
+STRIP_FROM_INC_PATH =
+SHORT_NAMES = NO
+JAVADOC_AUTOBRIEF = YES
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP = NO
+INHERIT_DOCS = YES
+DISTRIBUTE_GROUP_DOC = NO
+SEPARATE_MEMBER_PAGES = NO
+TAB_SIZE = 8
+ALIASES =
+OPTIMIZE_OUTPUT_FOR_C = YES
+OPTIMIZE_OUTPUT_JAVA = NO
+SUBGROUPING = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL = YES
+EXTRACT_PRIVATE = YES
+EXTRACT_STATIC = YES
+EXTRACT_LOCAL_CLASSES = YES
+EXTRACT_LOCAL_METHODS = NO
+HIDE_UNDOC_MEMBERS = NO
+HIDE_UNDOC_CLASSES = NO
+HIDE_FRIEND_COMPOUNDS = NO
+HIDE_IN_BODY_DOCS = NO
+INTERNAL_DOCS = NO
+CASE_SENSE_NAMES = YES
+HIDE_SCOPE_NAMES = NO
+SHOW_INCLUDE_FILES = YES
+INLINE_INFO = YES
+SORT_MEMBER_DOCS = YES
+SORT_BRIEF_DOCS = NO
+SORT_BY_SCOPE_NAME = NO
+GENERATE_TODOLIST = YES
+GENERATE_TESTLIST = YES
+GENERATE_BUGLIST = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS =
+MAX_INITIALIZER_LINES = 30
+SHOW_USED_FILES = YES
+SHOW_DIRECTORIES = YES
+FILE_VERSION_FILTER =
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET = NO
+WARNINGS = YES
+WARN_IF_UNDOCUMENTED = YES
+WARN_IF_DOC_ERROR = YES
+WARN_NO_PARAMDOC = NO
+WARN_FORMAT = "$file:$line: $text"
+WARN_LOGFILE =
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT =
+FILE_PATTERNS = *.c \
+ *.cc \
+ *.cxx \
+ *.cpp \
+ *.c++ \
+ *.d \
+ *.java \
+ *.ii \
+ *.ixx \
+ *.ipp \
+ *.i++ \
+ *.inl \
+ *.h \
+ *.hh \
+ *.hxx \
+ *.hpp \
+ *.h++ \
+ *.idl \
+ *.odl \
+ *.cs \
+ *.php \
+ *.php3 \
+ *.inc \
+ *.m \
+ *.mm \
+ *.dox \
+ *.C \
+ *.CC \
+ *.C++ \
+ *.II \
+ *.I++ \
+ *.H \
+ *.HH \
+ *.H++ \
+ *.CS \
+ *.PHP \
+ *.PHP3 \
+ *.M \
+ *.MM
+RECURSIVE = YES
+EXCLUDE =
+EXCLUDE_SYMLINKS = NO
+EXCLUDE_PATTERNS =
+EXAMPLE_PATH =
+EXAMPLE_PATTERNS =
+EXAMPLE_RECURSIVE = NO
+IMAGE_PATH =
+INPUT_FILTER =
+FILTER_PATTERNS =
+FILTER_SOURCE_FILES = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER = YES
+INLINE_SOURCES = NO
+STRIP_CODE_COMMENTS = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION = YES
+USE_HTAGS = NO
+VERBATIM_HEADERS = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX = NO
+COLS_IN_ALPHA_INDEX = 5
+IGNORE_PREFIX =
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML = YES
+HTML_OUTPUT = toke-html
+HTML_FILE_EXTENSION = .html
+HTML_HEADER =
+HTML_FOOTER =
+HTML_STYLESHEET =
+HTML_ALIGN_MEMBERS = YES
+GENERATE_HTMLHELP = NO
+CHM_FILE =
+HHC_LOCATION =
+GENERATE_CHI = NO
+BINARY_TOC = NO
+TOC_EXPAND = NO
+DISABLE_INDEX = NO
+ENUM_VALUES_PER_LINE = 4
+GENERATE_TREEVIEW = YES
+TREEVIEW_WIDTH = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX = NO
+LATEX_OUTPUT = latex
+LATEX_CMD_NAME = latex
+MAKEINDEX_CMD_NAME = makeindex
+COMPACT_LATEX = NO
+PAPER_TYPE = a4wide
+EXTRA_PACKAGES =
+LATEX_HEADER =
+PDF_HYPERLINKS = YES
+USE_PDFLATEX = YES
+LATEX_BATCHMODE = NO
+LATEX_HIDE_INDICES = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF = NO
+RTF_OUTPUT = rtf
+COMPACT_RTF = NO
+RTF_HYPERLINKS = NO
+RTF_STYLESHEET_FILE =
+RTF_EXTENSIONS_FILE =
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN = NO
+MAN_OUTPUT = man
+MAN_EXTENSION = .3
+MAN_LINKS = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML = NO
+XML_OUTPUT = xml
+XML_SCHEMA =
+XML_DTD =
+XML_PROGRAMLISTING = YES
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD = NO
+PERLMOD_LATEX = NO
+PERLMOD_PRETTY = YES
+PERLMOD_MAKEVAR_PREFIX =
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING = YES
+MACRO_EXPANSION = NO
+EXPAND_ONLY_PREDEF = NO
+SEARCH_INCLUDES = YES
+INCLUDE_PATH =
+INCLUDE_FILE_PATTERNS =
+PREDEFINED =
+EXPAND_AS_DEFINED =
+SKIP_FUNCTION_MACROS = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+TAGFILES =
+GENERATE_TAGFILE =
+ALLEXTERNALS = NO
+EXTERNAL_GROUPS = YES
+PERL_PATH = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS = YES
+HIDE_UNDOC_RELATIONS = YES
+HAVE_DOT = YES
+CLASS_GRAPH = YES
+COLLABORATION_GRAPH = YES
+GROUP_GRAPHS = YES
+UML_LOOK = YES
+TEMPLATE_RELATIONS = NO
+INCLUDE_GRAPH = YES
+INCLUDED_BY_GRAPH = YES
+CALL_GRAPH = YES
+CALLER_GRAPH = YES
+GRAPHICAL_HIERARCHY = YES
+DIRECTORY_GRAPH = YES
+DOT_IMAGE_FORMAT = png
+DOT_PATH =
+DOTFILE_DIRS =
+MAX_DOT_GRAPH_WIDTH = 1024
+MAX_DOT_GRAPH_HEIGHT = 1024
+MAX_DOT_GRAPH_DEPTH = 1000
+DOT_TRANSPARENT = NO
+DOT_MULTI_TARGETS = NO
+GENERATE_LEGEND = YES
+DOT_CLEANUP = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+SEARCHENGINE = NO
+INPUT= clflags.c clflags.h conditl.c conditl.h devnode.c devnode.h dictionary.c dictionary.h emit.c emit.h errhandler.c errhandler.h flowcontrol.c flowcontrol.h macros.c macros.h nextfcode.c nextfcode.h parselocals.c parselocals.h scanner.c scanner.h stack.c stack.h stream.c stream.h strsubvocab.c strsubvocab.h ticvocab.c ticvocab.h toke.c toke.h tokzesc.c tokzesc.h tracesyms.c tracesyms.h usersymbols.c usersymbols.h vocabfuncts.h
1
0
Author: stepan
Date: 2006-08-18 14:56:03 +0200 (Fri, 18 Aug 2006)
New Revision: 77
Added:
fcode-utils/Makefile
fcode-utils/shared/
fcode-utils/shared/classcodes.c
fcode-utils/shared/pcihdr.h
fcode-utils/shared/types.h
Log:
add shared files
Added: fcode-utils/Makefile
===================================================================
--- fcode-utils/Makefile (rev 0)
+++ fcode-utils/Makefile 2006-08-18 12:56:03 UTC (rev 77)
@@ -0,0 +1,47 @@
+#
+# OpenBIOS - free your system!
+# ( Utilities )
+#
+# This program is part of a free implementation of the IEEE 1275-1994
+# Standard for Boot (Initialization Configuration) Firmware.
+#
+# Copyright (C) 2006 coresystems GmbH <info(a)coresystems.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+#
+
+all:
+ make -C toke
+ make -C detok
+ make -C romheaders
+
+install:
+ make -C toke install
+ make -C detok install
+ make -C romheaders install
+
+clean:
+ make -C toke clean
+ make -C detok clean
+ make -C romheaders clean
+
+distclean: clean
+ make -C toke distclean
+ make -C detok distclean
+ make -C romheaders distclean
+
+
+
+.PHONY: all clean distclean toke detok romheaders
+
Added: fcode-utils/shared/classcodes.c
===================================================================
--- fcode-utils/shared/classcodes.c (rev 0)
+++ fcode-utils/shared/classcodes.c 2006-08-18 12:56:03 UTC (rev 77)
@@ -0,0 +1,415 @@
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Functions to correlate PCI Device Class-Codes and PCI Code Types
+ * with their printable names.
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+#include <stdlib.h>
+#include "types.h"
+
+/* **************************************************************************
+ *
+ * Functions Eported:
+ * pci_device_class_name
+ * Convert a numeric PCI Class Code to the Device Class Name
+ *
+ * pci_code_type_name
+ * Convert a numeric PCI Code Type to a printable Name
+ *
+ **************************************************************************** */
+
+const char *pci_device_class_name( u32 code);
+const char *pci_code_type_name(u8 code);
+
+
+typedef struct {
+ const u32 classcode;
+ const char *classname;
+} num_to_name_table ;
+
+
+/* **************************************************************************
+ *
+ * Function name: convert_num_to_name
+ * Synopsis: Find the Name, in the given table, for the given Number.
+ * Support function for Exported Functions.
+ *
+ * Inputs:
+ * Parameters:
+ * u32 num Number to look up
+ * num_to_name_table *table Pointer to Table to scan
+ * int max Maximum Index of Table
+ * char *not_found String to return if Number not in Table
+ *
+ * Outputs:
+ * Returned Value: Pointer to string giving the Name
+ *
+ * Error Detection:
+ * Unrecognized Number
+ * Return "not_found" string
+ *
+ * Process Explanation:
+ * Scan the Table for a match.
+ *
+ * Still to be done / Misc remarks:
+ * Had been considering a more sophisticated binary search,
+ * but the database is too small to merit the extra code.
+ * Stayed with the KISS principle...
+ *
+ *
+ **************************************************************************** */
+
+static const char *convert_num_to_name(u32 num,
+ num_to_name_table *table,
+ int max,
+ const char *not_found)
+{
+ int indx;
+ const char *retval;
+
+ retval = not_found;
+
+ for (indx = 0; indx < max ; indx++)
+ {
+ if ( num == table[indx].classcode )
+ {
+ retval = table[indx].classname ;
+ break ;
+ }
+ }
+ return ( retval );
+}
+
+
+/* **************************************************************************
+ *
+ *
+ * Structures:
+ * pci_code_type_name_table Constant Data Table that correlates
+ * PCI Code Types with their Names.
+ *
+ * pci_dev_class_name_table Constant Data Table that correlates
+ * Class Codes with their Class Names.
+ * This list of codes and names is current
+ * as of PCI Local Bus Specification
+ * Revision 3.0 dated February 3, 2004
+ *
+ **************************************************************************** */
+
+
+static const num_to_name_table pci_code_type_name_table[] = {
+ { 0 , "Intel x86" },
+ { 1 , "Open Firmware" },
+ { 2 , "HP PA Risc" },
+ { 3 , "Intel EFI (unofficial)" }
+};
+
+
+static const num_to_name_table pci_dev_class_name_table[] = {
+ { 0x000000 , "Legacy Device" },
+ { 0x000100 , "VGA-Compatible Device" },
+
+ { 0x010000 , "SCSI bus controller" },
+ /* { 0x0101xx , "IDE controller" }, */
+ { 0x010200 , "Floppy disk controller" },
+ { 0x010300 , "IPI bus controller" },
+ { 0x010400 , "RAID controller" },
+ { 0x010520 , "ATA controller, single stepping" },
+ { 0x010530 , "ATA controller, continuous" },
+ { 0x010600 , "Serial ATA controller - vendor specific interface" },
+ { 0x010601 , "Serial ATA controller - AHCI 1.0 interface" },
+ { 0x010700 , "Serial Attached SCSI controller" },
+ { 0x018000 , "Mass Storage controller" },
+
+ { 0x020000 , "Ethernet controller" },
+ { 0x020100 , "Token Ring controller" },
+ { 0x020200 , "FDDI controller" },
+ { 0x020300 , "ATM controller" },
+ { 0x020400 , "ISDN controller" },
+ { 0x020500 , "WorldFip controller" },
+ /* { 0x0206xx , "PICMG 2.14 Multi Computing" }, */
+ { 0x028000 , "Network controller" },
+
+ { 0x030000 , "VGA Display controller" },
+ { 0x030001 , "8514-compatible Display controller" },
+ { 0x030100 , "XGA Display controller" },
+ { 0x030200 , "3D Display controller" },
+ { 0x038000 , "Display controller" },
+
+ { 0x040000 , "Video device" },
+ { 0x040100 , "Audio device" },
+ { 0x040200 , "Computer Telephony device" },
+ { 0x048000 , "Multimedia device" },
+
+ { 0x050000 , "RAM memory controller" },
+ { 0x050100 , "Flash memory controller" },
+ { 0x058000 , "Memory controller" },
+
+ { 0x060000 , "Host bridge" },
+ { 0x060100 , "ISA bridge" },
+ { 0x060200 , "EISA bridge" },
+ { 0x060300 , "MCA bridge" },
+ { 0x060400 , "PCI-to-PCI bridge" },
+ { 0x060401 , "PCI-to-PCI bridge (subtractive decoding)" },
+ { 0x060500 , "PCMCIA bridge" },
+ { 0x060600 , "NuBus bridge" },
+ { 0x060700 , "CardBus bridge" },
+ /* { 0x0608xx , "RACEway bridge" }, */
+ { 0x060940 , "PCI-to-PCI bridge, Semi-transparent, primary facing Host" },
+ { 0x060980 , "PCI-to-PCI bridge, Semi-transparent, secondary facing Host" },
+ { 0x060A00 , "InfiniBand-to-PCI host bridge" },
+ { 0x068000 , "Bridge device" },
+
+ { 0x070000 , "Generic XT-compatible serial controller" },
+ { 0x070001 , "16450-compatible serial controller" },
+ { 0x070002 , "16550-compatible serial controller" },
+ { 0x070003 , "16650-compatible serial controller" },
+ { 0x070004 , "16750-compatible serial controller" },
+ { 0x070005 , "16850-compatible serial controller" },
+ { 0x070006 , "16950-compatible serial controller" },
+
+ { 0x070100 , "Parallel port" },
+ { 0x070101 , "Bi-directional parallel port" },
+ { 0x070102 , "ECP 1.X compliant parallel port" },
+ { 0x070103 , "IEEE1284 controller" },
+ { 0x0701FE , "IEEE1284 target device" },
+ { 0x070200 , "Multiport serial controller" },
+
+ { 0x070300 , "Generic modem" },
+ { 0x070301 , "Hayes 16450-compatible modem" },
+ { 0x070302 , "Hayes 16550-compatible modem" },
+ { 0x070303 , "Hayes 16650-compatible modem" },
+ { 0x070304 , "Hayes 16750-compatible modem" },
+ { 0x070400 , "GPIB (IEEE 488.1/2) controller" },
+ { 0x070500 , "Smart Card" },
+ { 0x078000 , "Communications device" },
+
+ { 0x080000 , "Generic 8259 PIC" },
+ { 0x080001 , "ISA PIC" },
+ { 0x080002 , "EISA PIC" },
+ { 0x080010 , "I/O APIC interrupt controller" },
+ { 0x080020 , "I/O(x) APIC interrupt controller" },
+
+ { 0x080100 , "Generic 8237 DMA controller" },
+ { 0x080101 , "ISA DMA controller" },
+ { 0x080102 , "EISA DMA controller" },
+
+ { 0x080200 , "Generic 8254 system timer" },
+ { 0x080201 , "ISA system timer" },
+ { 0x080202 , "EISA system timer-pair" },
+
+ { 0x080300 , "Generic RTC controller" },
+ { 0x080301 , "ISA RTC controller" },
+
+ { 0x080400 , "Generic PCI Hot-Plug controller" },
+ { 0x080500 , "SD Host controller" },
+ { 0x088000 , "System peripheral" },
+
+ { 0x090000 , "Keyboard controller" },
+ { 0x090100 , "Digitizer (pen)" },
+ { 0x090200 , "Mouse controller" },
+ { 0x090300 , "Scanner controller" },
+ { 0x090400 , "Generic Gameport controller" },
+ { 0x090410 , "Legacy Gameport controller" },
+ { 0x098000 , "Input controller" },
+
+ { 0x0a0000 , "Generic docking station" },
+ { 0x0a8000 , "Docking station" },
+
+ { 0x0b0000 , "386 Processor" },
+ { 0x0b0100 , "486 Processor" },
+ { 0x0b0200 , "Pentium Processor" },
+ { 0x0b1000 , "Alpha Processor" },
+ { 0x0b2000 , "PowerPC Processor" },
+ { 0x0b3000 , "MIPS Processor" },
+ { 0x0b4000 , "Co-processor" },
+
+ { 0x0c0000 , "IEEE 1394 (FireWire)" },
+ { 0x0c0010 , "IEEE 1394 -- OpenHCI spec" },
+ { 0x0c0100 , "ACCESS.bus" },
+ { 0x0c0200 , "SSA" },
+ { 0x0c0300 , "Universal Serial Bus (UHC spec)" },
+ { 0x0c0310 , "Universal Serial Bus (Open Host spec)" },
+ { 0x0c0320 , "USB2 Host controller (Intel Enhanced HCI spec)" },
+ { 0x0c0380 , "Universal Serial Bus (no PI spec)" },
+ { 0x0c03FE , "USB Target Device" },
+ { 0x0c0400 , "Fibre Channel" },
+ { 0x0c0500 , "System Management Bus" },
+ { 0x0c0600 , "InfiniBand" },
+ { 0x0c0700 , "IPMI SMIC Interface" },
+ { 0x0c0701 , "IPMI Kybd Controller Style Interface" },
+ { 0x0c0702 , "IPMI Block Transfer Interface" },
+ /* { 0x0c08xx , "SERCOS Interface" }, */
+ { 0x0c0900 , "CANbus" },
+
+ { 0x0d100 , "iRDA compatible controller" },
+ { 0x0d100 , "Consumer IR controller" },
+ { 0x0d100 , "RF controller" },
+ { 0x0d100 , "Bluetooth controller" },
+ { 0x0d100 , "Broadband controller" },
+ { 0x0d100 , "Ethernet (802.11a 5 GHz) controller" },
+ { 0x0d100 , "Ethernet (802.11b 2.4 GHz) controller" },
+ { 0x0d100 , "Wireless controller" },
+
+ /* { 0x0e00xx , "I2O Intelligent I/O, spec 1.0" }, */
+ { 0x0e0000 , "Message FIFO at offset 040h" },
+
+ { 0x0f0100 , "TV satellite comm. controller" },
+ { 0x0f0200 , "Audio satellite comm. controller" },
+ { 0x0f0300 , "Voice satellite comm. controller" },
+ { 0x0f0400 , "Data satellite comm. controller" },
+
+ { 0x100000 , "Network and computing en/decryption" },
+ { 0x101000 , "Entertainment en/decryption" },
+ { 0x108000 , "En/Decryption" },
+
+ { 0x110000 , "DPIO modules" },
+ { 0x110100 , "Perf. counters" },
+ { 0x111000 , "Comm. synch., time and freq. test" },
+ { 0x112000 , "Management card" },
+ { 0x118000 , "Data acq./Signal proc." },
+
+};
+
+
+/* **************************************************************************
+ *
+ * PCI Class Code name calculations are further complicated by the
+ * fact that there are some combinations of Base Class and
+ * Sub-Class for which no specific register-level programming
+ * interfaces are defined, or, in other words, for which all
+ * possible numeric values of Programming Interface codes
+ * (i.e., the low-byte) are valid.
+ *
+ * The following table lists the Base Class / Sub-Class pairs to
+ * accept without matching the Programming Interface, along
+ * with their names.
+ *
+ **************************************************************************** */
+
+
+static const num_to_name_table pci_all_prg_intfcs_table[] = {
+ { 0x0101 , "IDE controller" },
+ { 0x0206 , "PICMG 2.14 Multi Computing" },
+ { 0x0608 , "RACEway bridge" },
+ { 0x0c08 , "SERCOS Interface" },
+ { 0x0e00 , "I2O Intelligent I/O, spec 1.0" },
+};
+
+
+/* **************************************************************************
+ *
+ * Function name: pci_device_class_name
+ * Synopsis: Return the Device Class Name for the given Class Code
+ *
+ * Inputs:
+ * Parameters:
+ * u32 code Numeric PCI Class Code
+ *
+ * Outputs:
+ * Returned Value: Pointer to string giving the Device Class Name
+ *
+ * Error Detection:
+ * Unrecognized Class Code
+ * String returned is "unknown"
+ *
+ * Process Explanation:
+ * Scan the pci_dev_class_name_table for a match.
+ * If one is not found there, drop the low (Programming Interface)
+ * byte of the code and scan the pci_all_prg_intfcs_table
+ * for a match that way
+ * If you didn't find one there, you've exhausted your options...
+ *
+ **************************************************************************** */
+
+const char *pci_device_class_name( u32 code)
+{
+ const int pdc_max_indx =
+ sizeof(pci_dev_class_name_table)/sizeof(num_to_name_table) ;
+ const char *result ;
+
+ result = convert_num_to_name(
+ code,
+ (num_to_name_table *)pci_dev_class_name_table,
+ pdc_max_indx,
+ NULL);
+
+ if ( result == NULL)
+ {
+ const int pallpi_max_indx =
+ sizeof(pci_all_prg_intfcs_table)/sizeof(num_to_name_table) ;
+
+ result = convert_num_to_name(
+ code>>8,
+ (num_to_name_table *)pci_all_prg_intfcs_table,
+ pallpi_max_indx,
+ "unknown");
+ }
+ return ( result );
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: pci_code_type_name
+ * Synopsis: Return a printable Name for the given PCI Code Type
+ *
+ * Inputs:
+ * Parameters:
+ * u8 code Numeric PCI Code Type
+ *
+ * Outputs:
+ * Returned Value: Pointer to string giving printable Name
+ *
+ * Error Detection:
+ * Unrecognized PCI Code Type
+ * String returned is "unknown as of PCI specs 2.2"
+ *
+ * Process Explanation:
+ * Scan the pci_code_type_name_table for a match.
+ *
+ *
+ **************************************************************************** */
+
+const char *pci_code_type_name(u8 code)
+{
+ const int pct_max_indx =
+ sizeof(pci_code_type_name_table)/sizeof(num_to_name_table) ;
+ const char *result ;
+
+ result = convert_num_to_name(
+ (u32)code,
+ (num_to_name_table *)pci_code_type_name_table,
+ pct_max_indx,
+ "unknown as of PCI specs 2.2");
+ return ( result );
+}
+
Added: fcode-utils/shared/pcihdr.h
===================================================================
--- fcode-utils/shared/pcihdr.h (rev 0)
+++ fcode-utils/shared/pcihdr.h 2006-08-18 12:56:03 UTC (rev 77)
@@ -0,0 +1,176 @@
+#ifndef _PCIHDR_H
+#define _PCIHDR_H
+/*
+ * OpenBIOS - free your system!
+ * ( PCI headers )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ * Copyright (C) 2006 coresystems GmbH <info(a)coresystems.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * PCI Header and PCI Data Structures, as defined in
+ * PCI FIRMWARE SPECIFICATION, REV. 3.
+ * taken from openbios/utils/romheaders/romheaders.c
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ *
+ **************************************************************************** */
+
+
+/* **************************************************************************
+ *
+ * Structures:
+ * rom_header_t Type definition for a PCI ROM Header
+ * pci_data_t Type definition for a PCI Data Header
+ *
+ *
+ * Macros:
+ * PCI_DATA_HDR Construct the PCI Data Header signature
+ * as an integer. Use this to create
+ * a constant, in order to allow its
+ * value to be calculated at compile-
+ * -time rather than at run-time.
+ * BIG_ENDIAN_WORD_FETCH Fetch a big-endian word from 2
+ * unsigned chars in sequence.
+ * LITTLE_ENDIAN_WORD_FETCH ...... little-endian word from 2 ....
+ * BIG_ENDIAN_LONG_FETCH ...... big-endian long from 4 ...
+ * LITTLE_ENDIAN_LONG_FETCH ...... little-endian long from 4 ....
+ * LITTLE_ENDIAN_TRIPLET_FETCH ...... little-endian triplet from 3 ...
+ * CLASS_CODE_FETCH Special fetch for Class-Code triplet
+ * BIG_ENDIAN_WORD_STORE Store an integer into 2 unsigned
+ * chars in big-endian sequence
+ * LITTLE_ENDIAN_WORD_STORE ..... into 2 ... little-endian ...
+ * BIG_ENDIAN_LONG_STORE ..... into 4 ... big-endian ...
+ * LITTLE_ENDIAN_LONG_STORE ..... into 4 ... little-endian ...
+ * LITTLE_ENDIAN_TRIPLET_STORE ..... 3 ... little-endian triplet ...
+ * CLASS_CODE_STORE Special store for Class-Code triplet
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Still to be done:
+ * The "Endian" macros are beginning to appear to be more
+ * generally useful that previously thought, and should,
+ * perhaps, be moved into types.h
+ *
+ **************************************************************************** */
+
+#include "types.h"
+/* Construct the PCI Data Header signature as an integer */
+#define PCI_DATA_HDR (u32) ( ('P' << 24) | ('C' << 16) | ('I' << 8) | 'R' )
+
+#ifndef bswap_16
+#define bswap_16(x) \
+ ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))
+#endif
+
+#define little_word(x) bswap_16(x)
+
+/* These are mnemonics for the programmer. The compiler doesn't care... */
+#define le_u16(x) u8 x[2]
+#define be_u16(x) u8 x[2]
+#define le_u32(x) u8 x[4]
+#define be_u32(x) u8 x[4]
+
+/* Fetch a big-endian word from 2 unsigned chars in sequence */
+#define BIG_ENDIAN_WORD_FETCH(x) (u16)( (x[0] << 8) | x[1] )
+
+/* Fetch a little-endian word from 2 unsigned chars in sequence */
+#define LITTLE_ENDIAN_WORD_FETCH(x) (u16)( (x[1] << 8) | x[0] )
+
+/* Fetch a big-endian long from 4 unsigned chars in sequence */
+#define BIG_ENDIAN_LONG_FETCH(x) (u32)( (x[0] << 24) | (x[1] << 16) | (x[2] << 8) | x[3] )
+
+/* Fetch a little-endian long from 4 unsigned chars in sequence */
+#define LITTLE_ENDIAN_LONG_FETCH(x) (u32)( (x[3] << 24) | (x[2] << 16) | (x[1] << 8) | x[0] )
+
+#define LE_U24(x) u8 x[3]
+/* Fetch a little-endian triplet from 3 unsigned chars in sequence */
+#define LITTLE_ENDIAN_TRIPLET_FETCH(x) (u32)( (x[2] << 16) | (x[1] << 8) | x[0] )
+
+
+/* Special case for Class-Code triplet: lo, mid, hi */
+#define class_code_u24(x) u8 x[3]
+/* Special fetch for Class-Code triplet */
+#define CLASS_CODE_FETCH(x) (u32)( (x[2] << 16) | (x[1] << 8) | x[0] )
+/* Special store for Class-Code triplet */
+#define CLASS_CODE_STORE(dest,x) \
+ dest[2] = (u8)( x >> 16); dest[1] = (u8)(x >> 8); dest[0] = (u8)x;
+ /* NOTE Class-Code triplet is the same as little-endian triplet */
+ /* Change over some time, eh? */
+
+/* Store an integer into 2 unsigned chars in big-endian sequence */
+#define BIG_ENDIAN_WORD_STORE(dest,x) dest[0] = (u8)(x >> 8); dest[1]=(u8)x;
+
+/* Store an integer into 2 unsigned chars in little-endian sequence */
+#define LITTLE_ENDIAN_WORD_STORE(dest,x) dest[1] = (u8)(x >> 8); dest[0]=(u8)x;
+
+/* Store an integer into 4 unsigned chars in big-endian sequence */
+#define BIG_ENDIAN_LONG_STORE(dest,x) \
+ dest[0] = (u8)(x >> 24); dest[1] =(u8)( x >> 16); \
+ dest[2] = (u8)(x >> 8); dest[3] =(u8)x;
+
+/* Store an integer into 4 unsigned chars in little-endian sequence */
+#define LITTLE_ENDIAN_LONG_STORE(dest,x) \
+ dest[3] = (u8)(x >> 24); dest[2] =(u8)( x >> 16); \
+ dest[1] = (u8)(x >> 8); dest[0] =(u8)x;
+
+/* Store an integer into 3 unsigned chars in little-endian triplet sequence */
+#define LITTLE_ENDIAN_TRIPLET_STORE(dest,x) \
+ dest[2] = (u8)( x >> 16); dest[1] = (u8)(x >> 8); dest[0] = (u8)x;
+
+
+typedef struct {
+ be_u16(signature);
+ u8 reserved[0x16];
+ le_u16(data_ptr);
+ le_u16(padd);
+} rom_header_t;
+
+
+typedef struct {
+ be_u32 (signature);
+ le_u16 (vendor);
+ le_u16 (device);
+ le_u16 (vpd);
+ le_u16 (dlen);
+ u8 drevision;
+ class_code_u24 (class_code);
+ le_u16 (ilen);
+ le_u16 (irevision);
+ u8 code_type;
+ u8 last_image_flag;
+ u16 reserved_2;
+} pci_data_t;
+
+#define PCI_DATA_STRUCT_REV 0
+
+/* Prototypes for functions exported from devsupp/pci/classcodes.c */
+char *pci_device_class_name( u32 code);
+char *pci_code_type_name(u8 code);
+
+
+
+#endif /* _PCIHDR_H */
Added: fcode-utils/shared/types.h
===================================================================
--- fcode-utils/shared/types.h (rev 0)
+++ fcode-utils/shared/types.h 2006-08-18 12:56:03 UTC (rev 77)
@@ -0,0 +1,97 @@
+#ifndef _OPENBIOS_TYPES_H
+#define _OPENBIOS_TYPES_H
+
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Convert system short-name data-types found in asm/types.h
+ * to OpenBios-style names. (Mainly, remove the leading
+ * double-Underbar).
+ *
+ * Also, define a very useful "bool" type for logical operations,
+ * and maybe a macro (or several) to go with it...
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+
+#include <asm/types.h>
+
+typedef __s8 s8;
+typedef __u8 u8;
+
+typedef __s16 s16;
+typedef __u16 u16;
+
+typedef __s32 s32;
+typedef __u32 u32;
+
+#ifdef FALSE /* Hack for AIX. */
+#undef FALSE
+#undef TRUE
+#endif /* Hack for AIX. */
+
+typedef enum boolean { FALSE = 0 , TRUE = -1 } bool ;
+
+
+/* **************************************************************************
+ * Macro Name: BOOLVAL
+ * Convert the supplied variable or expression to
+ * a formal boolean.
+ * Argument:
+ * x (bool) Variable or expression, operand.
+ *
+ **************************************************************************** */
+
+#define BOOLVAL(x) (x ? TRUE : FALSE)
+
+
+/* **************************************************************************
+ * Macro Name: INVERSE
+ * Return the logical inversion of the
+ * supplied boolean variable or expression.
+ * Argument:
+ * x (bool) Variable or expression, operand.
+ *
+ **************************************************************************** */
+
+#define INVERSE(x) (x ? FALSE : TRUE)
+
+
+/* **************************************************************************
+*
+ * Some hacks stuck in for systems w/ incomplete includes
+ * or libraries or whatever.
+ *
+ **************************************************************************** */
+
+#ifndef _PTR
+#define _PTR void *
+#endif
+
+#endif /* _OPENBIOS_TYPES_H */
1
0
Author: stepan
Date: 2006-08-18 14:47:12 +0200 (Fri, 18 Aug 2006)
New Revision: 76
Added:
fcode-utils/detok/addfcodes.c
fcode-utils/detok/addfcodes.h
fcode-utils/detok/pcihdr.c
fcode-utils/detok/printformats.c
fcode-utils/toke/clflags.c
fcode-utils/toke/clflags.h
fcode-utils/toke/conditl.c
fcode-utils/toke/conditl.h
fcode-utils/toke/devnode.c
fcode-utils/toke/devnode.h
fcode-utils/toke/errhandler.c
fcode-utils/toke/errhandler.h
fcode-utils/toke/flowcontrol.c
fcode-utils/toke/flowcontrol.h
fcode-utils/toke/macros.h
fcode-utils/toke/nextfcode.c
fcode-utils/toke/nextfcode.h
fcode-utils/toke/parselocals.c
fcode-utils/toke/parselocals.h
fcode-utils/toke/scanner.h
fcode-utils/toke/strsubvocab.c
fcode-utils/toke/strsubvocab.h
fcode-utils/toke/ticvocab.c
fcode-utils/toke/ticvocab.h
fcode-utils/toke/tokzesc.c
fcode-utils/toke/tokzesc.h
fcode-utils/toke/tracesyms.c
fcode-utils/toke/tracesyms.h
fcode-utils/toke/usersymbols.c
fcode-utils/toke/usersymbols.h
fcode-utils/toke/vocabfuncts.h
Removed:
fcode-utils/detok/Rules.make
fcode-utils/toke/Rules.make
Modified:
fcode-utils/detok/Makefile
fcode-utils/detok/decode.c
fcode-utils/detok/detok.c
fcode-utils/detok/detok.h
fcode-utils/detok/dictionary.c
fcode-utils/detok/stream.c
fcode-utils/detok/stream.h
fcode-utils/romheaders/Makefile
fcode-utils/romheaders/romheaders.c
fcode-utils/toke/Makefile
fcode-utils/toke/dictionary.c
fcode-utils/toke/dictionary.h
fcode-utils/toke/emit.c
fcode-utils/toke/emit.h
fcode-utils/toke/macros.c
fcode-utils/toke/scanner.c
fcode-utils/toke/stack.c
fcode-utils/toke/stack.h
fcode-utils/toke/stream.c
fcode-utils/toke/stream.h
fcode-utils/toke/toke.c
fcode-utils/toke/toke.h
Log:
initial merge of David Paktor's fine work.
I redid all of the Makefiles and fixed some minor
issues with the code.
Modified: fcode-utils/detok/Makefile
===================================================================
--- fcode-utils/detok/Makefile 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/detok/Makefile 2006-08-18 12:47:12 UTC (rev 76)
@@ -1,11 +1,12 @@
#
-# OpenBIOS - free your system!
-# ( detokenizer )
-#
-# This program is part of a free implementation of the IEEE 1275-1994
+# OpenBIOS - free your system!
+# ( Utilities )
+#
+# This program is part of a free implementation of the IEEE 1275-1994
# Standard for Boot (Initialization Configuration) Firmware.
#
-# Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+# Copyright (C) 2001-2006 Stefan Reinauer <stepan(a)openbios.org>
+# Copyright (C) 2006 coresystems GmbH <info(a)coresystems.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,48 +22,37 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
#
-ARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/x86_64/amd64/ -e "s/Power Macintosh/ppc/")
-TOPDIR := $(shell /bin/pwd)
-BUILDDIR ?= $(TOPDIR)/obj-$(ARCH)
+PROGRAM = detok
-VPATH := $(BUILDDIR)
+CC = gcc
+STRIP = strip
+INCLUDES = -I../shared
+#CFLAGS = -O2 -g -Wall
+CFLAGS = -Os -Wall -Wno-pointer-sign
+LDFLAGS =
+OBJS = addfcodes.o decode.o detok.o dictionary.o pcihdr.o printformats.o \
+ stream.o ../shared/classcodes.o
-include $(TOPDIR)/Rules.make
+all: .dependencies $(PROGRAM)
+$(PROGRAM): $(OBJS)
+ $(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS)
+ $(STRIP) -s $(PROGRAM)
-CC = gcc
-CFLAGS = -O2 -Wall -ansi
+clean:
+ rm -f $(OBJS) *~
-# For debugging the indentation code of detok, define DEBUG_INDENT
-#CFLAGS := $(CFLAGS) -DDEBUG_INDENT
+distclean: clean
+ rm -f $(PROGRAM) .dependencies
+
+.dependencies: *.c
+ @$(CC) $(CFLAGS) $(INCLUDES) -MM *.c > .dependencies
-all: main detok
- @echo -e "\nOpenBIOS detokenizer detok build finished\n"
+.PHONY: all clean distclean
-main:
- @echo -e "\nWelcome to the OpenBIOS detokenizer.."
- @test -r $(BUILDDIR) || ( mkdir -p $(BUILDDIR); \
- echo -e "\nCreating build directory $(BUILDDIR)" )
-
-detok: detok.o dictionary.o decode.o stream.o
- @echo -en "\nLinking fcode detokenizer detok..."
- @cd $(BUILDDIR) && ( $(CC) $(CFLAGS) $^ -o $@; strip detok )
- @echo -e "\tok"
-
-clean:
- @test ! -d $(BUILDDIR) && \
- echo "Architecture $(ARCH) is already clean." || \
- ( \
- echo "Cleaning up architecture $(ARCH)"; \
- rm -rf $(BUILDDIR) \
- rm forth.dict.core \
- )
+-include .dependencies
-distclean: clean
- rm -f detok
+.c.o:
+ $(CC) -c $(CFLAGS) $(INCLUDES) $< -o $@
-detok.o: detok.h stream.h detok.c
-stream.o: detok.h stream.c
-decode.o: detok.h stream.h decode.c Makefile
-dictionary.o: detok.h dictionary.c
Deleted: fcode-utils/detok/Rules.make
===================================================================
--- fcode-utils/detok/Rules.make 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/detok/Rules.make 2006-08-18 12:47:12 UTC (rev 76)
@@ -1,17 +0,0 @@
-# tag: Makefile rules
-
-VPATH := $(VPATH):.
-
-.S.o:
- echo -n " assembling $<... "
- $(CC) -c -nostdlib $(INCLUDES) $(CFLAGS) $< -o $(BUILDDIR)/$@ && \
- echo -e " \t\tok" || \
- echo -e " \t\tfailed"
-
-.c.o:
- @echo -n " compiling $<... "
- @$(CC) -c $(CFLAGS) $(INCLUDES) $< -o $(BUILDDIR)/$@ && \
- echo -e " \t\tok" || \
- echo -e " \t\failed"
-
-
Added: fcode-utils/detok/addfcodes.c
===================================================================
--- fcode-utils/detok/addfcodes.c (rev 0)
+++ fcode-utils/detok/addfcodes.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,343 @@
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Function(s) for entering Vendor-Specific FCodes to detokenizer.
+ *
+ * (C) Copyright 2006 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Functions Exported:
+ * add_fcodes_from_list Add Vendor-Specific FCodes from
+ * the file whose name is supplied.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Revision History:
+ * Tue, 25 Apr 2006 by David L. Paktor
+ * Identified this need when working with in-house code,
+ * which uses some custom functions. This solution
+ * is (hoped to be) general enough to cover all cases.
+ *
+ **************************************************************************** */
+
+
+/* **************************************************************************
+ *
+ * Global Variables Imported
+ * indata Buffer into which the file will be read
+ * stream_max Size of the file buffer.
+ *
+ **************************************************************************** */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "detok.h"
+#include "stream.h"
+#include "addfcodes.h"
+
+/* **************************************************************************
+ *
+ * Internal Static Variables
+ * current_vfc_line Line to be scanned in Vendor-FCodes buffer
+ * vfc_remainder Remainder of Vendor-FCodes buffer to be scanned
+ * vfc_line_no Number of current line in Vendor-FCodes buffer
+ * vfc_buf_end Pointer to end of Vendor-FCodes buffer
+ *
+ **************************************************************************** */
+
+static char *current_vfc_line;
+static char *vfc_remainder;
+static int vfc_line_no = 0;
+static char *vfc_buf_end;
+
+/* **************************************************************************
+ *
+ * Function name: skip_whitespace
+ * Synopsis: Advance the given string-pointer past blanks and tabs.
+ * (String is presumed to end before new-line)
+ *
+ * Inputs:
+ * Parameters:
+ * string_line_ptr Address of pointer to string
+ *
+ * Outputs:
+ * Returned Value: None
+ * *string_line_ptr Advanced past blanks and tabs
+ *
+ **************************************************************************** */
+
+static void skip_whitespace( char **string_line_ptr)
+{
+ char *cur_char_ptr = *string_line_ptr;
+ for ( ; *cur_char_ptr != 0 ; cur_char_ptr++ )
+ {
+ if ( (*cur_char_ptr != '\t') && (*cur_char_ptr != ' ') )
+ {
+ *string_line_ptr = cur_char_ptr;
+ break;
+ }
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: get_next_vfc_line
+ * Synopsis: Advance to the next vfc_line to be processed.
+ * Skip blanks and comments. Indicate when end reached.
+ *
+ * Inputs:
+ * Parameters: None
+ * Local Static Variables:
+ * vfc_remainder
+ * vfc_buf_end
+ *
+ * Outputs:
+ * Returned Value: FALSE if reached end of buffer
+ * Local Static Variables:
+ * current_vfc_line Advanced to next line to be scanned
+ * vfc_line_no Kept in sync with line number in file
+ *
+ * Process Explanation:
+ * Comments begin with a pound-sign ('#') or a backslash ('\')
+ * Comment-lines or blank or empty lines will be skipped.
+ *
+ **************************************************************************** */
+
+static bool get_next_vfc_line( void )
+{
+ bool retval = FALSE; /* TRUE = not at end yet */
+ while ( vfc_remainder < vfc_buf_end )
+ {
+ current_vfc_line = vfc_remainder;
+ vfc_remainder = strchr( current_vfc_line, '\n');
+ *vfc_remainder = 0;
+ vfc_remainder++;
+ vfc_line_no++;
+ skip_whitespace( ¤t_vfc_line);
+ if ( *current_vfc_line == 0 ) continue; /* Blank line */
+ if ( *current_vfc_line == '#' ) continue; /* Comment */
+ if ( *current_vfc_line == '\\' ) continue; /* Comment */
+ retval = TRUE;
+ break; /* Found something */
+ }
+ return( retval);
+}
+
+/* **************************************************************************
+ *
+ * Function name: vfc_splash
+ * Synopsis: Print a "splash" message to show that we
+ * are processing Vendor-Specific FCodes,
+ * but only once.
+ *
+ * Inputs:
+ * Parameters:
+ * vf_file_name Vendor-Specific FCodes file name
+ * Local Static Variables:
+ * did_not_splash Control printing; once only.
+ *
+ * Outputs:
+ * Returned Value: None
+ * Local Static Variables:
+ * did_not_splash FALSE after first call.
+ * Printout:
+ * "Splash" message...
+ *
+ **************************************************************************** */
+static bool did_not_splash = TRUE;
+static void vfc_splash( char *vf_file_name)
+{
+ if ( did_not_splash )
+ {
+ /* Temporary substring buffer */
+ /* Guarantee that the malloc will be big enough. */
+ char *strbfr = malloc( strlen( vf_file_name) +65 ) ;
+ sprintf( strbfr,
+ "Reading additional FCodes from file: %s\n",
+ vf_file_name);
+ printremark( strbfr);
+ free( strbfr);
+ did_not_splash = FALSE;
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: add_fcodes_from_list
+ * Synopsis: Add Vendor-Specific FCodes from the named file
+ * to the permanent resident dictionary.
+ *
+ * Inputs:
+ * Parameters:
+ * vf_file_name Vendor-Specific FCodes file name
+ * Global Variables:
+ * verbose "Verbose" flag.
+ * indata Start of file buffer
+ * stream_max Size of the file buffer.
+ *
+ * Outputs:
+ * Returned Value: TRUE if FCodes have actually been added
+ * Global Variables:
+ * check_tok_seq Cleared to FALSE, then restored to TRUE
+ * Local Static Variables:
+ * vfc_remainder Initted to start of file buffer
+ * vfc_buf_end Initted to end of file buffer
+ * Memory Allocated
+ * Permanent copy of FCode Name
+ * When Freed?
+ * Never. Rmeains until program termination.
+ * Printout:
+ * If verbose, "Splash" line and count of added entries.
+ *
+ * Error Detection:
+ * Fail to open or read Vendor-FCodes file -- Exit program
+ * Improperly formatted input line -- print message and ignore
+ * FCode value out of valid range -- print message and ignore
+ * FCode value already in use -- print message and ignore
+ *
+ * Process Explanation:
+ * Valid lines are formatted with the FCode number first
+ * and the name after, one entry per line. Extra text
+ * after the name will be ignored, so an extra "comment"
+ * is permitted. The FCode number must be in hex, with
+ * an optional leading 0x or 0X For example: 0X407
+ * The valid range is 0x010 to 0x7ff. Numbers above 0x800
+ * infringe upon the are reserved for FCodes generated
+ * by the tokenization process.
+ * Numbers already in use will be ignored. A Message will be
+ * printed even if the name matches the one on the line.
+ *
+ **************************************************************************** */
+
+bool add_fcodes_from_list( char *vf_file_name)
+{
+ bool retval = FALSE;
+ int added_fc_count = 0;
+ check_tok_seq = FALSE;
+
+ if ( verbose ) vfc_splash( vf_file_name);
+
+ if ( init_stream( vf_file_name) != 0 )
+ {
+ char *strbfr = malloc( strlen( vf_file_name) +65 );
+ sprintf( strbfr,
+ "Could not open Additional FCodes file: %s\n",
+ vf_file_name);
+ printremark( strbfr);
+ free( strbfr);
+ exit(1);
+ }
+ vfc_remainder = indata;
+ vfc_buf_end = indata + stream_max -1;
+
+ while ( get_next_vfc_line() )
+ {
+ char vs_fc_name[36];
+ int vs_fc_number;
+ int scan_result;
+ char *lookup_result;
+ char *fc_name_cpy;
+
+ scan_result = sscanf( current_vfc_line, "0x%x %32s",
+ &vs_fc_number, vs_fc_name);
+
+ if ( scan_result != 2 ) /* Allow a capital 0X */
+ {
+ scan_result = sscanf( current_vfc_line, "0X%x %32s",
+ &vs_fc_number, vs_fc_name);
+ }
+ if ( scan_result != 2 ) /* Try it without the 0x */
+ {
+ scan_result = sscanf( current_vfc_line, "%x %32s",
+ &vs_fc_number, vs_fc_name);
+ }
+
+ if ( scan_result != 2 ) /* That's it... */
+ {
+ char *strbfr = malloc( strlen( current_vfc_line) +65 );
+ vfc_splash( vf_file_name);
+ sprintf( strbfr,
+ "Line #%d, invalid format. Ignoring: %s\n",
+ vfc_line_no, current_vfc_line);
+ printremark( strbfr);
+ free( strbfr);
+ continue;
+ }
+
+ if ( ( vs_fc_number < 0x10 ) || ( vs_fc_number > 0x7ff ) )
+ {
+ char *strbfr = malloc( 85 );
+ vfc_splash( vf_file_name);
+ sprintf( strbfr,
+ "Line #%d, FCode number out of range: 0x%x Ignoring.\n",
+ vfc_line_no, vs_fc_number);
+ printremark( strbfr);
+ free( strbfr);
+ continue;
+ }
+
+ lookup_result = lookup_token( (u16)vs_fc_number);
+ if ( strcmp( lookup_result, "ferror") != 0 )
+ {
+ char *strbfr = malloc( strlen( lookup_result) + 85 );
+ vfc_splash( vf_file_name);
+ sprintf( strbfr,
+ "Line #%d. FCode number 0x%x is already "
+ "defined as %s Ignoring.\n",
+ vfc_line_no, vs_fc_number, lookup_result);
+ printremark( strbfr);
+ free( strbfr);
+ continue;
+ }
+
+ /* We've passed all the tests! */
+ fc_name_cpy = strdup( vs_fc_name);
+ add_token( (u16)vs_fc_number, fc_name_cpy);
+ added_fc_count++;
+ retval = TRUE;
+ }
+
+ if ( verbose )
+ {
+ char *strbfr = malloc( 85 );
+ sprintf( strbfr,
+ "Added %d FCode numbers\n", added_fc_count);
+ printremark( strbfr);
+ free( strbfr);
+ }
+
+ close_stream();
+ check_tok_seq = TRUE;
+ return( retval);
+}
Added: fcode-utils/detok/addfcodes.h
===================================================================
--- fcode-utils/detok/addfcodes.h (rev 0)
+++ fcode-utils/detok/addfcodes.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,48 @@
+#ifndef _DETOK_VSFCODES_H
+#define _DETOK_VSFCODES_H
+
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Header for function for entering Vendor-Specific FCodes
+ * to detokenizer.
+ *
+ * (C) Copyright 2006 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+#include "types.h"
+
+/* ************************************************************************** *
+ *
+ * Function Prototypes / Functions Exported:
+ *
+ **************************************************************************** */
+
+bool add_fcodes_from_list( char *vf_file_name);
+
+#endif /* _DETOK_VSFCODES_H */
Modified: fcode-utils/detok/decode.c
===================================================================
--- fcode-utils/detok/decode.c 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/detok/decode.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -24,96 +24,322 @@
*
*/
+/* **************************************************************************
+ * Modifications made in 2005 by IBM Corporation
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Modifications Author: David L. Paktor dlpaktor(a)us.ibm.com
+ **************************************************************************** */
+
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <ctype.h>
+#include <setjmp.h>
#include "detok.h"
#include "stream.h"
-/* Dictionary function prototypes */
-char *lookup_token(u16 number);
-int add_token(u16 number, char *name);
+static int indent; /* Current level of indentation */
-extern u16 fcode;
+/* **************************************************************************
+ *
+ * Still to be done:
+ * Handling of indent-level is not correct. Branches should
+ * balance with their resolvers; constructs like do..loop
+ * case/of/endof/endcase are a few major examples.
+ * This will be tricky; the rules need to be carefully thought
+ * out, and the implementation might be more complex than
+ * at first meets the eye...
+ *
+ **************************************************************************** */
+static bool ended_okay = TRUE; /* FALSE if finished prematurely */
+
bool offs16=TRUE;
-int indent, verbose=0, decode_all=0, linenumbers=0, linenum;
-u32 fclen;
+unsigned int linenum;
+bool end_found=FALSE;
+unsigned int token_streampos; /* Streampos() of currently-gotten token */
+u16 last_defined_token = 0;
-static u8 *unnamed=(u8 *)"(unnamed-fcode)";
+jmp_buf eof_exception;
-void pretty_string(u8 *string)
+static int fclen;
+static const char *unnamed = "(unnamed-fcode)" ;
+
+static void decode_indent(void)
{
- u8 c;
- unsigned int i;
- bool qopen=TRUE;
+ int i;
+ if (indent<0) {
+#ifdef DEBUG_INDENT
+ printf("detok: error in indentation code.\n");
+#endif
+ indent=0;
+ }
+ for (i=0; i<indent; i++)
+ printf (" ");
+}
+/* Print forth string ( [len] char[0] ... char[len] ) */
+static void pretty_print_string(void)
+{
+ u8 len;
+ u8 *strptr;
+ int indx;
+ bool in_parens = FALSE ; /* Are we already inside parentheses? */
+
+ strptr = get_string( &len );
+
+ printf("( len=%s%x", len >= 10 ? "0x":"", len);
+ if ( len >= 10 ) printf(" [%d bytes]", len);
+ printf(" )\n");
+ if (show_linenumbers) printf(" ");
+ decode_indent();
printf("\" ");
- for (i=1; i<1+(unsigned int)string[0]; i++) {
- c=string[i];
+ for ( indx = 0; indx < len; indx++ )
+ {
+ u8 c = *strptr++;
if (isprint(c)) {
- if (!qopen) {
+ if ( in_parens )
+ {
printf(" )");
- qopen=TRUE;
+ in_parens = FALSE;
}
printf("%c",c);
+ /* Quote-mark must escape itself */
+ if ( c == '"' ) printf("%c",c);
} else {
- if (qopen) {
+ if ( !in_parens )
+ {
printf("\"(");
- qopen=FALSE;
+ in_parens = TRUE;
}
printf(" %02x",c);
}
}
- if (!qopen)
+ if ( in_parens )
printf(" )");
printf("\"");
}
-static void decode_indent(void)
+static void decode_lines(void)
{
- int i;
-#ifdef DEBUG_INDENT
- if (indent<0) {
- printf("detok: error in indentation code.\n");
- indent=0;
+ if (show_linenumbers) {
+ printf("%6d: ",show_offsets ? token_streampos : linenum++);
}
-#endif
- for (i=0; i<indent; i++)
- printf (" ");
}
-static void decode_lines(void)
+/* **************************************************************************
+ *
+ * Function name: output_token_name
+ * Synopsis: Print the name of the token just retrieved
+ * along with any interesting related information...
+ *
+ * Inputs:
+ * Global/Static Variables:
+ * fcode The token # just retrieved
+ * last_defined_token Used to screen invalid tokens.
+ * token_streampos Location of token just retrieved
+ * Global/Static Constants:
+ * unnamed Namefield of headerless token
+ *
+ * Outputs:
+ * Printout:
+ * Print the function name (if known) and the FCode number,
+ * if interesting.
+ * The fcode number is interesting if either
+ * a) the token has no name
+ * or
+ * b) verbose mode is in effect.
+ * If the token is named, show its FCode number in
+ * the syntax of a FORTH Comment, otherwise, its
+ * FCode number -- in [brackets] -- acts as its name.
+ *
+ * Error Detection:
+ * If the token # is larger than the last defined token, it is
+ * probably an artifact of an error that was allowed in the
+ * tokenization; if it were treated normally, it would lead
+ * to a cascade of failures. Print a message, skip the first
+ * byte, and return.
+ *
+ * Revision History:
+ * Refactored. The line number or offset (if selected) and the
+ * indent are printed in the output_token() routine, which
+ * calls this one.
+ * Add Error Detection
+ *
+ *
+ **************************************************************************** */
+
+static void output_token_name(void)
{
- if (linenumbers) {
- printf("%6d: ",linenumbers==1?linenum:get_streampos());
- linenum++;
+ char *tname;
+
+ /* Run error detection only if last_defined_token was assigned */
+ if ( (fcode > last_defined_token) && (last_defined_token > 0) )
+ {
+ char temp_buf[80];
+ int buf_pos;
+ u8 top_byte = fcode >> 8;
+ printf ("Invalid token: [0x%03x]\n", fcode);
+ sprintf(temp_buf, "Backing up over first byte, which is ");
+ buf_pos = strlen(temp_buf);
+ if ( top_byte < 10 )
+ {
+ sprintf(&temp_buf[buf_pos], " %02x", top_byte);
+ }else{
+ sprintf( &temp_buf[buf_pos], "0x%02x ( =dec %d)",
+ top_byte, top_byte);
}
+ printremark(temp_buf);
+ set_streampos(token_streampos+1);
+ return;
}
-static void output_token(void)
-{
- u8 *tname=lookup_token(fcode);
+ tname = lookup_token(fcode);
printf ("%s ", tname);
- /* The fcode number is interesting if
- * a) detok is in verbose mode
- * b) the token has no name.
+ /* The fcode number is interesting
+ * if either
+ * a) the token has no name
+ * or
+ * b) detok is in verbose mode.
*/
- if (verbose || tname == unnamed)
+ if ( tname == unnamed )
+ {
printf("[0x%03x] ", fcode);
+ } else {
+ if ( verbose )
+ {
+ /* If the token is named,
+ * show its fcode number in
+ * the syntax of a FORTH Comment
+ */
+ printf("( 0x%03x ) ", fcode);
+ }
+ }
}
+/* **************************************************************************
+ *
+ * Function name: output_token
+ * Synopsis: Print the full line for the token just retrieved:
+ * line number, indentation and name.
+ *
+ * Revision History:
+ * Updated Mon, 11 Jul 2005 by David L. Paktor
+ * Separate out output_token_name() for specific uses.
+ * Incorporate calls to decode_lines() and decode_indent()
+ * to allow better control of indentation.
+ *
+ **************************************************************************** */
+
+static void output_token(void)
+{
+ decode_lines();
+ decode_indent();
+ output_token_name();
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: decode_offset
+ * Synopsis: Gather and display an FCode-offset associated with
+ * a branch or suchlike function.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global/Static Variables:
+ * show_offsets Whether to show offsets in full detail
+ * offs16 Whether 16- (or 8-) -bit offsets
+ * stream_max Maximum valid destimation
+ * Local Static Variables:
+ *
+ * Outputs:
+ * Returned Value: The offset, converted to signed 16-bit #
+ * Global/Static Variables:
+ * stream-position Reset if invalid destination; otherwise,
+ * advanced in the normal manner.
+ * Printout:
+ * The offset and destination, if display of offsets was specified
+ * or if the destination is invalid
+ *
+ * Error Detection:
+ * Crude and rudimentary:
+ * If the target-destination is outside the theoretical limits,
+ * it's obviously wrong.
+ * Notification remark is printed and the stream-position reset
+ * to the location of the offset, to allow it to be processed
+ * in the manner of normal tokens.
+ * If the offset is zero, that's obviously wrong, but don't reset
+ * the stream-position: zero gets processed as end0 and that
+ * is also wrong...
+ *
+ * Still to be done:
+ * More sophisticated error-checking for invalid offsets. Look
+ * at the type of branch, and what should be expected in the
+ * vicinity of the destination. (This might be best served
+ * by a separate routine).
+ * This might also help with handling the indent-level correctly...
+ * Also, if indentation were to be handled in this routine,
+ * there would be no need to return the value of the offset.
+ *
+ **************************************************************************** */
+
static s16 decode_offset(void)
{
s16 offs;
+ int dest;
+ bool invalid_dest;
+ int streampos = get_streampos();
+ output_token();
offs=get_offset();
- output_token();
- printf("0x%x\n",offs);
+
+ /* The target-destination is the source-byte offset
+ * at which the FCode-offset is found, plus
+ * the FCode-offset.
+ */
+ dest = streampos + offs;
+
+ /* A destination of zero is invalid because there must be a
+ * token -- such as b(<mark) or b(do) -- preceding
+ * the target of a backward branch.
+ * A destination at the end of the stream is unlikely but
+ * theoretically possible, so we'll treat it as valid.
+ * An offset of zero is also, of course, invalid.
+ */
+ invalid_dest = BOOLVAL ( (dest <= 0)
+ || (dest > stream_max)
+ || (offs == 0) );
+
+ /* Show the offset in hex and again as a signed decimal number. */
+ if ( offs16 )
+ {
+ printf("0x%04x (", (u16)(offs & 0xffff) );
+ }else{
+ printf("0x%02x (", (u8)(offs & 0x00ff) );
+ }
+ if ( (offs < 0) || (offs > 9) ) printf(" =dec %d", offs);
+ /* If we're showing source-byte offsets, show targets of offsets */
+ if ( show_offsets || invalid_dest )
+ {
+ printf(" dest = %d ",dest);
+ }
+ printf(")\n");
+
+ if ( invalid_dest )
+ {
+ if (offs == 0)
+ {
+ printremark("Error: Unresolved offset.");
+ }else{
+ printremark("Error: Invalid offset. Ignoring...");
+ set_streampos( streampos);
+ }
+ }
return offs;
}
@@ -127,59 +353,39 @@
{
u16 token;
output_token();
- token=get_token();
+ token = next_token();
printf("0x%03x\n",token);
- add_token(token, unnamed);
+ add_token(token, (char *)unnamed);
}
static void named_token(void)
{
u16 token;
+ u8 len;
u8* string;
output_token();
/* get forth string ( [len] [char0] ... [charn] ) */
- string=get_string();
- token=get_token();
-
- printf("%s 0x%03x\n", string+1, token);
-
- add_token(token,string+1);
+ string=get_name(&len);
+ token = next_token();
+ printf("%s 0x%03x\n", string, token);
+ add_token(token,string);
}
-static void external_token(void)
+static void bquote(void)
{
- u16 token;
- u8* string;
-
output_token();
/* get forth string ( [len] [char0] ... [charn] ) */
- string=get_string();
- token=get_token();
-
- printf("%s 0x%03x\n", string+1, token);
-
- add_token(token,string+1);
-}
-
-static void bquote(void)
-{
- u8 *string;
-
- /* get forth string ( [len] [char0] ... [charn] ) */
- string=get_string();
- output_token();
- pretty_string(string);
+ pretty_print_string();
printf("\n");
- free(string);
}
static void blit(void)
{
u32 lit;
+ output_token();
lit=get_num32();
- output_token();
printf("0x%x\n",lit);
}
@@ -204,56 +410,81 @@
u16 token;
output_token();
- token=get_token();
- decode_default();
+ token = next_token();
+ output_token_name();
+ printf ("\n");
}
+/* **************************************************************************
+ *
+ * Function name: decode_start
+ * Synopsis: Display the (known valid) FCode block Header
+ *
+ * Outputs:
+ * Global/Static Variables:
+ * fclen Length of the FCode block as shown in its Header
+ *
+ **************************************************************************** */
+
static void decode_start(void)
{
u8 fcformat;
u16 fcchecksum, checksum=0;
- long pos;
- u32 i;
- decode_default();
+ output_token();
+ printf(" ( %d-bit offsets)\n", offs16 ? 16 : 8 );
+ token_streampos = get_streampos();
decode_lines();
fcformat=get_num8();
printf(" format: 0x%02x\n", fcformat);
- decode_lines();
- fcchecksum=get_num16();
- /* missing: check for checksum correctness. */
-
- fclen=get_num32(); /* skip len */
- pos=get_streampos();
- for (i=0; i<fclen-pos; i++)
- checksum+=get_num8();
+ /* Check for checksum correctness. */
- set_streampos(pos-4);
+ token_streampos = get_streampos();
+ decode_lines();
+ fcchecksum=get_num16(); /* Read the stored checksum */
+ checksum = calc_checksum(); /* Calculate the actual checksum */
- printf(" checksum: 0x%04x (%sOk)\n", fcchecksum,
- fcchecksum==checksum?"":"not ");
+ if ( fcchecksum==checksum )
+ {
+ printf(" checksum: 0x%04x (Ok)\n", fcchecksum);
+ } else {
+ printf(" checksum should be: 0x%04x, but is 0x%04x\n",
+ checksum,fcchecksum);
+ }
+ token_streampos = get_streampos();
decode_lines();
fclen=get_num32();
- printf(" len: 0x%x (%d bytes)\n", fclen, fclen);
+ printf(" len: 0x%04x ( %d bytes)\n", fclen, fclen);
}
-void decode_token(u16 token)
+/* **************************************************************************
+ *
+ * Function name: decode_token
+ * Synopsis: Display detokenization for one token.
+ * Handle complicated cases and dispatch simple ones.
+ *
+ * Revision History:
+ * Detect FCode-Starters in the middle of an FCode block.
+ * Some tuning of adjustment of indent, particularly wrt branches...
+ *
+ **************************************************************************** */
+
+static void decode_token(u16 token)
{
+ bool handy_flag = TRUE;
switch (token) {
case 0x0b5:
new_token();
break;
- case 0x0b6:
+ case 0x0b6: /* Named Token */
+ case 0x0ca: /* External Token */
named_token();
break;
- case 0x0ca:
- external_token();
- break;
case 0x012:
bquote();
break;
@@ -276,14 +507,14 @@
case 0x0c2: /* b(;) */
case 0x0b2: /* b(>resolve) */
case 0x0c5: /* b(endcase) */
+ indent--;
decode_default();
- indent--;
break;
case 0x015: /* b(loop) */
case 0x016: /* b(+loop) */
case 0x0c6: /* b(endof) */
+ indent--;
decode_offset();
- indent--;
break;
case 0x017: /* b(do) */
case 0x018: /* b/?do) */
@@ -295,38 +526,274 @@
case 0x0c3: /* b(to) */
decode_two();
break;
+ case 0x0fd: /* version1 */
+ handy_flag = FALSE;
case 0x0f0: /* start0 */
case 0x0f1: /* start1 */
case 0x0f2: /* start2 */
case 0x0f3: /* start4 */
+ offs16 = handy_flag;
+ printremark("Unexpected FCode-Block Starter.");
decode_start();
+ printremark(" Ignoring length field.");
break;
+ case 0: /* end0 */
+ case 0xff: /* end1 */
+ end_found=TRUE;
+ decode_default();
+ break;
+ default:
+ decode_default();
+ }
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: decode_fcode_header
+ * Synopsis: Detokenize the FCode Header.
+ * Check for file corruption
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global/Static Variables:
+ * stream_max Length of input stream
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global/Static Variables:
+ * offs16 FALSE if Starter was version1, else TRUE
+ * fclen On error, gets set to reach end of input stream
+ * Otherwise, gets set by decode_start()
+ * Printout:
+ *
+ * Error Detection:
+ * First byte not a valid FCode Start: Print message, restore
+ * input pointer to initial value, set fclen to [(end of
+ * input stream) - (input pointer)], return FALSE.
+ *
+ * Process Explanation:
+ * This routine error-checks and dispatches to the routine that
+ * does the actual printing.
+ * Refrain from showing offset until correctness of starter-byte
+ * has been confirmed.
+ *
+ **************************************************************************** */
+
+static void decode_fcode_header(void)
+{
+ long err_pos;
+ u16 token;
+
+ err_pos = get_streampos();
+ indent = 0;
+ token = next_token();
+ offs16=TRUE;
+ switch (token)
+ {
case 0x0fd: /* version1 */
- decode_start();
offs16=FALSE;
+ case 0x0f0: /* start0 */
+ case 0x0f1: /* start1 */
+ case 0x0f2: /* start2 */
+ case 0x0f3: /* start4 */
+ decode_start();
break;
default:
- decode_default();
+ {
+ char temp_bufr[128] =
+ "Invalid FCode Start Byte. Ignoring FCode header." ;
+ set_streampos( err_pos );
+ fclen = max - pc;
+ printf("\n");
+ if (show_linenumbers)
+ {
+ sprintf( &(temp_bufr[strlen(temp_bufr)]),
+ " Remaining len = 0x%04x ( %d bytes)", fclen, fclen);
+ }
+ printremark( temp_bufr );
}
}
+}
-int detokenize(void)
+/* **************************************************************************
+ *
+ * Function name: decode_fcode_block
+ * Synopsis: Detokenize one FCode block.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global/Static Variables:
+ * fclen Length of the FCode block as shown in its Header
+ * end_found Whether the END0 code was seen
+ * decode_all TRUE = continue even after END0
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global/Static Variables:
+ * end_found Whether the END0 code was seen
+ * Printout:
+ * A summary message at the end of FCode detokenization
+ *
+ * Error Detection:
+ * If the end of the FCode block, as calculated by its FCode length,
+ * was reached without encountering END0, print a message.
+ * Detect END0 that occurs before end of FCode block,
+ * even if decode_all is in effect.
+ *
+ * Process Explanation:
+ * This routine dispatches to the routines that do the actual
+ * printing of the detokenization.
+ * The end_found flag is not a direct input, but more of an
+ * intermediate input, so to speak... Clear it at the start.
+ * Detection of FCode-Starters in the middle of an FCode block
+ * is handled by decode_token() routine.
+ *
+ **************************************************************************** */
+
+static void decode_fcode_block(void)
{
u16 token;
+ unsigned int fc_block_start;
+ unsigned int fc_block_end;
- if (linenumbers)
- linenum=1;
+ end_found = FALSE;
+ fc_block_start = get_streampos();
- do {
- decode_lines();
- decode_indent();
- token=get_token();
+ decode_fcode_header();
+
+ fc_block_end = fc_block_start + fclen;
+
+ while ( ( !end_found || decode_all )
+ && ( get_streampos() < fc_block_end ) )
+ {
+ token = next_token();
decode_token(token);
- } while ((token||decode_all) && ((get_streampos()-1)<=fclen));
+ }
+ if ( !end_found )
+ {
+ printremark("FCode-ender not found");
+ }
+ {
+ char temp_bufr[80];
+ /* Don't use fclen here, in case it got corrupted
+ * by an "Unexpected FCode-Block Starter"
+ */
+ if ( get_streampos() == fc_block_end )
+ {
+ sprintf( temp_bufr,
+ "Detokenization finished normally after %d bytes.",
+ fc_block_end - fc_block_start );
+ }else{
+ sprintf( temp_bufr,
+ "Detokenization finished prematurely after %d of %d bytes.",
+ get_streampos() - fc_block_start,
+ fc_block_end - fc_block_start );
+ ended_okay = FALSE;
+ }
+ printremark( temp_bufr );
+ }
+}
- decode_lines();
- printf ("\\ detokenizing finished after %d of %d bytes.\n",
- get_streampos(), fclen );
+/* **************************************************************************
+ *
+ * Function name: another_fcode_block
+ * Synopsis: Indicate whether there is a follow-on FCode block
+ * within the current PCI image.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global/Static Variables:
+ * token_streampos Streampos() of token just gotten
+ * Next token in Input Stream
+ *
+ * Outputs:
+ * Returned Value: TRUE if next token shows the start
+ * of a valid FCode-block
+ * Printout:
+ * Message if there is a follow-on FCode block
+ *
+ * Error Detection:
+ * If next token is neither a valid FCode-block starter nor the
+ * start of a zero-fill field, print a message.
+ *
+ * Process Explanation:
+ * Extract the next token from the Input Stream but do not
+ * consume it. Then examine the token.
+ *
+ **************************************************************************** */
- return 0;
+static bool another_fcode_block(void)
+{
+ bool retval = FALSE;
+ u16 token;
+
+ token = next_token();
+ set_streampos( token_streampos );
+
+ switch (token)
+ {
+ case 0x0fd: /* version1 */
+ case 0x0f0: /* start0 */
+ case 0x0f1: /* start1 */
+ case 0x0f2: /* start2 */
+ case 0x0f3: /* start4 */
+ retval = TRUE;
+ printremark("Subsequent FCode Block detected. Detokenizing.");
+ break;
+ case 0: /* Start of a zero-fill field */
+ /* retval already = FALSE . Nothing else to be done. */
+ break;
+ default:
+ {
+ char temp_bufr[80];
+ sprintf( temp_bufr,
+ "Unexpected token, 0x%02x, after end of FCode block.",
+ token);
+ printremark( temp_bufr);
+ }
+ }
+ return ( retval );
}
+
+/* **************************************************************************
+ *
+ * Function name: detokenize
+ * Synopsis: Detokenize one input file
+ *
+ *
+ *
+ **************************************************************************** */
+
+void detokenize(void)
+{
+ fclen = stream_max;
+
+ if ( setjmp(eof_exception) == 0 )
+ {
+ while ( more_to_go() )
+ {
+ if ( ended_okay )
+ {
+ init_fcode_block();
+ }
+ ended_okay = TRUE;
+
+ adjust_for_pci_header();
+
+ /* Allow for multiple FCode Blocks within the PCI image.
+ * The first one had better be a valid block, but the
+ * next may or may not be...
+ */
+ do
+ {
+ decode_fcode_block();
+ } while ( another_fcode_block() );
+
+ adjust_for_pci_filler();
+
+ }
+ }
+
+
+}
Modified: fcode-utils/detok/detok.c
===================================================================
--- fcode-utils/detok/detok.c 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/detok/detok.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -24,58 +24,76 @@
*
*/
+/* **************************************************************************
+ * Modifications made in 2005 by IBM Corporation
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Modifications Author: David L. Paktor dlpaktor(a)us.ibm.com
+ **************************************************************************** */
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+
#ifdef __GLIBC__
#define _GNU_SOURCE
#include <getopt.h>
-#else
-/* Some systems seem to have an incomplete unistd.h.
- * We need to define getopt() and optind for them.
- */
-extern int optind;
-int getopt(int argc, char * const argv[], const char *optstring);
#endif
#include "detok.h"
#include "stream.h"
+#include "addfcodes.h"
#define DETOK_VERSION "0.6.1"
-/* prototypes for dictionary handling */
-void init_dictionary(void);
-void decode_token(u16 token);
-/* prototype for detokenizer function */
-int detokenize(void);
+#define IBM_COPYR "(C) Copyright 2005 IBM Corporation. All Rights Reserved."
-extern unsigned int decode_all, verbose, linenumbers;
+bool verbose = FALSE ;
+bool decode_all = FALSE ;
+bool show_linenumbers = FALSE ;
+bool show_offsets = FALSE ;
-void print_copyright(void)
+/* Param is FALSE when beginning to detokenize,
+ * TRUE preceding error-exit */
+static void print_copyright(bool is_error)
{
- printf( "Welcome to the OpenBIOS detokenizer v%s\ndetok Copyright"
+ typedef void (*vfunct)(); /* Pointer to function returning void */
+ vfunct pfunct ;
+ char buffr[512];
+
+ sprintf( buffr,
+ "Welcome to the OpenBIOS detokenizer v%s\ndetok Copyright"
"(c) 2001-2005 by Stefan Reinauer.\nWritten by Stefan "
"Reinauer, <stepan(a)openbios.org>\n" "This program is "
"free software; you may redistribute it under the terms of\n"
"the GNU General Public License. This program has absolutely"
" no warranty.\n\n" ,DETOK_VERSION);
+
+ pfunct = ( is_error ? (vfunct)printf : printremark );
+
+ (*pfunct) ( buffr );
+
+ (*pfunct) ( IBM_COPYR "\n" );
}
-void usage(char *name)
+static void usage(char *name)
{
printf( "usage: %s [OPTION]... [FCODE-FILE]...\n\n"
" -v, --verbose print fcode numbers\n"
" -a, --all don't stop at end0\n"
" -n, --linenumbers print line numbers\n"
" -o, --offsets print byte offsets\n"
+ " -f, --fcodes add FCodes from list-file\n"
" -h, --help print this help text\n\n", name);
}
int main(int argc, char **argv)
{
int c;
- const char *optstring="vhano?";
+ const char *optstring="vhanof:?";
+ int linenumbers = 0;
+ bool add_vfcodes = FALSE;
+ char *vfc_filnam = NULL;
while (1) {
#ifdef __GLIBC__
@@ -86,6 +104,7 @@
{ "all", 0, 0, 'a' },
{ "linenumbers", 0, 0, 'n' },
{ "offsets", 0, 0, 'o' },
+ { "fcodes", 1, 0, 'f' },
{ 0, 0, 0, 0 }
};
@@ -99,24 +118,31 @@
switch (c) {
case 'v':
- verbose=1;
+ verbose=TRUE;
break;
case 'a':
- decode_all=1;
+ decode_all=TRUE;
break;
case 'n':
linenumbers|=1;
+ show_linenumbers = TRUE;
break;
case 'o':
linenumbers|=2;
+ show_linenumbers = TRUE;
+ show_offsets = TRUE;
break;
+ case 'f':
+ add_vfcodes = TRUE;
+ vfc_filnam = optarg;
+ break;
case 'h':
case '?':
- print_copyright();
+ print_copyright(TRUE);
usage(argv[0]);
return 0;
default:
- print_copyright();
+ print_copyright(TRUE);
printf ("%s: unknown option.\n",argv[0]);
usage(argv[0]);
return 1;
@@ -124,13 +150,14 @@
}
if (verbose)
- print_copyright();
+ print_copyright(FALSE);
if (linenumbers>2)
- printf("Line numbers will be disabled in favour of offsets.\n");
+ printremark(
+ "Line numbers will be disabled in favour of offsets.\n");
if (optind >= argc) {
- print_copyright();
+ print_copyright(TRUE);
printf ("%s: filename missing.\n",argv[0]);
usage(argv[0]);
return 1;
@@ -138,6 +165,14 @@
init_dictionary();
+ if ( add_vfcodes )
+ {
+ if ( add_fcodes_from_list( vfc_filnam) )
+ {
+ freeze_dictionary();
+ }
+ }
+
while (optind < argc) {
if (init_stream(argv[optind])) {
Modified: fcode-utils/detok/detok.h
===================================================================
--- fcode-utils/detok/detok.h 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/detok/detok.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -1,3 +1,6 @@
+#ifndef _UTILS_DETOK_DETOK_H
+#define _UTILS_DETOK_DETOK_H
+
/*
* OpenBIOS - free your system!
* ( detokenizer )
@@ -24,10 +27,49 @@
*
*/
-#define u8 unsigned char
-#define u16 unsigned short
-#define u32 unsigned int
-#define s16 short
-#define bool int
-#define TRUE (-1)
-#define FALSE (0)
+/* **************************************************************************
+ * Modifications made in 2005 by IBM Corporation
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Modifications Author: David L. Paktor dlpaktor(a)us.ibm.com
+ **************************************************************************** */
+
+#include "types.h"
+
+/* Prototypes for functions exported from
+ * detok.c decode.c printformats.c pcihdr.c and dictionary.c
+ */
+
+void add_token(u16 number, char *name);
+void init_dictionary(void);
+void reset_dictionary(void);
+void freeze_dictionary(void);
+char *lookup_token(u16 number);
+
+void detokenize(void);
+
+void printremark(char *str);
+
+int handle_pci_header ( u8 *data_ptr );
+void handle_pci_filler(u8 *filler_ptr);
+
+
+/* External declarations for variables defined in or used by
+ * detok.c decode.c printformats.c pcihdr.c and dictionary.c
+ */
+extern bool verbose;
+extern bool decode_all;
+extern bool show_linenumbers;
+extern bool show_offsets;
+
+extern bool check_tok_seq;
+
+extern u16 fcode;
+extern bool offs16;
+extern bool end_found;
+extern unsigned int linenum;
+
+extern u8 *pci_image_end;
+extern unsigned int token_streampos;
+extern u16 last_defined_token;
+
+#endif /* _UTILS_DETOK_DETOK_H */
Modified: fcode-utils/detok/dictionary.c
===================================================================
--- fcode-utils/detok/dictionary.c 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/detok/dictionary.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -24,20 +24,29 @@
*
*/
+/* **************************************************************************
+ * Modifications made in 2005 by IBM Corporation
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Modifications Author: David L. Paktor dlpaktor(a)us.ibm.com
+ **************************************************************************** */
+
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include "detok.h"
+bool check_tok_seq = TRUE;
+
typedef struct token {
- u8 *name;
+ char *name;
u16 fcode;
struct token *next;
} token_t;
+#define TOKEN_ENTRY(num, name) { name, (u16)num, (token_t *)NULL }
+static token_t *dictionary; /* Initialize dynamically to accommodate AIX */
static char *fcerror="ferror";
-token_t *dictionary=NULL;
char *lookup_token(u16 number)
{
@@ -53,7 +62,51 @@
return fcerror;
}
-int add_token(u16 number, char *name)
+/* **************************************************************************
+ *
+ * Function name: add_token
+ * Synopsis: Add an entry to the FCode-Tokens vocabulary.
+ *
+ * Inputs:
+ * Parameters:
+ * number Numeric value of the FCode token
+ * name Name of the function to display
+ * Global/Static Variables:
+ * dictionary Pointer to the "tail" of the
+ * FCode-Tokens vocabulary.
+ * check_tok_seq TRUE = "Check Token Sequence"
+ * A retro-fit to accommodate
+ * adding Vendor FCodes
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global/Static Variables:
+ * dictionary Updated to point to the new entry.
+ * last_defined_token Updated to the given FCode token
+ * Memory Allocated
+ * For the new entry.
+ * When Freed?
+ * Never. Retained for duration of the program.
+ *
+ * Error Detection:
+ * Failure to allocate memory is a fatal error.
+ * If the given FCode token is not exactly one larger than the
+ * previous last_defined_token , then there's something
+ * odd going on; print a remark to alert the user. The
+ * value of last_defined_token will be used elsewhere
+ * for additional error-checking.
+ *
+ * Process Explanation:
+ * The name field pointer is presumed to already point to a stable
+ * memory-space.
+ * Memory will be allocated for the entry itself; its fields will
+ * be entered and the pointer-to-the-tail-of-the-vocabulary
+ * will be updated to point to the new entry.
+ * Error-check and update last_defined_token
+ *
+ **************************************************************************** */
+
+void add_token(u16 number, char *name)
{
token_t *curr;
@@ -68,393 +121,451 @@
curr->name=name;
dictionary=curr;
- return 0;
+
+ if ( check_tok_seq )
+ {
+ /* Error-check, but not for first time. */
+ if ( (number == last_defined_token + 1)
+ || (last_defined_token == 0) )
+ {
+ last_defined_token = number;
+ }else{
+ if ( number <= last_defined_token )
+ {
+ printremark("Warning: New token # might overlap "
+ "previously assigned token #(s).");
+ }else{
+ printremark("Warning: New token # out of sequence with "
+ "previously assigned token #(s).");
+ /* It's increasing; update it. */
+ last_defined_token = number;
+ }
}
+ }
+}
+
+token_t detok_table[] = {
+
+ TOKEN_ENTRY( 0x000, "end0" ),
+ TOKEN_ENTRY( 0x010, "b(lit)" ),
+ TOKEN_ENTRY( 0x011, "b(')" ),
+ TOKEN_ENTRY( 0x012, "b(\")" ),
+ TOKEN_ENTRY( 0x013, "bbranch" ),
+ TOKEN_ENTRY( 0x014, "b?branch" ),
+ TOKEN_ENTRY( 0x015, "b(loop)" ),
+ TOKEN_ENTRY( 0x016, "b(+loop)" ),
+ TOKEN_ENTRY( 0x017, "b(do)" ),
+ TOKEN_ENTRY( 0x018, "b(?do)" ),
+ TOKEN_ENTRY( 0x019, "i" ),
+ TOKEN_ENTRY( 0x01a, "j" ),
+ TOKEN_ENTRY( 0x01b, "b(leave)" ),
+ TOKEN_ENTRY( 0x01c, "b(of)" ),
+ TOKEN_ENTRY( 0x01d, "execute" ),
+ TOKEN_ENTRY( 0x01e, "+" ),
+ TOKEN_ENTRY( 0x01f, "-" ),
+ TOKEN_ENTRY( 0x020, "*" ),
+ TOKEN_ENTRY( 0x021, "/" ),
+ TOKEN_ENTRY( 0x022, "mod" ),
+ TOKEN_ENTRY( 0x023, "and" ),
+ TOKEN_ENTRY( 0x024, "or" ),
+ TOKEN_ENTRY( 0x025, "xor" ),
+ TOKEN_ENTRY( 0x026, "invert" ),
+ TOKEN_ENTRY( 0x027, "lshift" ),
+ TOKEN_ENTRY( 0x028, "rshift" ),
+ TOKEN_ENTRY( 0x029, ">>a" ),
+ TOKEN_ENTRY( 0x02a, "/mod" ),
+ TOKEN_ENTRY( 0x02b, "u/mod" ),
+ TOKEN_ENTRY( 0x02c, "negate" ),
+ TOKEN_ENTRY( 0x02d, "abs" ),
+ TOKEN_ENTRY( 0x02e, "min" ),
+ TOKEN_ENTRY( 0x02f, "max" ),
+ TOKEN_ENTRY( 0x030, ">r" ),
+ TOKEN_ENTRY( 0x031, "r>" ),
+ TOKEN_ENTRY( 0x032, "r@" ),
+ TOKEN_ENTRY( 0x033, "exit" ),
+ TOKEN_ENTRY( 0x034, "0=" ),
+ TOKEN_ENTRY( 0x035, "0<>" ),
+ TOKEN_ENTRY( 0x036, "0<" ),
+ TOKEN_ENTRY( 0x037, "0<=" ),
+ TOKEN_ENTRY( 0x038, "0>" ),
+ TOKEN_ENTRY( 0x039, "0>=" ),
+ TOKEN_ENTRY( 0x03a, "<" ),
+ TOKEN_ENTRY( 0x03b, ">" ),
+ TOKEN_ENTRY( 0x03c, "=" ),
+ TOKEN_ENTRY( 0x03d, "<>" ),
+ TOKEN_ENTRY( 0x03e, "u>" ),
+ TOKEN_ENTRY( 0x03f, "u<=" ),
+ TOKEN_ENTRY( 0x040, "u<" ),
+ TOKEN_ENTRY( 0x041, "u>=" ),
+ TOKEN_ENTRY( 0x042, ">=" ),
+ TOKEN_ENTRY( 0x043, "<=" ),
+ TOKEN_ENTRY( 0x044, "between" ),
+ TOKEN_ENTRY( 0x045, "within" ),
+ TOKEN_ENTRY( 0x046, "drop" ),
+ TOKEN_ENTRY( 0x047, "dup" ),
+ TOKEN_ENTRY( 0x048, "over" ),
+ TOKEN_ENTRY( 0x049, "swap" ),
+ TOKEN_ENTRY( 0x04A, "rot" ),
+ TOKEN_ENTRY( 0x04b, "-rot" ),
+ TOKEN_ENTRY( 0x04c, "tuck" ),
+ TOKEN_ENTRY( 0x04d, "nip" ),
+ TOKEN_ENTRY( 0x04e, "pick" ),
+ TOKEN_ENTRY( 0x04f, "roll" ),
+ TOKEN_ENTRY( 0x050, "?dup" ),
+ TOKEN_ENTRY( 0x051, "depth" ),
+ TOKEN_ENTRY( 0x052, "2drop" ),
+ TOKEN_ENTRY( 0x053, "2dup" ),
+ TOKEN_ENTRY( 0x054, "2over" ),
+ TOKEN_ENTRY( 0x055, "2swap" ),
+ TOKEN_ENTRY( 0x056, "2rot" ),
+ TOKEN_ENTRY( 0x057, "2/" ),
+ TOKEN_ENTRY( 0x058, "u2/" ),
+ TOKEN_ENTRY( 0x059, "2*" ),
+ TOKEN_ENTRY( 0x05a, "/c" ),
+ TOKEN_ENTRY( 0x05b, "/w" ),
+ TOKEN_ENTRY( 0x05c, "/l" ),
+ TOKEN_ENTRY( 0x05d, "/n" ),
+ TOKEN_ENTRY( 0x05e, "ca+" ),
+ TOKEN_ENTRY( 0x05f, "wa+" ),
+ TOKEN_ENTRY( 0x060, "la+" ),
+ TOKEN_ENTRY( 0x061, "na+" ),
+ TOKEN_ENTRY( 0x062, "char+" ),
+ TOKEN_ENTRY( 0x063, "wa1+" ),
+ TOKEN_ENTRY( 0x064, "la1+" ),
+ TOKEN_ENTRY( 0x065, "cell+" ),
+ TOKEN_ENTRY( 0x066, "chars" ),
+ TOKEN_ENTRY( 0x067, "/w*" ),
+ TOKEN_ENTRY( 0x068, "/l*" ),
+ TOKEN_ENTRY( 0x069, "cells" ),
+ TOKEN_ENTRY( 0x06a, "on" ),
+ TOKEN_ENTRY( 0x06b, "off" ),
+ TOKEN_ENTRY( 0x06c, "+!" ),
+ TOKEN_ENTRY( 0x06d, "@" ),
+ TOKEN_ENTRY( 0x06e, "l@" ),
+ TOKEN_ENTRY( 0x06f, "w@" ),
+ TOKEN_ENTRY( 0x070, "<w@" ),
+ TOKEN_ENTRY( 0x071, "c@" ),
+ TOKEN_ENTRY( 0x072, "!" ),
+ TOKEN_ENTRY( 0x073, "l!" ),
+ TOKEN_ENTRY( 0x074, "w!" ),
+ TOKEN_ENTRY( 0x075, "c!" ),
+ TOKEN_ENTRY( 0x076, "2@" ),
+ TOKEN_ENTRY( 0x077, "2!" ),
+ TOKEN_ENTRY( 0x078, "move" ),
+ TOKEN_ENTRY( 0x079, "fill" ),
+ TOKEN_ENTRY( 0x07a, "comp" ),
+ TOKEN_ENTRY( 0x07b, "noop" ),
+ TOKEN_ENTRY( 0x07c, "lwsplit" ),
+ TOKEN_ENTRY( 0x07d, "wljoin" ),
+ TOKEN_ENTRY( 0x07e, "lbsplit" ),
+ TOKEN_ENTRY( 0x07f, "bljoin" ),
+ TOKEN_ENTRY( 0x080, "wbflip" ),
+ TOKEN_ENTRY( 0x081, "upc" ),
+ TOKEN_ENTRY( 0x082, "lcc" ),
+ TOKEN_ENTRY( 0x083, "pack" ),
+ TOKEN_ENTRY( 0x084, "count" ),
+ TOKEN_ENTRY( 0x085, "body>" ),
+ TOKEN_ENTRY( 0x086, ">body" ),
+ TOKEN_ENTRY( 0x087, "fcode-revision" ),
+ TOKEN_ENTRY( 0x088, "span" ),
+ TOKEN_ENTRY( 0x089, "unloop" ),
+ TOKEN_ENTRY( 0x08a, "expect" ),
+ TOKEN_ENTRY( 0x08b, "alloc-mem" ),
+ TOKEN_ENTRY( 0x08c, "free-mem" ),
+ TOKEN_ENTRY( 0x08d, "key?" ),
+ TOKEN_ENTRY( 0x08e, "key" ),
+ TOKEN_ENTRY( 0x08f, "emit" ),
+ TOKEN_ENTRY( 0x090, "type" ),
+ TOKEN_ENTRY( 0x091, "(cr" ),
+ TOKEN_ENTRY( 0x092, "cr" ),
+ TOKEN_ENTRY( 0x093, "#out" ),
+ TOKEN_ENTRY( 0x094, "#line" ),
+ TOKEN_ENTRY( 0x095, "hold" ),
+ TOKEN_ENTRY( 0x096, "<#" ),
+ TOKEN_ENTRY( 0x097, "u#>" ),
+ TOKEN_ENTRY( 0x098, "sign" ),
+ TOKEN_ENTRY( 0x099, "u#" ),
+ TOKEN_ENTRY( 0x09a, "u#s" ),
+ TOKEN_ENTRY( 0x09b, "u." ),
+ TOKEN_ENTRY( 0x09c, "u.r" ),
+ TOKEN_ENTRY( 0x09d, "." ),
+ TOKEN_ENTRY( 0x09e, ".r" ),
+ TOKEN_ENTRY( 0x09f, ".s" ),
+ TOKEN_ENTRY( 0x0a0, "base" ),
+ TOKEN_ENTRY( 0x0a1, "convert" ),
+ TOKEN_ENTRY( 0x0a2, "$number" ),
+ TOKEN_ENTRY( 0x0a3, "digit" ),
+ TOKEN_ENTRY( 0x0a4, "-1" ),
+ TOKEN_ENTRY( 0x0a5, "0" ),
+ TOKEN_ENTRY( 0x0a6, "1" ),
+ TOKEN_ENTRY( 0x0a7, "2" ),
+ TOKEN_ENTRY( 0x0a8, "3" ),
+ TOKEN_ENTRY( 0x0a9, "bl" ),
+ TOKEN_ENTRY( 0x0aa, "bs" ),
+ TOKEN_ENTRY( 0x0ab, "bell" ),
+ TOKEN_ENTRY( 0x0ac, "bounds" ),
+ TOKEN_ENTRY( 0x0ad, "here" ),
+ TOKEN_ENTRY( 0x0ae, "aligned" ),
+ TOKEN_ENTRY( 0x0af, "wbsplit" ),
+ TOKEN_ENTRY( 0x0b0, "bwjoin" ),
+ TOKEN_ENTRY( 0x0b1, "b(<mark)" ),
+ TOKEN_ENTRY( 0x0b2, "b(>resolve)" ),
+ TOKEN_ENTRY( 0x0b3, "set-token-table" ),
+ TOKEN_ENTRY( 0x0b4, "set-table" ),
+ TOKEN_ENTRY( 0x0b5, "new-token" ),
+ TOKEN_ENTRY( 0x0b6, "named-token" ),
+ TOKEN_ENTRY( 0x0b7, "b(:)" ),
+ TOKEN_ENTRY( 0x0b8, "b(value)" ),
+ TOKEN_ENTRY( 0x0b9, "b(variable)" ),
+ TOKEN_ENTRY( 0x0ba, "b(constant)" ),
+ TOKEN_ENTRY( 0x0bb, "b(create)" ),
+ TOKEN_ENTRY( 0x0bc, "b(defer)" ),
+ TOKEN_ENTRY( 0x0bd, "b(buffer:)" ),
+ TOKEN_ENTRY( 0x0be, "b(field)" ),
+ TOKEN_ENTRY( 0x0bf, "b(code)" ),
+ TOKEN_ENTRY( 0x0c0, "instance" ),
+ TOKEN_ENTRY( 0x0c2, "b(;)" ),
+ TOKEN_ENTRY( 0x0c3, "b(to)" ),
+ TOKEN_ENTRY( 0x0c4, "b(case)" ),
+ TOKEN_ENTRY( 0x0c5, "b(endcase)" ),
+ TOKEN_ENTRY( 0x0c6, "b(endof)" ),
+ TOKEN_ENTRY( 0x0c7, "#" ),
+ TOKEN_ENTRY( 0x0c8, "#s" ),
+ TOKEN_ENTRY( 0x0c9, "#>" ),
+ TOKEN_ENTRY( 0x0ca, "external-token" ),
+ TOKEN_ENTRY( 0x0cb, "$find" ),
+ TOKEN_ENTRY( 0x0cc, "offset16" ),
+ TOKEN_ENTRY( 0x0cd, "evaluate" ),
+ TOKEN_ENTRY( 0x0d0, "c," ),
+ TOKEN_ENTRY( 0x0d1, "w," ),
+ TOKEN_ENTRY( 0x0d2, "l," ),
+ TOKEN_ENTRY( 0x0d3, "," ),
+ TOKEN_ENTRY( 0x0d4, "um*" ),
+ TOKEN_ENTRY( 0x0d5, "um/mod" ),
+ TOKEN_ENTRY( 0x0d8, "d+" ),
+ TOKEN_ENTRY( 0x0d9, "d-" ),
+ TOKEN_ENTRY( 0x0da, "get-token" ),
+ TOKEN_ENTRY( 0x0db, "set-token" ),
+ TOKEN_ENTRY( 0x0dc, "state" ),
+ TOKEN_ENTRY( 0x0dd, "compile" ),
+ TOKEN_ENTRY( 0x0de, "behavior" ),
+ TOKEN_ENTRY( 0x0f0, "start0" ),
+ TOKEN_ENTRY( 0x0f1, "start1" ),
+ TOKEN_ENTRY( 0x0f2, "start2" ),
+ TOKEN_ENTRY( 0x0f3, "start4" ),
+ TOKEN_ENTRY( 0x0fc, "ferror" ),
+ TOKEN_ENTRY( 0x0fd, "version1" ),
+ TOKEN_ENTRY( 0x0fe, "4-byte-id" ),
+ TOKEN_ENTRY( 0x0ff, "end1" ),
+ TOKEN_ENTRY( 0x101, "dma-alloc" ),
+ TOKEN_ENTRY( 0x102, "my-address" ),
+ TOKEN_ENTRY( 0x103, "my-space" ),
+ TOKEN_ENTRY( 0x104, "memmap" ),
+ TOKEN_ENTRY( 0x105, "free-virtual" ),
+ TOKEN_ENTRY( 0x106, ">physical" ),
+ TOKEN_ENTRY( 0x10f, "my-params" ),
+ TOKEN_ENTRY( 0x110, "property" ),
+ TOKEN_ENTRY( 0x111, "encode-int" ),
+ TOKEN_ENTRY( 0x112, "encode+" ),
+ TOKEN_ENTRY( 0x113, "encode-phys" ),
+ TOKEN_ENTRY( 0x114, "encode-string" ),
+ TOKEN_ENTRY( 0x115, "encode-bytes" ),
+ TOKEN_ENTRY( 0x116, "reg" ),
+ TOKEN_ENTRY( 0x117, "intr" ),
+ TOKEN_ENTRY( 0x118, "driver" ),
+ TOKEN_ENTRY( 0x119, "model" ),
+ TOKEN_ENTRY( 0x11a, "device-type" ),
+ TOKEN_ENTRY( 0x11b, "parse-2int" ),
+ TOKEN_ENTRY( 0x11c, "is-install" ),
+ TOKEN_ENTRY( 0x11d, "is-remove" ),
+ TOKEN_ENTRY( 0x11e, "is-selftest" ),
+ TOKEN_ENTRY( 0x11f, "new-device" ),
+ TOKEN_ENTRY( 0x120, "diagnostic-mode?" ),
+ TOKEN_ENTRY( 0x121, "display-status" ),
+ TOKEN_ENTRY( 0x122, "memory-test-issue" ),
+ TOKEN_ENTRY( 0x123, "group-code" ),
+ TOKEN_ENTRY( 0x124, "mask" ),
+ TOKEN_ENTRY( 0x125, "get-msecs" ),
+ TOKEN_ENTRY( 0x126, "ms" ),
+ TOKEN_ENTRY( 0x127, "finish-device" ),
+ TOKEN_ENTRY( 0x128, "decode-phys" ),
+ TOKEN_ENTRY( 0x12b, "interpose" ),
+ TOKEN_ENTRY( 0x130, "map-low" ),
+ TOKEN_ENTRY( 0x131, "sbus-intr>cpu" ),
+ TOKEN_ENTRY( 0x150, "#lines" ),
+ TOKEN_ENTRY( 0x151, "#columns" ),
+ TOKEN_ENTRY( 0x152, "line#" ),
+ TOKEN_ENTRY( 0x153, "column#" ),
+ TOKEN_ENTRY( 0x154, "inverse?" ),
+ TOKEN_ENTRY( 0x155, "inverse-screen?" ),
+ TOKEN_ENTRY( 0x156, "frame-buffer-busy?" ),
+ TOKEN_ENTRY( 0x157, "draw-character" ),
+ TOKEN_ENTRY( 0x158, "reset-screen" ),
+ TOKEN_ENTRY( 0x159, "toggle-cursor" ),
+ TOKEN_ENTRY( 0x15a, "erase-screen" ),
+ TOKEN_ENTRY( 0x15b, "blink-screen" ),
+ TOKEN_ENTRY( 0x15c, "invert-screen" ),
+ TOKEN_ENTRY( 0x15d, "insert-characters" ),
+ TOKEN_ENTRY( 0x15e, "delete-characters" ),
+ TOKEN_ENTRY( 0x15f, "insert-lines" ),
+ TOKEN_ENTRY( 0x160, "delete-lines" ),
+ TOKEN_ENTRY( 0x161, "draw-logo" ),
+ TOKEN_ENTRY( 0x162, "frame-buffer-adr" ),
+ TOKEN_ENTRY( 0x163, "screen-height" ),
+ TOKEN_ENTRY( 0x164, "screen-width" ),
+ TOKEN_ENTRY( 0x165, "window-top" ),
+ TOKEN_ENTRY( 0x166, "window-left" ),
+ TOKEN_ENTRY( 0x16a, "default-font" ),
+ TOKEN_ENTRY( 0x16b, "set-font" ),
+ TOKEN_ENTRY( 0x16c, "char-height" ),
+ TOKEN_ENTRY( 0x16d, "char-width" ),
+ TOKEN_ENTRY( 0x16e, ">font" ),
+ TOKEN_ENTRY( 0x16f, "fontbytes" ),
+ TOKEN_ENTRY( 0x170, "fb1-draw-character" ),
+ TOKEN_ENTRY( 0x171, "fb1-reset-screen" ),
+ TOKEN_ENTRY( 0x172, "fb1-toggle-cursor" ),
+ TOKEN_ENTRY( 0x173, "fb1-erase-screen" ),
+ TOKEN_ENTRY( 0x174, "fb1-blink-screen" ),
+ TOKEN_ENTRY( 0x175, "fb1-invert-screen" ),
+ TOKEN_ENTRY( 0x176, "fb1-insert-characters" ),
+ TOKEN_ENTRY( 0x177, "fb1-delete-characters" ),
+ TOKEN_ENTRY( 0x178, "fb1-insert-lines" ),
+ TOKEN_ENTRY( 0x179, "fb1-delete-lines" ),
+ TOKEN_ENTRY( 0x17a, "fb1-draw-logo" ),
+ TOKEN_ENTRY( 0x17b, "fb1-install" ),
+ TOKEN_ENTRY( 0x17c, "fb1-slide-up" ),
+ TOKEN_ENTRY( 0x180, "fb8-draw-character" ),
+ TOKEN_ENTRY( 0x181, "fb8-reset-screen" ),
+ TOKEN_ENTRY( 0x182, "fb8-toggle-cursor" ),
+ TOKEN_ENTRY( 0x183, "fb8-erase-screen" ),
+ TOKEN_ENTRY( 0x184, "fb8-blink-screen" ),
+ TOKEN_ENTRY( 0x185, "fb8-invert-screen" ),
+ TOKEN_ENTRY( 0x186, "fb8-insert-characters" ),
+ TOKEN_ENTRY( 0x187, "fb8-delete-characters" ),
+ TOKEN_ENTRY( 0x188, "fb8-insert-lines" ),
+ TOKEN_ENTRY( 0x189, "fb8-delete-lines" ),
+ TOKEN_ENTRY( 0x18a, "fb8-draw-logo" ),
+ TOKEN_ENTRY( 0x18b, "fb8-install" ),
+ TOKEN_ENTRY( 0x1a0, "return-buffer" ),
+ TOKEN_ENTRY( 0x1a1, "xmit-packet" ),
+ TOKEN_ENTRY( 0x1a2, "poll-packet" ),
+ TOKEN_ENTRY( 0x1a4, "mac-address" ),
+ TOKEN_ENTRY( 0x201, "device-name" ),
+ TOKEN_ENTRY( 0x202, "my-args" ),
+ TOKEN_ENTRY( 0x203, "my-self" ),
+ TOKEN_ENTRY( 0x204, "find-package" ),
+ TOKEN_ENTRY( 0x205, "open-package" ),
+ TOKEN_ENTRY( 0x206, "close-package" ),
+ TOKEN_ENTRY( 0x207, "find-method" ),
+ TOKEN_ENTRY( 0x208, "call-package" ),
+ TOKEN_ENTRY( 0x209, "$call-parent" ),
+ TOKEN_ENTRY( 0x20a, "my-parent" ),
+ TOKEN_ENTRY( 0x20b, "ihandle>phandle" ),
+ TOKEN_ENTRY( 0x20d, "my-unit" ),
+ TOKEN_ENTRY( 0x20e, "$call-method" ),
+ TOKEN_ENTRY( 0x20f, "$open-package" ),
+ TOKEN_ENTRY( 0x210, "processor-type" ),
+ TOKEN_ENTRY( 0x211, "firmware-version" ),
+ TOKEN_ENTRY( 0x212, "fcode-version" ),
+ TOKEN_ENTRY( 0x213, "alarm" ),
+ TOKEN_ENTRY( 0x214, "(is-user-word)" ),
+ TOKEN_ENTRY( 0x215, "suspend-fcode" ),
+ TOKEN_ENTRY( 0x216, "abort" ),
+ TOKEN_ENTRY( 0x217, "catch" ),
+ TOKEN_ENTRY( 0x218, "throw" ),
+ TOKEN_ENTRY( 0x219, "user-abort" ),
+ TOKEN_ENTRY( 0x21a, "get-my-property" ),
+ TOKEN_ENTRY( 0x21b, "decode-int" ),
+ TOKEN_ENTRY( 0x21c, "decode-string" ),
+ TOKEN_ENTRY( 0x21d, "get-inherited-property" ),
+ TOKEN_ENTRY( 0x21e, "delete-property" ),
+ TOKEN_ENTRY( 0x21f, "get-package-property" ),
+ TOKEN_ENTRY( 0x220, "cpeek" ),
+ TOKEN_ENTRY( 0x221, "wpeek" ),
+ TOKEN_ENTRY( 0x222, "lpeek" ),
+ TOKEN_ENTRY( 0x223, "cpoke" ),
+ TOKEN_ENTRY( 0x224, "wpoke" ),
+ TOKEN_ENTRY( 0x225, "lpoke" ),
+ TOKEN_ENTRY( 0x226, "lwflip" ),
+ TOKEN_ENTRY( 0x227, "lbflip" ),
+ TOKEN_ENTRY( 0x228, "lbflips" ),
+ TOKEN_ENTRY( 0x229, "adr-mask" ),
+ TOKEN_ENTRY( 0x230, "rb@" ),
+ TOKEN_ENTRY( 0x231, "rb!" ),
+ TOKEN_ENTRY( 0x232, "rw@" ),
+ TOKEN_ENTRY( 0x233, "rw!" ),
+ TOKEN_ENTRY( 0x234, "rl@" ),
+ TOKEN_ENTRY( 0x235, "rl!" ),
+ TOKEN_ENTRY( 0x236, "wbflips" ),
+ TOKEN_ENTRY( 0x237, "lwflips" ),
+ TOKEN_ENTRY( 0x238, "probe" ),
+ TOKEN_ENTRY( 0x239, "probe-virtual" ),
+ TOKEN_ENTRY( 0x23b, "child" ),
+ TOKEN_ENTRY( 0x23c, "peer" ),
+ TOKEN_ENTRY( 0x23d, "next-property" ),
+ TOKEN_ENTRY( 0x23e, "byte-load" ),
+ TOKEN_ENTRY( 0x23f, "set-args" ),
+ TOKEN_ENTRY( 0x240, "left-parse-string" ),
+
+ /* FCodes from 64bit extension addendum */
+ TOKEN_ENTRY( 0x22e, "rx@" ),
+ TOKEN_ENTRY( 0x22f, "rx!" ),
+ TOKEN_ENTRY( 0x241, "bxjoin" ),
+ TOKEN_ENTRY( 0x242, "<l@" ),
+ TOKEN_ENTRY( 0x243, "lxjoin" ),
+ TOKEN_ENTRY( 0x244, "wxjoin" ),
+ TOKEN_ENTRY( 0x245, "x," ),
+ TOKEN_ENTRY( 0x246, "x@" ),
+ TOKEN_ENTRY( 0x247, "x!" ),
+ TOKEN_ENTRY( 0x248, "/x" ),
+ TOKEN_ENTRY( 0x249, "/x*" ),
+ TOKEN_ENTRY( 0x24a, "xa+" ),
+ TOKEN_ENTRY( 0x24b, "xa1+" ),
+ TOKEN_ENTRY( 0x24c, "xbflip" ),
+ TOKEN_ENTRY( 0x24d, "xbflips" ),
+ TOKEN_ENTRY( 0x24e, "xbsplit" ),
+ TOKEN_ENTRY( 0x24f, "xlflip" ),
+ TOKEN_ENTRY( 0x250, "xlflips" ),
+ TOKEN_ENTRY( 0x251, "xlsplit" ),
+ TOKEN_ENTRY( 0x252, "xwflip" ),
+ TOKEN_ENTRY( 0x253, "xwflips" ),
+ TOKEN_ENTRY( 0x254, "xwsplit" ),
+};
+
+static const int dictionary_indx_max = (sizeof(detok_table)/sizeof(token_t)) ;
+
+static token_t *dictionary_reset_position;
+
void init_dictionary(void)
{
- add_token( 0x000, "end0" );
- add_token( 0x010, "b(lit)" );
- add_token( 0x011, "b(')" );
- add_token( 0x012, "b(\")" );
- add_token( 0x013, "bbranch" );
- add_token( 0x014, "b?branch" );
- add_token( 0x015, "b(loop)" );
- add_token( 0x016, "b(+loop)" );
- add_token( 0x017, "b(do)" );
- add_token( 0x018, "b(?do)" );
- add_token( 0x019, "i" );
- add_token( 0x01a, "j" );
- add_token( 0x01b, "b(leave)" );
- add_token( 0x01c, "b(of)" );
- add_token( 0x01d, "execute" );
- add_token( 0x01e, "+" );
- add_token( 0x01f, "-" );
- add_token( 0x020, "*" );
- add_token( 0x021, "/" );
- add_token( 0x022, "mod" );
- add_token( 0x023, "and" );
- add_token( 0x024, "or" );
- add_token( 0x025, "xor" );
- add_token( 0x026, "invert" );
- add_token( 0x027, "lshift" );
- add_token( 0x028, "rshift" );
- add_token( 0x029, ">>a" );
- add_token( 0x02a, "/mod" );
- add_token( 0x02b, "u/mod" );
- add_token( 0x02c, "negate" );
- add_token( 0x02d, "abs" );
- add_token( 0x02e, "min" );
- add_token( 0x02f, "max" );
- add_token( 0x030, ">r" );
- add_token( 0x031, "r>" );
- add_token( 0x032, "r@" );
- add_token( 0x033, "exit" );
- add_token( 0x034, "0=" );
- add_token( 0x035, "0<>" );
- add_token( 0x036, "0<" );
- add_token( 0x037, "0<=" );
- add_token( 0x038, "0>" );
- add_token( 0x039, "0>=" );
- add_token( 0x03a, "<" );
- add_token( 0x03b, ">" );
- add_token( 0x03c, "=" );
- add_token( 0x03d, "<>" );
- add_token( 0x03e, "u>" );
- add_token( 0x03f, "u<=" );
- add_token( 0x040, "u<" );
- add_token( 0x041, "u>=" );
- add_token( 0x042, ">=" );
- add_token( 0x043, "<=" );
- add_token( 0x044, "between" );
- add_token( 0x045, "within" );
- add_token( 0x046, "drop" );
- add_token( 0x047, "dup" );
- add_token( 0x048, "over" );
- add_token( 0x049, "swap" );
- add_token( 0x04A, "rot" );
- add_token( 0x04b, "-rot" );
- add_token( 0x04c, "tuck" );
- add_token( 0x04d, "nip" );
- add_token( 0x04e, "pick" );
- add_token( 0x04f, "roll" );
- add_token( 0x050, "?dup" );
- add_token( 0x051, "depth" );
- add_token( 0x052, "2drop" );
- add_token( 0x053, "2dup" );
- add_token( 0x054, "2over" );
- add_token( 0x055, "2swap" );
- add_token( 0x056, "2rot" );
- add_token( 0x057, "2/" );
- add_token( 0x058, "u2/" );
- add_token( 0x059, "2*" );
- add_token( 0x05a, "/c" );
- add_token( 0x05b, "/w" );
- add_token( 0x05c, "/l" );
- add_token( 0x05d, "/n" );
- add_token( 0x05e, "ca+" );
- add_token( 0x05f, "wa+" );
- add_token( 0x060, "la+" );
- add_token( 0x061, "na+" );
- add_token( 0x062, "char+" );
- add_token( 0x063, "wa1+" );
- add_token( 0x064, "la1+" );
- add_token( 0x065, "cell+" );
- add_token( 0x066, "chars" );
- add_token( 0x067, "/w*" );
- add_token( 0x068, "/l*" );
- add_token( 0x069, "cells" );
- add_token( 0x06a, "on" );
- add_token( 0x06b, "off" );
- add_token( 0x06c, "+!" );
- add_token( 0x06d, "@" );
- add_token( 0x06e, "l@" );
- add_token( 0x06f, "w@" );
- add_token( 0x070, "<w@" );
- add_token( 0x071, "c@" );
- add_token( 0x072, "!" );
- add_token( 0x073, "l!" );
- add_token( 0x074, "w!" );
- add_token( 0x075, "c!" );
- add_token( 0x076, "2@" );
- add_token( 0x077, "2!" );
- add_token( 0x078, "move" );
- add_token( 0x079, "fill" );
- add_token( 0x07a, "comp" );
- add_token( 0x07b, "noop" );
- add_token( 0x07c, "lwsplit" );
- add_token( 0x07d, "wljoin" );
- add_token( 0x07e, "lbsplit" );
- add_token( 0x07f, "bljoin" );
- add_token( 0x080, "wbflip" );
- add_token( 0x081, "upc" );
- add_token( 0x082, "lcc" );
- add_token( 0x083, "pack" );
- add_token( 0x084, "count" );
- add_token( 0x085, "body>" );
- add_token( 0x086, ">body" );
- add_token( 0x087, "fcode-revision" );
- add_token( 0x088, "span" );
- add_token( 0x089, "unloop" );
- add_token( 0x08a, "expect" );
- add_token( 0x08b, "alloc-mem" );
- add_token( 0x08c, "free-mem" );
- add_token( 0x08d, "key?" );
- add_token( 0x08e, "key" );
- add_token( 0x08f, "emit" );
- add_token( 0x090, "type" );
- add_token( 0x091, "(cr" );
- add_token( 0x092, "cr" );
- add_token( 0x093, "#out" );
- add_token( 0x094, "#line" );
- add_token( 0x095, "hold" );
- add_token( 0x096, "<#" );
- add_token( 0x097, "u#>" );
- add_token( 0x098, "sign" );
- add_token( 0x099, "u#" );
- add_token( 0x09a, "u#s" );
- add_token( 0x09b, "u." );
- add_token( 0x09c, "u.r" );
- add_token( 0x09d, "." );
- add_token( 0x09e, ".r" );
- add_token( 0x09f, ".s" );
- add_token( 0x0a0, "base" );
- add_token( 0x0a1, "convert" );
- add_token( 0x0a2, "$number" );
- add_token( 0x0a3, "digit" );
- add_token( 0x0a4, "-1" );
- add_token( 0x0a5, "0" );
- add_token( 0x0a6, "1" );
- add_token( 0x0a7, "2" );
- add_token( 0x0a8, "3" );
- add_token( 0x0a9, "bl" );
- add_token( 0x0aa, "bs" );
- add_token( 0x0ab, "bell" );
- add_token( 0x0ac, "bounds" );
- add_token( 0x0ad, "here" );
- add_token( 0x0ae, "aligned" );
- add_token( 0x0af, "wbsplit" );
- add_token( 0x0b0, "bwjoin" );
- add_token( 0x0b1, "b(<mark)" );
- add_token( 0x0b2, "b(>resolve)" );
- add_token( 0x0b3, "set-token-table" );
- add_token( 0x0b4, "set-table" );
- add_token( 0x0b5, "new-token" );
- add_token( 0x0b6, "named-token" );
- add_token( 0x0b7, "b(:)" );
- add_token( 0x0b8, "b(value)" );
- add_token( 0x0b9, "b(variable)" );
- add_token( 0x0ba, "b(constant)" );
- add_token( 0x0bb, "b(create)" );
- add_token( 0x0bc, "b(defer)" );
- add_token( 0x0bd, "b(buffer:)" );
- add_token( 0x0be, "b(field)" );
- add_token( 0x0bf, "b(code)" );
- add_token( 0x0c0, "instance" );
- add_token( 0x0c2, "b(;)" );
- add_token( 0x0c3, "b(to)" );
- add_token( 0x0c4, "b(case)" );
- add_token( 0x0c5, "b(endcase)" );
- add_token( 0x0c6, "b(endof)" );
- add_token( 0x0c7, "#" );
- add_token( 0x0c8, "#s" );
- add_token( 0x0c9, "#>" );
- add_token( 0x0ca, "external-token" );
- add_token( 0x0cb, "$find" );
- add_token( 0x0cc, "offset16" );
- add_token( 0x0cd, "evaluate" );
- add_token( 0x0d0, "c," );
- add_token( 0x0d1, "w," );
- add_token( 0x0d2, "l," );
- add_token( 0x0d3, "," );
- add_token( 0x0d4, "um*" );
- add_token( 0x0d5, "um/mod" );
- add_token( 0x0d8, "d+" );
- add_token( 0x0d9, "d-" );
- add_token( 0x0da, "get-token" );
- add_token( 0x0db, "set-token" );
- add_token( 0x0dc, "state" );
- add_token( 0x0dd, "compile" );
- add_token( 0x0de, "behavior" );
- add_token( 0x0f0, "start0" );
- add_token( 0x0f1, "start1" );
- add_token( 0x0f2, "start2" );
- add_token( 0x0f3, "start4" );
- add_token( 0x0fc, "ferror" );
- add_token( 0x0fd, "version1" );
- add_token( 0x0fe, "4-byte-id" );
- add_token( 0x0ff, "end1" );
- add_token( 0x101, "dma-alloc" );
- add_token( 0x102, "my-address" );
- add_token( 0x103, "my-space" );
- add_token( 0x104, "memmap" );
- add_token( 0x105, "free-virtual" );
- add_token( 0x106, ">physical" );
- add_token( 0x10f, "my-params" );
- add_token( 0x110, "property" );
- add_token( 0x111, "encode-int" );
- add_token( 0x112, "encode+" );
- add_token( 0x113, "encode-phys" );
- add_token( 0x114, "encode-string" );
- add_token( 0x115, "encode-bytes" );
- add_token( 0x116, "reg" );
- add_token( 0x117, "intr" );
- add_token( 0x118, "driver" );
- add_token( 0x119, "model" );
- add_token( 0x11a, "device-type" );
- add_token( 0x11b, "parse-2int" );
- add_token( 0x11c, "is-install" );
- add_token( 0x11d, "is-remove" );
- add_token( 0x11e, "is-selftest" );
- add_token( 0x11f, "new-device" );
- add_token( 0x120, "diagnostic-mode?" );
- add_token( 0x121, "display-status" );
- add_token( 0x122, "memory-test-issue" );
- add_token( 0x123, "group-code" );
- add_token( 0x124, "mask" );
- add_token( 0x125, "get-msecs" );
- add_token( 0x126, "ms" );
- add_token( 0x127, "finish-device" );
- add_token( 0x128, "decode-phys" );
- add_token( 0x12b, "interpose" );
- add_token( 0x130, "map-low" );
- add_token( 0x131, "sbus-intr>cpu" );
- add_token( 0x150, "#lines" );
- add_token( 0x151, "#columns" );
- add_token( 0x152, "line#" );
- add_token( 0x153, "column#" );
- add_token( 0x154, "inverse?" );
- add_token( 0x155, "inverse-screen?" );
- add_token( 0x156, "frame-buffer-busy?" );
- add_token( 0x157, "draw-character" );
- add_token( 0x158, "reset-screen" );
- add_token( 0x159, "toggle-cursor" );
- add_token( 0x15a, "erase-screen" );
- add_token( 0x15b, "blink-screen" );
- add_token( 0x15c, "invert-screen" );
- add_token( 0x15d, "insert-characters" );
- add_token( 0x15e, "delete-characters" );
- add_token( 0x15f, "insert-lines" );
- add_token( 0x160, "delete-lines" );
- add_token( 0x161, "draw-logo" );
- add_token( 0x162, "frame-buffer-adr" );
- add_token( 0x163, "screen-height" );
- add_token( 0x164, "screen-width" );
- add_token( 0x165, "window-top" );
- add_token( 0x166, "window-left" );
- add_token( 0x16a, "default-font" );
- add_token( 0x16b, "set-font" );
- add_token( 0x16c, "char-height" );
- add_token( 0x16d, "char-width" );
- add_token( 0x16e, ">font" );
- add_token( 0x16f, "fontbytes" );
- add_token( 0x170, "fb1-draw-character" );
- add_token( 0x171, "fb1-reset-screen" );
- add_token( 0x172, "fb1-toggle-cursor" );
- add_token( 0x173, "fb1-erase-screen" );
- add_token( 0x174, "fb1-blink-screen" );
- add_token( 0x175, "fb1-invert-screen" );
- add_token( 0x176, "fb1-insert-characters" );
- add_token( 0x177, "fb1-delete-characters" );
- add_token( 0x178, "fb1-insert-lines" );
- add_token( 0x179, "fb1-delete-lines" );
- add_token( 0x17a, "fb1-draw-logo" );
- add_token( 0x17b, "fb1-install" );
- add_token( 0x17c, "fb1-slide-up" );
- add_token( 0x180, "fb8-draw-character" );
- add_token( 0x181, "fb8-reset-screen" );
- add_token( 0x182, "fb8-toggle-cursor" );
- add_token( 0x183, "fb8-erase-screen" );
- add_token( 0x184, "fb8-blink-screen" );
- add_token( 0x185, "fb8-invert-screen" );
- add_token( 0x186, "fb8-insert-characters" );
- add_token( 0x187, "fb8-delete-characters" );
- add_token( 0x188, "fb8-insert-lines" );
- add_token( 0x189, "fb8-delete-lines" );
- add_token( 0x18a, "fb8-draw-logo" );
- add_token( 0x18b, "fb8-install" );
- add_token( 0x1a0, "return-buffer" );
- add_token( 0x1a1, "xmit-packet" );
- add_token( 0x1a2, "poll-packet" );
- add_token( 0x1a4, "mac-address" );
- add_token( 0x201, "device-name" );
- add_token( 0x202, "my-args" );
- add_token( 0x203, "my-self" );
- add_token( 0x204, "find-package" );
- add_token( 0x205, "open-package" );
- add_token( 0x206, "close-package" );
- add_token( 0x207, "find-method" );
- add_token( 0x208, "call-package" );
- add_token( 0x209, "$call-parent" );
- add_token( 0x20a, "my-package" );
- add_token( 0x20b, "ihandle>phandle" );
- add_token( 0x20d, "my-unit" );
- add_token( 0x20e, "$call-method" );
- add_token( 0x20f, "$open-package" );
- add_token( 0x210, "processor-type" );
- add_token( 0x211, "firmware-version" );
- add_token( 0x212, "fcode-version" );
- add_token( 0x213, "alarm" );
- add_token( 0x214, "(is-user-word)" );
- add_token( 0x215, "suspend-fcode" );
- add_token( 0x216, "abort" );
- add_token( 0x217, "catch" );
- add_token( 0x218, "throw" );
- add_token( 0x219, "user-abort" );
- add_token( 0x21a, "get-my-property" );
- add_token( 0x21b, "decode-int" );
- add_token( 0x21c, "decode-string" );
- add_token( 0x21d, "get-inherited-property" );
- add_token( 0x21e, "delete-property" );
- add_token( 0x21f, "get-package-property" );
- add_token( 0x220, "cpeek" );
- add_token( 0x221, "wpeek" );
- add_token( 0x222, "lpeek" );
- add_token( 0x223, "cpoke" );
- add_token( 0x224, "wpoke" );
- add_token( 0x225, "lpoke" );
- add_token( 0x226, "lwflip" );
- add_token( 0x227, "lbflip" );
- add_token( 0x228, "lbflips" );
- add_token( 0x229, "adr-mask" );
- add_token( 0x230, "rb@" );
- add_token( 0x231, "rb!" );
- add_token( 0x232, "rw@" );
- add_token( 0x233, "rw!" );
- add_token( 0x234, "rl@" );
- add_token( 0x235, "rl!" );
- add_token( 0x236, "wbflips" );
- add_token( 0x237, "lwflips" );
- add_token( 0x238, "probe" );
- add_token( 0x239, "probe-virtual" );
- add_token( 0x23b, "child" );
- add_token( 0x23c, "peer" );
- add_token( 0x23d, "next-property" );
- add_token( 0x23e, "byte-load" );
- add_token( 0x23f, "set-args" );
- add_token( 0x240, "left-parse-string" );
+ int indx;
- /* FCodes from 64bit extension addendum */
- add_token( 0x22e, "rx@" );
- add_token( 0x22f, "rx!" );
- add_token( 0x241, "bxjoin" );
- add_token( 0x242, "<l@" );
- add_token( 0x243, "lxjoin" );
- add_token( 0x244, "wxjoin" );
- add_token( 0x245, "x," );
- add_token( 0x246, "x@" );
- add_token( 0x247, "x!" );
- add_token( 0x248, "/x" );
- add_token( 0x249, "/x*" );
- add_token( 0x24a, "xa+" );
- add_token( 0x24b, "xa1+" );
- add_token( 0x24c, "xbflip" );
- add_token( 0x24d, "xbflips" );
- add_token( 0x24e, "xbsplit" );
- add_token( 0x24f, "xlflip" );
- add_token( 0x250, "xlflips" );
- add_token( 0x251, "xlsplit" );
- add_token( 0x252, "xwflip" );
- add_token( 0x253, "xwflips" );
- add_token( 0x254, "xwsplit" );
+ dictionary = &detok_table[dictionary_indx_max-1];
+ dictionary_reset_position = dictionary;
+
+ for (indx = 1; indx < dictionary_indx_max ; indx++ )
+ {
+ detok_table[indx].next = &detok_table[indx-1];
+ }
}
+
+void reset_dictionary(void)
+{
+ token_t *next_t;
+
+ next_t = dictionary;
+ while ( next_t != dictionary_reset_position )
+ {
+ next_t = dictionary->next ;
+ free( dictionary->name );
+ free( dictionary );
+ dictionary = next_t ;
+ }
+}
+
+/* If FCodes have been added by User, we need to update reset-position */
+void freeze_dictionary(void)
+{
+ dictionary_reset_position = dictionary;
+}
Added: fcode-utils/detok/pcihdr.c
===================================================================
--- fcode-utils/detok/pcihdr.c (rev 0)
+++ fcode-utils/detok/pcihdr.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,478 @@
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Support function for de-tokenizer.
+ *
+ * Identify and process PCI header at beginning of FCode binary file.
+ * "Processing" consists of recognizing the PCI Header and Data Structure,
+ * optionally printing a description thereof, and (mainly) allowing
+ * the given pointer to be bumped to the start of the actual FCode.
+ *
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ * Revision History:
+ *
+ * Updated Mon, 23 May 2005 by David L. Paktor
+ * Identify "Not Last" header.
+ * Updated Thu, 24 Feb 2005 by David L. Paktor
+ * Per notes after Code Review.
+ * Updated Fri, 04 Feb 2005 by David L. Paktor
+ * Updated Wed, 08 Jun 2005 by David L. Paktor
+ * Added support for multiple-PCI-image files.
+ *
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Functions Eported:
+ * handle_pci_header
+ * Handle all activities connected with presence of
+ * PCI Header/Data at beginning of FCode file, and
+ * facilitate "skipping" over to actual FCode data.
+ *
+ * handle_pci_filler
+ * Skip past "filler" between blocks in multi-PCI-image files.
+ *
+ *
+ **************************************************************************** */
+
+
+/* **************************************************************************
+ *
+ * Still to be done:
+ * Print (as remarks) full descriptions of headers' fields
+ * Error check for wrong "Format"
+ * Skip past non-FCode blocks, thru multiple data-blocks
+ * Recognize PCI header in unexpected place or out-of-place
+ *
+ **************************************************************************** */
+
+#include "pcihdr.h"
+#include <stdio.h>
+
+#include "detok.h"
+
+
+/* **************************************************************************
+ *
+ * Global Variables Exported
+ * pci_image_end Pointer to just after end of current PCI image
+ *
+ **************************************************************************** */
+
+u8 *pci_image_end = NULL;
+
+/* **************************************************************************
+ *
+ * Internal Static Variables
+ * pci_image_len Length (in bytes) of current PCI image
+ *
+ **************************************************************************** */
+
+static int pci_image_len = 0;
+
+
+/* **************************************************************************
+ *
+ * Function name: is_pci_header ( rom_header_t *pci_rom_hdr )
+ * Synopsis: Indicate whether given pointer is pointing to
+ * something that might be a valid PCI header
+ *
+ * Inputs:
+ * Parameters:
+ * pci_rom_hdr pointer to start of data-stream to examine.
+ * Treat as pointer to rom_header_t
+ *
+ * Outputs:
+ * Returned Value: An integer.
+ * 0 Definitely *NOT* a PCI header
+ * Positive Number Appears to be a valid PCI header;
+ * value is offset to PCI Data Structure.
+ * Negative Number Appears to be a PCI header, but
+ * with errors. (Not Implemented Yet.
+ * See under "Still to be done".)
+ *
+ * Error Detection:
+ * (See under "Still to be done".)
+ *
+ * Process Explanation:
+ * Examine "signature" location for known value 0x55aa
+ * If a match, return value of "dptr" (Data-pointer offset) field.
+ *
+ * Revision History:
+ * Created Tue, 01 Feb 2005 by David L. Paktor
+ *
+ * Still to be done:
+ * Error-check; look for inconsistencies:
+ * Return a Negative Number if data-stream appears to be a PCI
+ * header, but has erroneous or inconsistent sub-field contents.
+ * Value and meaning of the Negative Number yet to be defined.
+ *
+ **************************************************************************** */
+
+static int is_pci_header ( rom_header_t *pci_rom_hdr )
+{
+ const u16 pci_header_signature = 0x55aa;
+ int retval ;
+
+ retval = 0;
+
+ if ( BIG_ENDIAN_WORD_FETCH(pci_rom_hdr->signature) == pci_header_signature )
+ {
+ retval = LITTLE_ENDIAN_WORD_FETCH(pci_rom_hdr->data_ptr);
+ }
+ return(retval);
+}
+
+/* **************************************************************************
+ *
+ * Function name: is_pci_data_struct ( pci_data_t *pci_data_ptr )
+ * Synopsis: Indicate whether given pointer is pointing to
+ * a valid PCI Data Structure
+ *
+ * Inputs:
+ * Parameters:
+ * pci_data_ptr pointer to start of data-stream to examine.
+ * Treat as pointer to pci_data_t
+ *
+ * Outputs:
+ * Returned Value: An integer.
+ * 0 Definitely *NOT* a PCI Data Structure
+ * Positive Number Appears to be valid PCI Data Structure;
+ * value is length of PCI Data Structure,
+ * (presumably, offset to start of FCode).
+ * Negative Number Appears to be a PCI Data Structure,
+ * but with errors. (Not Implemented Yet.
+ * See under "Still to be done".)
+ *
+ * Global/Static Variables:
+ * Does not alter the poiner passed-in;
+ * does not alter any Global/Static Variables
+ * Printout: NONE
+ *
+ * Error Detection: (Condition) (Action)
+ * (See under "Still to be done".)
+ *
+ * Process Explanation:
+ * Examine "signature" location for known value "PCIR"
+ * If a match, return value of "dlen" (Data Structure Length) field.
+ *
+ * Revision History:
+ * Created Tue, 01 Feb 2005 by David L. Paktor
+ *
+ * Still to be done:
+ * Error-check; look for wrong "Code Type" or other inconsistencies:
+ * Return a Negative Number if data-stream appears to be a
+ * valid PCI Data Structure, but has erroneous or inconsistent
+ * sub-field contents.
+ * Value and meaning of the Negative Number yet to be defined.
+ * Skip past non-FCode data-blocks, even multiple blocks
+ *
+ **************************************************************************** */
+
+static int is_pci_data_struct ( pci_data_t *pci_data_ptr )
+{
+ int retval ;
+
+ retval = 0;
+
+ if (BIG_ENDIAN_LONG_FETCH(pci_data_ptr->signature) == PCI_DATA_HDR)
+ {
+ retval = LITTLE_ENDIAN_WORD_FETCH(pci_data_ptr->dlen);
+ }
+ return(retval);
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: announce_pci_hdr ( rom_header_t *pci_rom_hdr )
+ * Synopsis: Print indication that the PCI header was found,
+ * and other details, formatted as FORTH remarks.
+ *
+ * Inputs:
+ * Parameters:
+ * pci_rom_hdr Pointer to start of PCI header.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout: Announcement. Size of data_ptr field.
+ *
+ **************************************************************************** */
+
+static void announce_pci_hdr ( rom_header_t *pci_rom_hdr )
+{
+ char temp_buf[80];
+ u32 temp;
+
+ printremark ( "PCI Header identified");
+ temp=(u32)LITTLE_ENDIAN_WORD_FETCH(pci_rom_hdr->data_ptr);
+ sprintf(temp_buf, " Offset to Data Structure = 0x%04x (%d)\n",
+ temp, temp);
+ printremark ( temp_buf );
+}
+
+/* **************************************************************************
+ *
+ * Function name: announce_pci_data_struct ( pci_data_t *pci_data_ptr )
+ * Synopsis: Print indication that the PCI Data Structure
+ * was found, and some additional details.
+ * Format as FORTH remarks.
+ *
+ * Inputs:
+ * Parameters:
+ * pci_data_ptr Pointer to start of PCI Data Structure.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global/Static Variables:
+ * pci_image_len Updated to byte-length of current PCI image
+ * Printout: (See Synopsis)
+ *
+ * Process Explanation:
+ * Extract some details, format and print them,
+ * using the syntax of FORTH remarks.
+ *
+ * Revision History:
+ * Created Tue, 01 Feb 2005 by David L. Paktor
+ * Updated Wed, 25 May 2005 by David L. Paktor
+ * Added printout of several fields...
+ *
+ **************************************************************************** */
+
+static void announce_pci_data_struct ( pci_data_t *pci_data_ptr )
+{
+ char temp_buf[80];
+ u32 temp;
+
+ printremark ( "PCI Data Structure identified");
+
+ temp=(u32)LITTLE_ENDIAN_WORD_FETCH(pci_data_ptr->dlen);
+ sprintf(temp_buf, " Data Structure Length = 0x%04x (%d)\n", temp, temp);
+ printremark ( temp_buf );
+
+ sprintf(temp_buf, " Vendor ID: 0x%04x\n",
+ LITTLE_ENDIAN_WORD_FETCH(pci_data_ptr->vendor));
+ printremark ( temp_buf );
+
+ sprintf(temp_buf, " Device ID: 0x%04x\n",
+ LITTLE_ENDIAN_WORD_FETCH(pci_data_ptr->device));
+ printremark ( temp_buf );
+
+ temp=(u32)CLASS_CODE_FETCH(pci_data_ptr->class_code);
+ sprintf(temp_buf, " Class Code: 0x%06x (%s)",
+ temp, pci_device_class_name(temp));
+ printremark ( temp_buf );
+
+ temp=(u32)LITTLE_ENDIAN_WORD_FETCH(pci_data_ptr->vpd);
+ if ( temp != 0 )
+ {
+ sprintf(temp_buf, " Vital Prod Data: 0x%02x\n", temp);
+ printremark ( temp_buf );
+ }
+
+ temp=(u32)LITTLE_ENDIAN_WORD_FETCH(pci_data_ptr->irevision);
+ if ( temp != 0 )
+ {
+ sprintf(temp_buf, " Image Revision: 0x%02x\n", temp);
+ printremark ( temp_buf );
+ }
+
+ sprintf(temp_buf, " Code Type: 0x%02x (%s)\n", pci_data_ptr->code_type,
+ pci_code_type_name(pci_data_ptr->code_type) );
+ printremark ( temp_buf );
+
+ temp=(u32)LITTLE_ENDIAN_WORD_FETCH(pci_data_ptr->ilen);
+ pci_image_len = temp*512;
+ sprintf(temp_buf, " Image Length: 0x%04x blocks (%d bytes)\n",
+ temp, pci_image_len);
+ printremark ( temp_buf );
+
+ sprintf(temp_buf, " %sast PCI Image.\n",
+ pci_data_ptr->last_image_flag&&0x80 != 0 ? "L" : "Not l");
+ printremark ( temp_buf );
+
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: handle_pci_header
+ * Synopsis: Handle PCI Header/Data at beginning of FCode file;
+ * facilitate "skipping" over to actual FCode data.
+ *
+ * Inputs:
+ * Parameters:
+ * data_ptr Pointer to start of data-stream to examine.
+ * Global/Static Variables:
+ * pci_image_len Length (in bytes) of current PCI image
+ *
+ * Outputs:
+ * Returned Value:
+ * Positive Number. Offset to start of FCode.
+ * Zero If no PCI header; may be treated as
+ * a valid offset.
+ * Negative Number PCI header or PCI Data Structure test
+ * returned error indication.
+ * (Not Implemented Yet. See
+ * under "Still to be done".)
+ * Global/Static Variables:
+ * pci_image_end Pointer to just after the end of
+ * the current PCI image
+ * Printout: As FORTH remarks, print indications that the
+ * PCI header was found, and maybe later more data.
+ *
+ * Error Detection: (Condition) (Action)
+ * (See under "Still to be done".)
+ *
+ * Process Explanation:
+ * Use the various support routines defined below.
+ *
+ *
+ * Revision History:
+ *
+ * Updated Wed, 09 Feb 2005 by David L. Paktor
+ * Extracted assignments from within if( ) statements.
+ *
+ * Created Tue, 01 Feb 2005 by David L. Paktor
+ *
+ * Still to be done:
+ * Handle error cases. At present, neither is_pci_header()
+ * nor is_pci_data_struct() returns a negative number,
+ * but when they are modified to do so, we must handle it.
+ *
+ **************************************************************************** */
+
+int handle_pci_header ( u8 *data_ptr )
+{
+ int hdrlen;
+ int data_struc_len;
+ /* int retval; */ /* Not needed until we handle error cases... */
+
+ data_struc_len = 0;
+
+ hdrlen = is_pci_header( (rom_header_t *)data_ptr );
+ /* retval = hdrlen; */ /* Not needed yet... */
+ if ( hdrlen < 0 )
+ {
+ /* Handle error case... */
+ /* Leave null for now... */
+ /* It might need to do a premature EXIT here... */
+ } else {
+ /* if hdrlen == 0 then we don't need to check a Data Structure */
+ if ( hdrlen > 0 )
+ {
+ announce_pci_hdr ( (rom_header_t *)data_ptr );
+ data_struc_len = is_pci_data_struct(
+ (pci_data_t *) &data_ptr[hdrlen] );
+ /*
+ * A Data Structure Length of Zero would be an error
+ * that could be detected by is_pci_data_struct()
+ */
+ if ( data_struc_len <= 0 )
+ {
+ /* Handle error case... */
+ /* Leave null for now... */
+ /* It might need to do a premature EXIT here... */
+ /* retval = -1; */ /* Not needed yet... */
+ } else {
+ announce_pci_data_struct ( (pci_data_t *) &data_ptr[hdrlen] );
+ pci_image_end = data_ptr + pci_image_len;
+ /* retval = hdrlen+data_struc_len; */ /* Not needed yet... */
+ }
+ }
+ }
+ return (hdrlen+data_struc_len);
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: handle_pci_filler
+ * Synopsis: Examine and report on the "filler" padding after the
+ * end of an FCode-block but still within a PCI-image
+ *
+ * Inputs:
+ * Parameters:
+ * filler_ptr Pointer to start of PCI-filler in data-stream
+ * Global/Static Variables:
+ * pci_image_end Pointer to just after the end of
+ * the current PCI image
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout:
+ * Descriptive message.
+ *
+ * Error Detection:
+ * Non-zero filler field. Different message.
+ *
+ * Process Explanation:
+ * The calling routine has checked that there was, indeed, a PCI
+ * header present, so we know that pci_image_end is valid.
+ * If the entire filler is zero-bytes, print a simple message and
+ * we're out'a here!
+ * If there are non-zero bytes, identify loc'n of first non-zero.
+ *
+ * Still to be done:
+ * Come up with something more elegant for non-zero filler.
+ *
+ **************************************************************************** */
+
+void handle_pci_filler(u8 *filler_ptr)
+{
+ u8 *scan_ptr;
+ int filler_len;
+ char temp_buf[80];
+ bool all_zero = TRUE;
+ u8 filler_byte = *filler_ptr;
+
+ filler_len = pci_image_end - filler_ptr;
+
+ for ( scan_ptr = filler_ptr;
+ scan_ptr < pci_image_end;
+ filler_byte = *(++scan_ptr) )
+ {
+ if ( filler_byte != 0 )
+ {
+ all_zero = FALSE;
+ break;
+ }
+ }
+
+ if ( all_zero )
+ {
+ sprintf(temp_buf, "PCI Image padded with %d bytes of zero", filler_len);
+ }else{
+ sprintf(temp_buf, "PCI Image padding-field of %d bytes "
+ "had first non-zero byte at offset %ld",
+ filler_len, scan_ptr - filler_ptr );
+ }
+ printremark ( temp_buf );
+}
Added: fcode-utils/detok/printformats.c
===================================================================
--- fcode-utils/detok/printformats.c (rev 0)
+++ fcode-utils/detok/printformats.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,140 @@
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Print, in various controlled formats, for the detokenizer.
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Ultimately, our goal is to produce output that can be run back
+ * through the tokenizer and produce the same binary. So, any
+ * extra text will have to be in a form that the tokenizer will
+ * treat as comments.
+ *
+ **************************************************************************** */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "detok.h"
+
+
+/* **************************************************************************
+ *
+ * Function name: printremark ( string )
+ * Synopsis: Print the given string as a series of "Remark" lines,
+ * (i.e., preceded by backslash-space)
+ *
+ * Inputs:
+ * Parameters:
+ * str Pointer to the start of the string,
+ * however long it may be. The string
+ * may have any number of embedded new-lines.
+ *
+ * Outputs:
+ * Returned Value: *** NONE***
+ * Printout: Each line of the string will be preceded by
+ * a backslash and two spaces. Backslash-space
+ * is the standard delimiter for a "remark", i.e.
+ * the entire line is ignored as a comment. The
+ * second space is "just" for aesthetics.
+ *
+ * Process Explanation:
+ * Parse the input string for new-lines. Print each separately.
+ * Do not alter the input string.
+ *
+ *
+ * Still to be done:
+ * Define a routine, call it PrintComment , to print the given
+ * string surrounded by open-paren-space ... space-close-paren
+ * Define a single central routine, call it safe_malloc ,
+ * to do the test for null and print "No Memory" and exit.
+ * Define a single central routine, call it PrintError , to:
+ * Print the given error message
+ * Show the input file and line number
+ * Collect error-flags for failure-exit at end of operation.
+ *
+ **************************************************************************** */
+
+void printremark ( char *str)
+{
+ char *strtmp ; /* Temporary pointer to current substring */
+ int substrlen ; /* Length of current substring */
+ char *substrend ; /* Pointer to end of current substring */
+ char *strend ; /* Pointer to end of given string */
+
+ char *strbfr ; /* Temporary substring buffer */
+
+ /* Guarantee that the malloc will be big enough. */
+ strbfr = (char *)malloc(strlen((char *)str)+1);
+ if ( !strbfr )
+ {
+ printf ("No memory.\n");
+ exit(-1);
+ }
+
+
+ strtmp = str;
+ strend = &str[strlen(str)];
+
+ /* ******************************************************************
+ *
+ * Isolate the current substring; allow that the given
+ * string might not be terminated with a new-line.
+ *
+ * The strend pointer provides a convenient means to
+ * test for when we've reached the end.
+ *
+ ******************************************************************** */
+
+ while ( strtmp < strend )
+ {
+ substrend = strchr(strtmp , '\n');
+ substrlen = ( substrend ? (substrend-strtmp) : strlen(strtmp) );
+
+ strncpy (strbfr, strtmp, substrlen);
+ /* **********************************************************
+ *
+ * strncpy() does not append a terminating null character,
+ * so we have to.
+ *
+ ************************************************************ */
+ strbfr[substrlen] = (char)0;
+
+ printf("\\ %s\n",strbfr);
+
+ strtmp = &strtmp[ substrlen + ( substrend ? 1 : 0 ) ] ;
+
+ }
+
+ free(strbfr) ;
+}
+
Modified: fcode-utils/detok/stream.c
===================================================================
--- fcode-utils/detok/stream.c 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/detok/stream.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -24,20 +24,60 @@
*
*/
+/* **************************************************************************
+ * Modifications made in 2005 by IBM Corporation
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Modifications Author: David L. Paktor dlpaktor(a)us.ibm.com
+ **************************************************************************** */
+
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <sys/stat.h>
+#include <setjmp.h>
+#include "stream.h"
#include "detok.h"
+#include "pcihdr.h"
-extern bool offs16;
-extern u32 fcpos;
+extern jmp_buf eof_exception;
+/* **************************************************************************
+ *
+ * Global Variables Exported:
+ * Name Value
+ * fcode The FCode-token last read. Not necessarily the byte
+ * last read, if its function has in-line parameters
+ * stream_max The maximum position -- length -- of the input stream
+ * pc Pointer to "Current byte" in the input-data image.
+ * max Just after the end of the input-data image.
+ * This is *NOT* a byte-count.
+ *
+ **************************************************************************** */
+
u16 fcode;
-u8 inbyte;
+unsigned int stream_max;
+u8 *pc;
+u8 *max;
-static u8 *indata, *pc, *max;
+/* **************************************************************************
+ *
+ * Local/Static Variables:
+ * Name Pointer to:
+ * indata Start of input-data image taken from input file.
+ * This memory was "malloc"ed; keep it around
+ * for when we "free" that memory.
+ * fc_start Start of the FCode. This might not be the same
+ * as the start of the input file data, especially
+ * if the input file data starts with a PCI header.
+ * pci_image_found TRUE iff a valid PCI header was found
+ *
+ **************************************************************************** */
+u8 *indata;
+static u8 *fc_start;
+static bool pci_image_found = FALSE;
+
int init_stream(char *name)
{
FILE *infile;
@@ -62,119 +102,455 @@
fclose(infile);
pc=indata;
+ fc_start = indata;
max=pc+finfo.st_size;
+ stream_max = finfo.st_size;
+
return 0;
}
-int close_stream(void)
+/* **************************************************************************
+ *
+ * Function name: init_fcode_block
+ * Synopsis: Initialize all pointers and variables, etcetera,
+ * for an FCode-block.
+ *
+ **************************************************************************** */
+
+void init_fcode_block(void)
{
+ fc_start = pc;
+ linenum = 1 ;
+}
+
+
+void close_stream(void)
+{
free(indata);
- return 0;
+ stream_max = 0;
}
int get_streampos(void)
{
- return (int)((long)pc-(long)indata);
+ return (int)( pc - fc_start );
}
-void set_streampos(long pos)
+void set_streampos(int pos)
{
- pc=indata+pos;
+ pc = fc_start + pos;
}
-static int get_byte(void)
+
+/* **************************************************************************
+ *
+ * Function name: throw_eof
+ * Synopsis: Analyze and print the cause of the end-of-file
+ * and throw an exception.
+ *
+ * Inputs:
+ * Parameters:
+ * premature TRUE iff end-of-file was out-of-sync
+ * Global/Static Variables:
+ * end_found Indicates if normal end of fcode was read.
+ * eof_exception Long-Jump environment to which to jump.
+ *
+ * Outputs: Does a Long-Jump
+ * Returned Value: NONE
+ * Printout:
+ * "End-of-file" message, along with a descriptor, if applicable:
+ * Premature, Unexpected.
+ * The calling routine notifies us if the number of bytes requested
+ * overflowed the input buffer, by passing us a TRUE for the
+ * input parameter. That is a "Premature" end-of-file.
+ * If end_found is FALSE, it means the normal end of FCode
+ * wasn't seen. That is an "Unexpected" end-of-file.
+ *
+ **************************************************************************** */
+
+static void throw_eof(bool premature)
{
- inbyte=*pc;
- pc++;
+ char yoo = 'U';
+ char eee = 'E';
+ if ( premature)
+ {
+ printf("Premature ");
+ yoo = 'u';
+ eee = 'e';
+ }
+ if ( ! end_found )
+ {
+ printf("%cnexpected ",yoo);
+ eee = 'e';
+ }
+ printf("%cnd of file.\n",eee);
+ longjmp(eof_exception, -1);
+}
- if (pc>max) {
- printf ("\nUnexpected end of file.\n");
- return 0;
+/* **************************************************************************
+ *
+ * Function name: get_bytes
+ * Synopsis: Return the next string of bytes, as requested, from
+ * the FCode input-stream. Detect end-of-file
+ *
+ * Inputs:
+ * Parameters:
+ * nbytes The number of bytes requested
+ * Global/Static Variables:
+ * pc Pointer to "where we are" in the FCode
+ * max Pointer to just after end of input file data.
+ *
+ * Outputs:
+ * Returned Value:
+ * Pointer to the requested bytes in the FCode input-stream.
+ * Global/Static Variables:
+ * pc Incremented by the number of bytes requested
+ *
+ * Exception:
+ * When end-of-file is reached, or is about to be exceeded,
+ * throw an end-of-file exception.
+ *
+ * Process Explanation:
+ * End-of-file is not exactly an error, so its detection is more
+ * a part of normal processing.
+ * If we entered this routine with PC pointing exactly at MAX,
+ * we are probably at the end the way we expect to be, so we
+ * call our EOF-handling routine with a "non-premature" flag.
+ * If the requested number of bytes puts us just even with MAX,
+ * we have neither reached nor over-run the input stream, so
+ * there's no call to our EOF-handling routine needed at all.
+ * Only if the requested number of bytes puts us past MAX have we
+ * over-run our input stream with a "premature" condition.
+ *
+ * Extraneous Remarks:
+ * This is another one where it was easier to write the code
+ * than the explanation ... ;-}
+ *
+ **************************************************************************** */
+
+static u8 *get_bytes(int nbytes)
+{
+ u8 *retval = pc;
+ if ( pc == max )
+ {
+ throw_eof(FALSE);
+ }
+ if ( pc + nbytes > max )
+ {
+ throw_eof(TRUE);
+ }
+ pc += nbytes;
+ return( retval);
}
- return 1;
+
+/* **************************************************************************
+ *
+ * Function name: more_to_go
+ * Synopsis: Return FALSE when the last byte has been
+ * read from the input-stream.
+ *
+ **************************************************************************** */
+
+bool more_to_go(void)
+{
+ bool retval;
+ retval = INVERSE( pc == max );
+ return( retval);
}
-u16 get_token(void)
+
+/* **************************************************************************
+ *
+ * Function name: next_token
+ * Synopsis: Retrieve the next FCode-token from the input-stream.
+ *
+ * Inputs:
+ * Parameters: NONE
+ *
+ * Outputs:
+ * Returned Value: The next FCode-token
+ * Global/Static Variables:
+ * fcode The FCode-token last read.
+ * token_streampos Streampos() of token just gotten
+ *
+ **************************************************************************** */
+
+u16 next_token(void)
{
u16 tok;
- get_byte();
- tok=inbyte;
- if (tok != 0x00 && tok < 0x10) {
- get_byte();
+ token_streampos = get_streampos();
+ tok = *(get_bytes(1));
+ if ( tok != 0x00 && tok < 0x10)
+ {
tok<<=8;
- tok|=inbyte;
+ tok |= *(get_bytes(1));
}
fcode=tok;
- return tok;
+ return(tok);
}
u32 get_num32(void)
{
- u32 ret;
+ u32 retval;
+ u8 *num_str;
- get_byte();
- ret=inbyte<<24;
- get_byte();
- ret|=(inbyte<<16);
- get_byte();
- ret|=(inbyte<<8);
- get_byte();
- ret|=inbyte;
+ num_str = get_bytes(4);
+ retval = BIG_ENDIAN_LONG_FETCH(num_str);
- return ret;
+ return ( retval);
}
u16 get_num16(void)
{
- u16 ret;
+ u16 retval;
+ u8 *num_str;
- get_byte();
- ret=inbyte<<8;
- get_byte();
- ret|=inbyte;
+ num_str = get_bytes(2);
+ retval = BIG_ENDIAN_WORD_FETCH(num_str);
- return ret;
+ return ( retval);
}
u8 get_num8(void)
{
- get_byte();
+ u8 inbyte;
+
+ inbyte = *(get_bytes(1));
return(inbyte);
}
-u16 get_offset(void)
+s16 get_offset(void)
{
+ s16 retval;
if (offs16)
- return (get_num16());
+ {
+ retval = (s16)get_num16();
+ }else{
+ retval = (s16)get_num8();
+ /* Make sure it's sign-extended */
+ retval |= ( retval & 0x80 ) ? 0xff00 : 0 ;
+ }
- return (get_num8());
+ return (retval);
}
+/* **************************************************************************
+ *
+ * Function name: get_string
+ * Synopsis: Return a pointer to a Forth-Style string within the
+ * input stream. Note: this cannot be used to create
+ * a new token-name; use get_name() for that.
+ *
+ * Inputs:
+ * Parameters:
+ * *len Pointer to where the length will go
+ *
+ * Outputs:
+ * Returned Value:
+ * Pointer to the string within the input stream.
+ * Supplied Pointers:
+ * *len Length of the string
+ *
+ * Process Explanation:
+ * Get one byte representing the length of the FORTH-style string.
+ * Get as many bytes as the length indicates.
+ * That's the string. The pointer returned by get_bytes() is
+ * our return value.
+ *
+ **************************************************************************** */
-int scnt=0;
-u8 *get_string(void)
+u8 *get_string(u8 *len)
{
- u8 *data;
- u8 size;
- unsigned int i;
+ char *retval;
+
+ *len = get_num8();
+ retval = get_bytes((int)*len);
- get_byte();
- size=inbyte;
+ return (retval);
+}
- scnt++;
- data=malloc(size+2);
- if (!data) printf ("No more memory.\n");
- data[0]=size;
+/* **************************************************************************
+ *
+ * Function name: get_name
+ * Synopsis: Retrieve a copy of the next string in the input-stream
+ * when it is expected to be a new function-name.
+ *
+ * Inputs:
+ * Parameters:
+ * *len Pointer to where the length will go
+ * Global/Static Variables:
+ * pc "Where we are" in the file-stream
+ *
+ * Outputs:
+ * Returned Value:
+ * Pointer to allocated memory containing a copy of the string
+ * Supplied Pointers:
+ * *len Length of the name
+ * Memory Allocated
+ * Memory for the copy of the string is allocated by strdup()
+ * When Freed?
+ * Never. Retained for duration of the program.
+ *
+ * Process Explanation:
+ * Get the FORTH-style string.
+ * At this point, PC points to the byte that follows the string;
+ * we are going to save that byte and replace it with a zero,
+ * thus creating a C-style string.
+ * We will pass that C-style string as an argument to strdup() ,
+ * which will give us our return value.
+ * Then, of course, we restore the byte we so rudely zeroed, and
+ * proceed merrily on our way.
+ *
+ **************************************************************************** */
+
+char *get_name(u8 *len)
+{
+ char *str_start;
+ char *retval;
+ u8 sav_byt;
- for (i=1; i<size+1; i++) {
- get_byte();
- data[i]=inbyte;
+ str_start = get_string( len );
+
+ sav_byt = *pc;
+ *pc = 0;
+
+ retval = strdup(str_start);
+ *pc = sav_byt;
+
+ return (retval);
}
- data[i]=0;
- return data;
+/* **************************************************************************
+ *
+ * Function name: calc_checksum
+ * Synopsis: Calculate the checksum.
+ * Leave the input position unchanged.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global/Static Variables:
+ * pc Pointer to "where we are" in the file-stream
+ *
+ * Outputs:
+ * Returned Value: Calculated checksum.
+ * Global/Static Variables:
+ * pc Reset to value upon entry
+ *
+ * Process Explanation:
+ * When this routine is entered, the PC is presumed to be pointing
+ * just after the stored checksum, and just before the length
+ * field in the FCode header. This is the point at which we
+ * will preserve the PC
+ * Extract the length from the FCode header. It includes the eight
+ * bytes of the FCode header, so we will need to adjust for that.
+ * The first byte after the FCode header is where the checksum
+ * calculation begins.
+ *
+ **************************************************************************** */
+
+u16 calc_checksum(void)
+{
+ u16 retval = 0;
+ u8 *cksmptr;
+ u8 *save_pc;
+ u32 fc_blk_len;
+ int indx;
+
+ save_pc = pc;
+
+ fc_blk_len = get_num32(); /* Read len */
+ cksmptr = get_bytes(fc_blk_len-8); /* Make sure we have all our data */
+
+ for ( indx = 8; indx < fc_blk_len; indx++)
+ {
+ retval += *cksmptr++;
}
+ pc = save_pc;
+ return( retval);
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: adjust_for_pci_header
+ * Synopsis: Skip the PCI Header. Adjust the pointer to
+ * the start of FCode in the file-stream,
+ * and our pointer to "where we are" in the FCode,
+ * by the size of the PCI header.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global/Static Variables: (Pointer to:)
+ * pc "where we are" in the file-stream
+ * fc_start start of FCode in the file-stream
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global/Static Variables:
+ * pc Advanced past PCI header
+ * fc_start Likewise.
+ * pci_image_found Set or cleared as appropriate.
+ * last_defined_token Re-initialized
+ *
+ * Process Explanation:
+ * Call handle_pci_header to get the size of the PCI header,
+ * if any, and increment pc and fc_start by the number
+ * of bytes it returns; also, set pci_image_found based
+ * on whether the "size of the PCI header" was non-zero.
+ * (Re-)Initialize overlap detection here. Images with multiple
+ * PCI blocks can safely re-cycle FCode numbers; this is
+ * not necessarily true of multiple FCode blocks within
+ * the same PCI block...
+ *
+ **************************************************************************** */
+
+void adjust_for_pci_header(void)
+{
+ int pci_header_size;
+
+ pci_header_size = handle_pci_header(pc);
+ pci_image_found = pci_header_size > 0 ? TRUE : FALSE;
+ pc += pci_header_size;
+ fc_start += pci_header_size;
+ last_defined_token = 0;
+}
+
+/* **************************************************************************
+ *
+ * Function name: adjust_for_pci_filler
+ * Synopsis: Dispatch call to pci-filler-handler
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global/Static Variables:
+ * pci_image_found Whether to proceed...
+ * pci_image_end Pointer to just after the end of
+ * the current PCI image
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global/Static Variables:
+ * pci_image_found Reset to FALSE
+ *
+ * Error Detection:
+ * Confirm that the data-stream has the complete filler,
+ * via a call to get_bytes()
+ *
+ **************************************************************************** */
+
+void adjust_for_pci_filler(void)
+{
+ if ( pci_image_found )
+ {
+ int pci_filler_len;
+ u8 *pci_filler_ptr;
+
+ pci_filler_len = pci_image_end - pc;
+ pci_filler_ptr = get_bytes(pci_filler_len);
+ handle_pci_filler( pci_filler_ptr );
+ pci_image_found = FALSE;
+ }
+}
Modified: fcode-utils/detok/stream.h
===================================================================
--- fcode-utils/detok/stream.h 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/detok/stream.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -1,3 +1,6 @@
+#ifndef _UTILS_DETOK_STREAM_H
+#define _UTILS_DETOK_STREAM_H
+
/*
* OpenBIOS - free your system!
* ( detokenizer )
@@ -24,16 +27,42 @@
*
*/
+/* **************************************************************************
+ * Modifications made in 2005 by IBM Corporation
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Modifications Author: David L. Paktor dlpaktor(a)us.ibm.com
+ **************************************************************************** */
+
+#include "types.h"
+
+/* Prototypes for functions exported from stream.c */
+
+
int init_stream(char *name);
-int close_stream(void);
+void close_stream(void);
+bool more_to_go(void);
+void adjust_for_pci_header(void);
+void adjust_for_pci_filler(void);
+void init_fcode_block(void);
+
int get_streampos(void);
-void set_streampos(long pos);
+void set_streampos(int pos);
-u16 get_token(void);
+u16 next_token(void);
u8 get_num8(void);
u16 get_num16(void);
u32 get_num32(void);
-u16 get_offset(void);
-u8 *get_string(void);
+s16 get_offset(void);
+u8 *get_string(u8 *len);
+char *get_name(u8 *len);
+u16 calc_checksum(void);
+/* External declarations for variables defined in stream.c */
+
+extern unsigned int stream_max;
+extern u8 *indata;
+extern u8 *pc;
+extern u8 *max;
+
+#endif /* _UTILS_DETOK_STREAM_H */
Modified: fcode-utils/romheaders/Makefile
===================================================================
--- fcode-utils/romheaders/Makefile 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/romheaders/Makefile 2006-08-18 12:47:12 UTC (rev 76)
@@ -21,20 +21,21 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
#
-
CC = gcc
-CFLAGS= -O2 -Wall -W -ansi
+CFLAGS= -O2 -Wall -W -ansi -I../shared
-.SUFFIXES: .c .o
+SOURCES = romheaders.c ../shared/classcodes.c
+.SUFFIXES: .c
+
all: romheaders
-romheaders: romheaders.o
- $(CC) $(CFLAGS) romheaders.o -o romheaders
+romheaders: $(SOURCES)
+ $(CC) $(CFLAGS) $(SOURCES) -o $@
strip romheaders
clean:
- rm -f *.o
+ rm -f *~
distclean: clean
rm -f romheaders
Modified: fcode-utils/romheaders/romheaders.c
===================================================================
--- fcode-utils/romheaders/romheaders.c 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/romheaders/romheaders.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -23,6 +23,11 @@
*
*/
+/* **************************************************************************
+ * Modifications made in 2005 by IBM Corporation
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Modifications Author: David L. Paktor dlpaktor(a)us.ibm.com
+ **************************************************************************** */
#include <stdio.h>
#include <stdlib.h>
@@ -30,60 +35,32 @@
#include <sys/stat.h>
#include <unistd.h>
-#define u8 unsigned char
-#define u16 unsigned short
-#define u32 unsigned int
+#include "pcihdr.h"
-#define PCI_DATA_HDR (u32) ( ('R' << 24) | ('I' << 16) | ('C' << 8) | 'P' )
-
-typedef struct {
- u16 signature;
- u8 reserved[0x16];
- u16 dptr;
-} rom_header_t;
-
-typedef struct {
- u32 signature;
- u16 vendor;
- u16 device;
- u16 reserved_1;
- u16 dlen;
- u8 drevision;
- u8 class_hi;
- u16 class_lo;
- u16 ilen;
- u16 irevision;
- u8 type;
- u8 indicator;
- u16 reserved_2;
-} pci_data_t;
-
char *rom=NULL;
size_t romlen=0;
-/* make this endian safe without fancy system headers */
-static u16 little_word(u16 val)
-{
- u8 *ptr=(u8 *)&val;
- return (ptr[0]|(ptr[1]<<8));
-}
+/* Prototypes for functions exported from shared/classcodes.c */
-static u16 little_dword(u16 val)
-{
- u8 *ptr=(u8 *)&val;
- return (ptr[0]|(ptr[1]<<8)|(ptr[2]<<16)|(ptr[3]<<24));
-}
+char *pci_device_class_name(u32 code);
+char *pci_code_type_name(unsigned char code);
-/* dump the rom headers */
+/* Functions local to this file:
+ int dump_rom_header(rom_header_t *data);
+ int dump_pci_data(pci_data_t *data);
+ void dump_platform_extensions(u8 type, rom_header_t *data);
+ */
+
static int dump_rom_header(rom_header_t *data)
-{
- u16 sig=little_word(data->signature);
+{ /* Return TRUE for "no problem" */
+ const u16 pci_header_signature = 0x55aa;
+ u16 sig=BIG_ENDIAN_WORD_FETCH(data->signature);
int i;
printf ("PCI Expansion ROM Header:\n");
- printf (" Signature: 0x%02x%02x (%s)\n",
- sig&0xff,sig>>8,sig==0xaa55?"Ok":"Not Ok");
+ printf (" Signature: 0x%04x (%s)\n",
+ sig, sig == pci_header_signature ? "Ok":"Not Ok");
printf (" CPU unique data:");
for (i=0;i<16;i++) {
@@ -92,97 +69,41 @@
}
printf ("\n Pointer to PCI Data Structure: 0x%04x\n\n",
- little_word(data->dptr));
+ LITTLE_ENDIAN_WORD_FETCH(data->data_ptr));
- return (sig==0xaa55);
+ return (sig == pci_header_signature);
}
static int dump_pci_data(pci_data_t *data)
-{
- u32 sig=little_dword(data->signature);
- u32 classcode=(data->class_hi<<16)|(little_word(data->class_lo));
+{ /* Return TRUE for "no problem" */
+ const u32 pci_data_hdr = PCI_DATA_HDR ;
+
+ u32 sig = BIG_ENDIAN_LONG_FETCH(data->signature);
+ u32 classcode= CLASS_CODE_FETCH(data->class_code);
+ u32 dlen = (u32)LITTLE_ENDIAN_WORD_FETCH(data->dlen);
+ u32 ilen = (u32)LITTLE_ENDIAN_WORD_FETCH(data->ilen);
printf("PCI Data Structure:\n");
- printf(" Signature: '%c%c%c%c' (%s)\n", sig&0xff,(sig>>8)&0xff,
- (sig>>16)&0xff, sig>>24, sig==PCI_DATA_HDR?"Ok":"Not Ok");
- printf(" Vendor ID: 0x%04x\n", little_word(data->vendor));
- printf(" Device ID: 0x%04x\n", little_word(data->device));
- printf(" Reserved: 0x%04x\n", little_word(data->reserved_1));
- printf(" PCI Data Structure Length: 0x%04x (%d bytes)\n",
- little_word(data->dlen), little_word(data->dlen));
+ printf(" Signature: 0x%04x '%c%c%c%c' ", sig,
+ sig>>24,(sig>>16)&0xff, (sig>>8)&0xff, sig&0xff);
+ printf("(%s)\n", sig == pci_data_hdr ?"Ok":"Not Ok");
+
+ printf(" Vendor ID: 0x%04x\n", LITTLE_ENDIAN_WORD_FETCH(data->vendor));
+ printf(" Device ID: 0x%04x\n", LITTLE_ENDIAN_WORD_FETCH(data->device));
+ printf(" Vital Product Data: 0x%04x\n",
+ LITTLE_ENDIAN_WORD_FETCH(data->vpd));
+ printf(" PCI Data Structure Length: 0x%04x (%d bytes)\n", dlen, dlen);
printf(" PCI Data Structure Revision: 0x%02x\n", data->drevision);
- printf(" Class Code: 0x%06x (",classcode);
- switch (classcode) {
- case 0x0100:
- printf("SCSI Storage");
- break;
- case 0x0101:
- printf("IDE Storage");
- break;
- case 0x0103:
- printf("IPI Storage");
- break;
- case 0x0104:
- printf("RAID Storage");
- break;
- case 0x0180:
- printf("Storage");
- break;
-
- case 0x0200:
- printf("Ethernet");
- break;
- case 0x0201:
- printf("Token Ring");
- break;
- case 0x0202:
- printf("FDDI");
- break;
- case 0x0203:
- printf("ATM");
- break;
- case 0x0280:
- printf("Network");
-
- case 0x0300:
- printf("VGA Display");
- break;
- case 0x0301:
- printf("XGA Display");
- break;
- case 0x0302:
- printf("3D Display");
- break;
- case 0x0380:
- printf("Display");
- break;
-
- default:
- printf("unkown");
- }
- printf(")\n Image Length: 0x%04x blocks (%d bytes)\n",
- little_word(data->ilen), little_word(data->ilen)*512);
+ printf(" Class Code: 0x%06x (%s)\n",classcode,
+ pci_device_class_name(classcode));
+ printf(" Image Length: 0x%04x blocks (%d bytes)\n", ilen, ilen*512);
printf(" Revision Level of Code/Data: 0x%04x\n",
- little_word(data->irevision));
- printf(" Code Type: 0x%02x (", data->type);
- switch (data->type) {
- case 0:
- printf("Intel x86");
- break;
- case 1:
- printf("Open Firmware");
- break;
- case 2:
- printf("HP PA Risc");
- break;
- case 3:
- printf("Intel EFI (unofficial)");
- break;
- default:
- printf("unknown as of PCI specs 2.2");
- }
- printf(")\n Indicator: 0x%02x %s\n", data->indicator,
- data->indicator&0x80?"(last image in rom)":"");
+ (u32)LITTLE_ENDIAN_WORD_FETCH(data->irevision));
+ printf(" Code Type: 0x%02x (%s)\n", data->code_type,
+ pci_code_type_name(data->code_type) );
+ printf(" Last-Image Flag: 0x%02x (%slast image in rom)\n",
+ data->last_image_flag,
+ data->last_image_flag&0x80?"":"not ");
printf(" Reserved: 0x%04x\n\n", little_word(data->reserved_2));
return (sig==PCI_DATA_HDR);
@@ -225,7 +146,7 @@
printf( " Entry point for INIT function:"
" 0x%x\n\n",entry);
} else
- printf( " Unable to determin entry point for INIT"
+ printf( " Unable to determine entry point for INIT"
" function. Please report.\n\n");
break;
@@ -252,9 +173,9 @@
if (argc!=2) {
printf ("\nUsage: %s <romimage.img>\n",argv[0]);
- printf ("\nromheaders dumps pci option rom headers "
+ printf ("\n romheaders dumps pci option rom headers "
"according to PCI \n"
- "specs 2.2 in human readable form\n\n");
+ " specs 2.2 in human readable form\n\n");
return -1;
}
@@ -290,23 +211,25 @@
do {
printf("\nImage %d:\n",i);
if (!dump_rom_header(rom_header)) {
- printf("Error occured. Bailing out.\n");
+ printf("Rom Header error occured. Bailing out.\n");
break;
}
- pci_data=(pci_data_t *)(rom+little_word(rom_header->dptr));
+ pci_data = (pci_data_t *)((char *)rom_header +
+ LITTLE_ENDIAN_WORD_FETCH(rom_header->data_ptr));
if (!dump_pci_data(pci_data)) {
- printf("Error occured. Bailing out.\n");
+ printf("PCI Data error occured. Bailing out.\n");
break;
}
- dump_platform_extensions(pci_data->type, rom_header);
+ dump_platform_extensions(pci_data->code_type, rom_header);
- rom_header+=little_word(pci_data->ilen)*512;
+ rom_header = (rom_header_t *)((char *)rom_header +
+ LITTLE_ENDIAN_WORD_FETCH(pci_data->ilen)*512);
i++;
- } while ((pci_data->indicator&0x80)!=0x80 &&
- romlen<(unsigned long)rom_header-(unsigned long)romlen);
+ } while ((pci_data->last_image_flag&0x80)!=0x80 &&
+ (char *)rom_header < rom+(int)romlen );
return 0;
}
Modified: fcode-utils/toke/Makefile
===================================================================
--- fcode-utils/toke/Makefile 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/toke/Makefile 2006-08-18 12:47:12 UTC (rev 76)
@@ -1,11 +1,12 @@
#
-# OpenBIOS - free your system!
-# ( FCode tokenizer )
-#
-# This program is part of a free implementation of the IEEE 1275-1994
+# OpenBIOS - free your system!
+# ( Utilities )
+#
+# This program is part of a free implementation of the IEEE 1275-1994
# Standard for Boot (Initialization Configuration) Firmware.
#
-# Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+# Copyright (C) 2001-2006 Stefan Reinauer <stepan(a)openbios.org>
+# Copyright (C) 2006 coresystems GmbH <info(a)coresystems.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,52 +22,39 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
#
-ARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/x86_64/amd64/)
-TOPDIR := $(shell /bin/pwd)
-BUILDDIR ?= $(TOPDIR)/obj-$(ARCH)
-VPATH := $(BUILDDIR)
+PROGRAM = toke
-include $(TOPDIR)/Rules.make
+CC = gcc
+STRIP = strip
+INCLUDES = -I../shared
+#CFLAGS = -O2 -g -Wall
+CFLAGS = -Os -Wall -Wno-pointer-sign -DSYS_IS_GNU_Linux
+LDFLAGS =
-CC = gcc
-CFLAGS = -O2 -Wall -W -ansi -pedantic
-# CFLAGS = -O -g -Wall -ansi -pedantic
+OBJS = clflags.o conditl.o devnode.o dictionary.o emit.o errhandler.o \
+ flowcontrol.o macros.o nextfcode.o parselocals.o scanner.o stack.o \
+ stream.o strsubvocab.o ticvocab.o toke.o tokzesc.o tracesyms.o \
+ usersymbols.o ../shared/classcodes.o
-# CFLAGS := $(CFLAGS) -DDEBUG_SCANNER
-# CFLAGS := $(CFLAGS) -DDEBUG_DSTACK
+all: .dependencies $(PROGRAM)
-OBJECTS= toke.o stack.o stream.o dictionary.o macros.o scanner.o emit.o
+$(PROGRAM): $(OBJS)
+ $(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS)
+ $(STRIP) -s $(PROGRAM)
-.SUFFIXES: .c .o
+clean:
+ rm -f $(OBJS) *~
-all: main toke
- @cd $(BUILDDIR) && strip toke
- @echo -e "\nOpenBIOS tokenizer toke build finished\n"
+distclean: clean
+ rm -f $(PROGRAM) .dependencies
+
+.dependencies: *.c
+ @$(CC) $(CFLAGS) $(INCLUDES) -MM *.c > .dependencies
-# main should go to rules.make
-main:
- @echo -e "\nWelcome to toke, the OpenBIOS fcode tokenizer.."
- @test -r $(BUILDDIR) || ( mkdir -p $(BUILDDIR); \
- echo -e "\nCreating build directory $(BUILDDIR)" )
+.PHONY: all clean distclean
-toke: $(OBJECTS)
- @echo -n " linking tokenizer executable... "
- @cd $(BUILDDIR) && $(CC) $(CFLAGS) -o $@ $^
- @echo -e "\tok"
-
-clean:
- @test ! -d $(BUILDDIR) && \
- echo "Architecture $(ARCH) is already clean." || \
- ( \
- echo "Cleaning up architecture $(ARCH)"; \
- rm -rf $(BUILDDIR) \
- rm forth.dict.core \
- )
+-include .dependencies
-toke.o: toke.c toke.h stack.h stream.h emit.h
-dictionary.o: dictionary.c toke.h dictionary.h
-emit.o: emit.c toke.h stack.h
-macros.o: macros.c toke.h
-scanner.o: scanner.c toke.h stack.h stream.h dictionary.h
-stack.o: stack.c toke.h stack.h
-stream.o: stream.c toke.h
+.c.o:
+ $(CC) -c $(CFLAGS) $(INCLUDES) $< -o $@
+
Deleted: fcode-utils/toke/Rules.make
===================================================================
--- fcode-utils/toke/Rules.make 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/toke/Rules.make 2006-08-18 12:47:12 UTC (rev 76)
@@ -1,17 +0,0 @@
-# tag: Makefile rules
-
-VPATH := $(VPATH):.
-
-.S.o:
- echo -n " assembling $<... "
- $(CC) -c -nostdlib $(INCLUDES) $(CFLAGS) $< -o $(BUILDDIR)/$@ && \
- echo -e " \t\tok" || \
- echo -e " \t\tfailed"
-
-.c.o:
- @echo -n " compiling $<... "
- @$(CC) -c $(CFLAGS) $(INCLUDES) $< -o $(BUILDDIR)/$@ && \
- echo -e " \t\tok" || \
- echo -e " \t\failed"
-
-
Added: fcode-utils/toke/clflags.c
===================================================================
--- fcode-utils/toke/clflags.c (rev 0)
+++ fcode-utils/toke/clflags.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,729 @@
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Command-Line Flags are used to control certain non-Standard
+ * variant behaviors of the Tokenizer.
+ * Support Functions for setting, clearing, displaying, etc.
+ * Call them "Special-Feature Flags" in messages to the User
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * For a given CLFlag name, the user may enter either:
+ *
+ * -f CLFlagName
+ * or
+ * -f noCLFlagName
+ *
+ * to either enable or disable the associated function
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Functions Exported:
+ * set_cl_flag Set (or clear) a CL Flag Variable
+ * show_all_cl_flag_settings Show CL Flags' settings unconditionally.
+ * list_cl_flag_settings Display CL Flags' settings if changed.
+ * list_cl_flag_names Display just the names of the CL Flags.
+ * cl_flags_help Help Message for CL Flags
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Revision History:
+ * Updated Mon, 08 Aug 2005 by David L. Paktor
+ * They're not just for setting from the Command-Line anymore,
+ * but let's still keep these names for internal use....
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * The CL_FLAGS data structure has a field for the CLFlagName,
+ * one for a text explanation of the function it controls, and
+ * one for the address of the boolean variable ("flag")
+ *
+ **************************************************************************** */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "clflags.h"
+#include "errhandler.h"
+
+
+/* **************************************************************************
+ *
+ * Global Variables Exported
+ * (The "flags" controlled by this means)
+ *
+ **************************************************************************** */
+
+bool ibm_locals = FALSE ;
+bool ibm_locals_legacy_separator = TRUE ;
+bool ibm_legacy_separator_message = TRUE ;
+bool enable_abort_quote = TRUE ;
+bool sun_style_abort_quote = TRUE ;
+bool abort_quote_throw = TRUE ;
+bool string_remark_escape = TRUE ;
+bool hex_remark_escape = TRUE ;
+bool c_style_string_escape = TRUE ;
+bool always_headers = FALSE ;
+bool always_external = FALSE ;
+bool verbose_dup_warning = TRUE ;
+bool obso_fcode_warning = TRUE ;
+bool trace_conditionals = FALSE ;
+bool big_end_pci_image_rev = FALSE ;
+
+/* And one to trigger a "help" message */
+bool clflag_help = FALSE;
+
+/* **************************************************************************
+ *
+ * The addition of the "upper/lower-case-tokens" flags introduces
+ * some complications. These are the variables we will actually
+ * be exporting:
+ *
+ **************************************************************************** */
+
+bool force_tokens_case = FALSE ;
+bool force_lower_case_tokens = FALSE ;
+
+/* **************************************************************************
+ *
+ * but we will be entering two static variables into the table,
+ * and keep two more to detect when a change is made...
+ *
+ **************************************************************************** */
+static bool upper_case_tokens = FALSE ;
+static bool lower_case_tokens = FALSE ;
+static bool was_upper_case_tk = FALSE ;
+static bool was_lower_case_tk = FALSE ;
+
+/* **************************************************************************
+ *
+ * Internal Static Variables
+ * cl_flag_change A change was made to any of the CL Flags
+ * Internal Static Constants
+ * cl_flags_list List of CL Flags and their data.
+ *
+ **************************************************************************** */
+
+static bool cl_flag_change = FALSE;
+
+static const cl_flag_t cl_flags_list[] = {
+ /* The clflag_tabs field takes at least one tab.
+ * If the name has fewer than 16 characters,
+ * stick in an extra tab, and yet another tab
+ * if the name is shorter than 8 characters
+ * to make the formatting of the "explanation"
+ * come out prettier.
+ */
+ { "Local-Values",
+ &ibm_locals,
+ "\t\t",
+ "Support IBM-style Local Values (\"LV\"s)" } ,
+
+ { "LV-Legacy-Separator",
+ &ibm_locals_legacy_separator,
+ "\t",
+ "Allow Semicolon for Local Values Separator (\"Legacy\")" } ,
+
+ { "LV-Legacy-Message",
+ &ibm_legacy_separator_message,
+ "\t",
+ "Display a Message when Semicolon is used as the "
+ "Local Values Separator" } ,
+
+ { "ABORT-Quote",
+ &enable_abort_quote,
+ "\t\t",
+ "Allow ABORT\" macro" } ,
+
+ { "Sun-ABORT-Quote",
+ &sun_style_abort_quote,
+ "\t\t",
+ "ABORT\" with implicit IF ... THEN" } ,
+
+ { "ABORT-Quote-Throw",
+ &abort_quote_throw,
+ "\t",
+ "Use -2 THROW in an Abort\" phrase, rather than ABORT" } ,
+
+ { "String-remark-escape",
+ &string_remark_escape,
+ "\t",
+ "Allow \"\\ (Quote-Backslash) to interrupt string parsing" } ,
+
+ { "Hex-remark-escape",
+ &hex_remark_escape,
+ "\t",
+ "Allow \\ (Backslash) to interrupt "
+ "hex-sequence parsing within a string" } ,
+
+ { "C-Style-string-escape",
+ &c_style_string_escape ,
+ "\t",
+ "Allow \\n \\t and \\xx\\ for special chars in string parsing" } ,
+
+ { "Always-Headers",
+ &always_headers ,
+ "\t\t",
+ "Override \"headerless\" and force to \"headers\"" } ,
+
+ { "Always-External",
+ &always_external ,
+ "\t\t",
+ "Override \"headerless\" and \"headers\" and "
+ "force to \"external\"" } ,
+
+ { "Warn-if-Duplicate",
+ &verbose_dup_warning ,
+ "\t",
+ "Display a WARNING message when a duplicate definition is made" } ,
+
+ { "Obsolete-FCode-Warning",
+ &obso_fcode_warning ,
+ "\t",
+ "Display a WARNING message when an \"obsolete\" "
+ "(per the Standard) FCode is used" } ,
+
+ { "Trace-Conditionals",
+ &trace_conditionals,
+ "\t",
+ "Display ADVISORY messages about the state of "
+ "Conditional Tokenization" } ,
+
+ { "Upper-Case-Token-Names",
+ &upper_case_tokens,
+ "\t",
+ "Convert Token-Names to UPPER-Case" } ,
+
+
+ { "Lower-Case-Token-Names",
+ &lower_case_tokens,
+ "\t",
+ "Convert Token-Names to lower-Case" } ,
+
+
+ { "Big-End-PCI-Rev-Level",
+ &big_end_pci_image_rev,
+ "\t",
+ "Save the Vendor's Rev Level field of the PCI Header"
+ " in Big-Endian format" } ,
+
+
+ /* Keep the "help" pseudo-flag last in the list */
+ { "help",
+ &clflag_help,
+ /* Two extra tabs if the name is shorter than 8 chars */
+ "\t\t\t",
+ "Print this \"Help\" message for the Special-Feature Flags" }
+
+};
+
+static const int number_of_cl_flags =
+ sizeof(cl_flags_list)/sizeof(cl_flag_t);
+
+
+/* **************************************************************************
+ *
+ * CL Flags whose settings are changed in the source file should
+ * not stay in effect for the duration of the entire batch of
+ * tokenizations (i.e., if multiple input files are named on
+ * the command line) the way command-line settings should.
+ * To accomplish this we will collect the state of the flags into
+ * a bit-mapped variable after the command line has been parsed
+ * and restore them to their collected saved state before an
+ * input file is processed.
+ *
+ **************************************************************************** */
+
+static long int cl_flags_bit_map;
+/* If the number of CL Flags ever exceeds the number of bits in a long
+ * (presently 32), we will need to change both this variable and
+ * the routines that use it. Of course, if the number of CL Flags
+ * ever gets that high, it will be *seriously* unwieldy... ;-}
+ */
+
+/* **************************************************************************
+ *
+ * Function name: adjust_case_flags
+ * Synopsis: If the last CL Flag Variable setting changed one of
+ * the "upper/lower-case-tokens" flags, make the
+ * appropriate adjustments.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Local Static Variables:
+ * was_upper_case_tk State of "upper-case-tokens" flag before
+ * last CL Flag Variable was processed
+ * was_lower_case_tk State of "lower-case-tokens" flag, before
+ * upper_case_tokens State of "upper-case-tokens" flag after
+ * last CL Flag V'ble was processed
+ * lower_case_tokens State of "lower-case-tokens" flag, after
+ * Global Variables:
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * force_tokens_case TRUE if "upper/lower-case-tokens"
+ * flag is in effect
+ * force_lower_case_tokens If force_tokens_case is TRUE, then
+ * this switches between "upper"
+ * or "lower" case
+ *
+ * Process Explanation:
+ * We cannot come out of this with both upper_case_tokens and
+ * lower_case_tokens being TRUE, though they may both be FALSE.
+ * If neither has changed state, we need not do anything here.
+ * If one has gone to TRUE, we must force the other to FALSE and
+ * we will set force_tokens_case to TRUE.
+ * If one has gone to FALSE, turn force_tokens_case to FALSE.
+ * If force_tokens_case is TRUE after all this, we must adjust
+ * force_lower_case_tokens according to lower_case_tokens
+ *
+ **************************************************************************** */
+
+static void adjust_case_flags( void)
+{
+ static bool *case_tokens[2] = { &upper_case_tokens, &lower_case_tokens };
+ static bool *was_case_tk[2] = { &was_upper_case_tk, &was_lower_case_tk };
+ int the_one = 0;
+ int the_other = 1;
+
+ for ( ; the_one < 2 ; the_one++ , the_other-- )
+ {
+ /* If one has changed state */
+ if ( *(case_tokens[the_one]) != *(was_case_tk[the_one]) )
+ {
+ if ( *(case_tokens[the_one]) )
+ {
+ /* If it has gone to TRUE, force the other to FALSE. */
+ *(case_tokens[the_other]) = FALSE;
+ /* and set force_tokens_case to TRUE */
+ force_tokens_case = TRUE;
+ }else{
+ /* If it has gone to FALSE turn force_tokens_case FALSE */
+ force_tokens_case = FALSE;
+ }
+ if ( force_tokens_case )
+ {
+ force_lower_case_tokens = lower_case_tokens;
+ }
+ break; /* Only one can have changed state. */
+ }
+ }
+}
+
+
+
+
+/* **************************************************************************
+ *
+ * Function name: set_cl_flag
+ * Synopsis: Set (or clear) the named CL Flag Variable
+ *
+ * Inputs:
+ * Parameters:
+ * flag_name The name as supplied by the user
+ * from_src TRUE if called from source-input file
+ * Static Constants:
+ * cl_flags_list
+ * number_of_cl_flags
+ *
+ * Outputs:
+ * Returned Value: TRUE if supplied name is not valid
+ * Global Variables:
+ * The CL Flag Variable associated with the supplied name will
+ * be set or cleared according to the leading "no"
+ * Local Static Variables:
+ * cl_flag_change TRUE if associated variable has changed
+ * Printout:
+ * If from_src is TRUE, print "En" or "Dis" abling:
+ * followed by the explanation
+ *
+ * Error Detection:
+ * If the supplied name is not a valid CL Flag name, or if
+ * it's too short to be a valid CL Flag name, return TRUE.
+ * Print a message; either a simple print if this function was
+ * called from a command-line argument, or an ERROR if it
+ * was called from a line in the from source-input file.
+ *
+ * Process Explanation:
+ * Save the current state of the "upper/lower-case-tokens" flags
+ * If the given name has a leading "no", make note of that fact
+ * and remove the leading "no" from the comparison.
+ * Compare with the list of valid CL Flag names.
+ * If no match was found, Error. See under Error Detection.
+ * If a match:
+ * Change the associated variable according to the leading "no"
+ * Set cl_flag_change to TRUE unless the variable is the one
+ * associated with the "help" flag; this permits the
+ * "Default" vs "Setting" part of cl_flags_help() to
+ * work properly...
+ * Do the conditional Printout (see above)
+ * Adjust the "upper/lower-case-tokens" flags if one has changed.
+ *
+ **************************************************************************** */
+static bool first_err_msg = TRUE; /* Need extra carr-ret for first err msg */
+bool set_cl_flag(char *flag_name, bool from_src)
+{
+ bool retval = TRUE;
+
+ was_upper_case_tk = upper_case_tokens;
+ was_lower_case_tk = lower_case_tokens;
+
+ if ( strlen(flag_name) > 3 )
+ {
+ int indx;
+ bool flagval = TRUE;
+ char *compar = flag_name;
+
+ if ( strncasecmp( flag_name, "no", 2) == 0 )
+ {
+ flagval = FALSE;
+ compar += 2;
+ }
+ for ( indx = 0 ; indx < number_of_cl_flags ; indx++ )
+ {
+ if ( strcasecmp( compar, cl_flags_list[indx].clflag_name ) == 0 )
+ {
+ retval = FALSE;
+ *(cl_flags_list[indx].flag_var) = flagval;
+
+ /* The "help" flag is the last one in the list */
+ if ( indx != number_of_cl_flags - 1 )
+ {
+ cl_flag_change = TRUE;
+ }
+ if ( from_src )
+ {
+ tokenization_error(INFO,
+ "%sabling: %s\n",
+ flagval ? "En" : "Dis", cl_flags_list[indx].clflag_expln);
+ }
+ break;
+ }
+ }
+ }
+
+ if ( retval )
+ {
+ const char* msg_txt = "Unknown Special-Feature Flag: %s\n" ;
+ if ( from_src )
+ {
+ tokenization_error( TKERROR, (char *)msg_txt, flag_name);
+ }else{
+ if ( first_err_msg )
+ {
+ printf( "\n");
+ first_err_msg = FALSE;
+ }
+ printf( msg_txt, flag_name);
+ }
+ }
+
+ adjust_case_flags();
+
+ return ( retval );
+}
+
+/* **************************************************************************
+ *
+ * Function name: show_all_cl_flag_settings
+ * Synopsis: Display the settings of the CL Flags, (except "help")
+ * regardless of whether they have been changed.
+ *
+ * Associated Tokenizer directive(s): [FLAGS]
+ * #FLAGS
+ * [#FLAGS]
+ * SHOW-FLAGS
+ * This routine may also be invoked by a combination of
+ * options on the command-line.
+ *
+ * Inputs:
+ * Parameters:
+ * from_src TRUE if called from source-input file
+ * Macro:
+ * ERRMSG_DESTINATION Error message destination;
+ * (Development-time switch)
+ * Static Constants:
+ * cl_flags_list
+ * number_of_cl_flags
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout: Directed to stdout or to stderr
+ * (see definition of ERRMSG_DESTINATION)
+ * A header line, followed by the names of the CL Flags,
+ * with "No" preceding name if value is FALSE, one to a line.
+ *
+ * Process Explanation:
+ * If from_src is TRUE, print the header line as a Message, and
+ * then direct output to ERRMSG_DESTINATION .
+ * Don't print the "help" trigger (the last flag in the array).
+ *
+ **************************************************************************** */
+
+void show_all_cl_flag_settings(bool from_src)
+{
+ const char* hdr_txt = "Special-Feature Flag settings:" ;
+ int indx;
+
+ if ( from_src )
+ {
+ tokenization_error(MESSAGE, (char *)hdr_txt);
+ }else{
+ printf("\n%s\n", hdr_txt);
+ }
+
+ for ( indx = 0 ; indx < (number_of_cl_flags - 1) ; indx++ )
+ {
+ fprintf( from_src ? ERRMSG_DESTINATION : stdout ,
+ "\t%s%s\n",
+ *(cl_flags_list[indx].flag_var) ? " " : "No" ,
+ cl_flags_list[indx].clflag_name );
+ }
+ if ( from_src ) fprintf( ERRMSG_DESTINATION, "\n");
+}
+
+/* **************************************************************************
+ *
+ * Function name: list_cl_flag_settings
+ * Synopsis: Display the settings of the CL Flags, (except "help")
+ * if any of them have been changed
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Local Static Variables:
+ * cl_flag_change TRUE if a Flag setting has been changed.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout:
+ * Settings of the CL Flags. See show_all_cl_flag_settings()
+ *
+ * Process Explanation:
+ * Don't print anything if cl_flag_change is not TRUE
+ *
+ **************************************************************************** */
+
+void list_cl_flag_settings(void)
+{
+
+ if ( cl_flag_change )
+ {
+ show_all_cl_flag_settings( FALSE);
+ }
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: list_cl_flag_names
+ * Synopsis: Display just the names of the CL Flags
+ * for the Usage message
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Static Constants:
+ * cl_flags_list
+ * number_of_cl_flags
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout:
+ * A header line, followed by the names of the CL Flags,
+ *
+ **************************************************************************** */
+
+void list_cl_flag_names(void)
+{
+ int indx;
+
+ printf("Valid Special-Feature Flags are:\n");
+ for ( indx = 0 ; indx < number_of_cl_flags ; indx++ )
+ {
+ printf("\t%s\n", cl_flags_list[indx].clflag_name );
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: cl_flags_help
+ * Synopsis: Display Usage of the CL Flags and their defaults
+ *
+ *
+ * Inputs:
+ * Parameters:: NONE
+ * Static Constants:
+ * cl_flags_list
+ * number_of_cl_flags
+ * Local Static Variables:
+ * cl_flag_change TRUE if setting has been changed.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout:
+ * A few lines of header, followed by the default, the name
+ * and the "explanation" of each of the CL Flags, one to a line.
+ *
+ * Extraneous Remarks:
+ * We take advantage of the facts that this routine is called
+ * (1) only from the command-line, before any settings
+ * have been changed, and (2) via changing the flag for
+ * "help" to TRUE. (Technically, I suppose, the default
+ * for the "help" feature is "no", but showing will, I
+ * think be more confusing than enlightening to the user.)
+ * Also, I suppose a perverse user could change setting(s) on
+ * the same command-line with a "-f help" request; we cannot
+ * stop users from aiming at their boot and pulling the
+ * trigger. As my buddies in Customer Support would say:
+ * "KMAC YOYO" (Approximately, "You're On Your Own, Clown")...
+ *
+ * Revision History:
+ * Oh, all right. If the user changed setting(s), we can do
+ * them the minor courtesy of printing "Setting" instead
+ * of "Default".
+ *
+ *
+ **************************************************************************** */
+
+void cl_flags_help(void )
+{
+ int indx;
+
+ printf("\n"
+ "Special-Feature Flags usage:\n"
+ " -f FlagName to enable the feature associated with FlagName,\n"
+ "or\n"
+ " -f noFlagName to disable the feature.\n\n"
+ "%s Flag-Name\t\t Feature:\n\n",
+ cl_flag_change ? "Setting" : "Default" );
+
+ for ( indx = 0 ; indx < number_of_cl_flags ; indx++ )
+ {
+ printf(" %s %s%s%s\n",
+ *(cl_flags_list[indx].flag_var) ? " " : "no" ,
+ cl_flags_list[indx].clflag_name,
+ cl_flags_list[indx].clflag_tabs,
+ cl_flags_list[indx].clflag_expln);
+ }
+
+}
+
+
+
+/* **************************************************************************
+ *
+ * Function name: save_cl_flags
+ * Synopsis: Collect the state of the CL Flags
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Local Static Variables:
+ * cl_flags_list
+ * Static Constants:
+ * number_of_cl_flags
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * cl_flags_bit_map Will be set to reflect the state
+ * of the CL Flags in the list.
+ *
+ * Process Explanation:
+ * The correspondence of bits to the list is that the first item
+ * in the list corresponds to the low-order bit, and so on
+ * moving toward the high-order with each successive item.
+ * Do not save the "help" flag (last item on the list).
+ * This routine is called after the command line has been parsed.
+ *
+ **************************************************************************** */
+
+void save_cl_flags(void)
+{
+ int indx;
+ long int moving_bit = 1;
+
+ cl_flags_bit_map = 0;
+ for ( indx = 0 ; indx < (number_of_cl_flags - 1) ; indx++ )
+ {
+ if ( *(cl_flags_list[indx].flag_var) )
+ {
+ cl_flags_bit_map |= moving_bit; /* The moving finger writes, */
+ }
+ moving_bit <<= 1; /* and having writ, moves on. */
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: reset_cl_flags
+ * Synopsis: Restore the CL Flags to the state that was saved.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Local Static Variables:
+ * cl_flags_bit_map Reflects the state of the CL Flags
+ * Static Constants:
+ * number_of_cl_flags
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * cl_flags_list
+ * Global Variables:
+ * The CL Flag Variables will be set or cleared
+ * to their saved state
+ *
+ * Process Explanation:
+ * This routine is called before starting a new input file.
+ * Any changes made in the source file will not stay
+ * in effect for the next tokenization.
+ *
+ **************************************************************************** */
+
+void reset_cl_flags(void)
+{
+ int indx;
+ long int moving_bit = 1;
+
+ for ( indx = 0 ; indx < (number_of_cl_flags - 1) ; indx++ )
+ {
+ *(cl_flags_list[indx].flag_var) =
+ BOOLVAL( cl_flags_bit_map & moving_bit) ;
+ moving_bit <<= 1;
+ }
+}
Added: fcode-utils/toke/clflags.h
===================================================================
--- fcode-utils/toke/clflags.h (rev 0)
+++ fcode-utils/toke/clflags.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,144 @@
+#ifndef _TOKE_CLFLAGS_H
+#define _TOKE_CLFLAGS_H
+
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Function Prototypes and External declarations
+ * for Command-Line Flags Support
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Structure-Types:
+ * cl_flag_t Data for recognizing and setting Command-Line
+ * Flags, and for displaying the help message
+ *
+ * Function Prototypes / Functions Exported:
+ * set_cl_flag
+ * list_cl_flag_settings
+ * list_cl_flag_names Display just the names of the CL Flags
+ * cl_flags_help
+ *
+ * Global Variables Exported
+ * (These flags, which are set by the set_cl_flag() routine,
+ * are used throughout the Tokenizer to control certain
+ * non-Standard variant behaviors.)
+ * ibm_locals
+ * ibm_locals_legacy_separator
+ * ibm_legacy_separator_message
+ * enable_abort_quote
+ * sun_style_abort_quote
+ * string_remark_escape
+ * hex_remark_escape
+ * c_style_string_escape
+ * always_headers
+ * always_external
+ * verbose_dup_warning
+ * obso_fcode_warning
+ * trace_conditionals
+ * force_tokens_case
+ * force_lower_case_tokens
+ * big_end_pci_image_rev
+ * clflag_help
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ * Structure-Type Name: cl_flag_t
+ * Data for recognizing and setting Command-Line Flags,
+ * and for displaying the help message
+ *
+ * Fields:
+ * clflag_name *char CL Flag name, as entered by the user
+ * flag_var *bool Address of boolean ("flag") variable
+ * clflag_tabs *char Tabs to align the explanations, in
+ * the help message display
+ * clflag_expln *char Explanation, used in help message
+ *
+ * Since this structure will be initialized by the program, and will not
+ * be added-to, we can structure it as purely an array, and have no
+ * need to treat it as a linked list, hence no link-field.
+ *
+ **************************************************************************** */
+
+#include "types.h"
+
+typedef struct cl_flag
+ {
+ char *clflag_name;
+ bool *flag_var;
+ char *clflag_tabs;
+ char *clflag_expln;
+ } cl_flag_t ;
+
+
+/* **************************************************************************
+ *
+ * Exported Global Variables
+ *
+ **************************************************************************** */
+
+extern bool ibm_locals;
+extern bool ibm_locals_legacy_separator;
+extern bool ibm_legacy_separator_message;
+extern bool enable_abort_quote;
+extern bool sun_style_abort_quote;
+extern bool abort_quote_throw;
+extern bool string_remark_escape;
+extern bool hex_remark_escape;
+extern bool c_style_string_escape;
+extern bool always_headers;
+extern bool always_external;
+extern bool verbose_dup_warning;
+extern bool obso_fcode_warning;
+extern bool trace_conditionals;
+extern bool big_end_pci_image_rev;
+
+extern bool force_tokens_case;
+extern bool force_lower_case_tokens;
+
+extern bool clflag_help;
+
+/* **************************************************************************
+ *
+ * Exported Functions
+ *
+ **************************************************************************** */
+
+bool set_cl_flag(char *flag_name, bool print_message);
+void cl_flags_help(void);
+void list_cl_flag_names(void);
+void show_all_cl_flag_settings(bool from_src);
+void list_cl_flag_settings(void);
+void save_cl_flags(void);
+void reset_cl_flags(void);
+
+#endif /* _TOKE_CLFLAGS_H */
Added: fcode-utils/toke/conditl.c
===================================================================
--- fcode-utils/toke/conditl.c (rev 0)
+++ fcode-utils/toke/conditl.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,772 @@
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Conditional-Compilation support for Tokenizer
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Functions Exported:
+ * init_conditionals_vocab Initialize the "Conditionals" Vocabulary.
+ * handle_conditional Confirm whether a given name is a valid
+ * Conditional, and, if so, perform its
+ * function and return an indication.
+ * create_conditional_alias Add an alias to "Conditionals" vocab
+ * reset_conditionals Reset the "Conditionals" Vocabulary
+ * to its "Built-In" position.
+ *
+ **************************************************************************** */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <string.h>
+#include <errno.h>
+
+#include "scanner.h"
+#include "errhandler.h"
+#include "ticvocab.h"
+#include "conditl.h"
+#include "stack.h"
+#include "dictionary.h"
+#include "vocabfuncts.h"
+#include "usersymbols.h"
+#include "stream.h"
+#include "clflags.h"
+
+/* **************************************************************************
+ *
+ * Global Variables Imported
+ * statbuf Start of input-source buffer
+ * pc Input-source Scanning pointer
+ * iname Current Input File name
+ * lineno Current Line Number in Input File
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Local Static Variables
+ * already_ignoring Location from which to pass a parameter,
+ * called "alr_ign" to the main routine. Each
+ * "Conditional" will have an associated routine
+ * that takes the pointer to this as its argument.
+ * The pointer to this will satisfy the "param-field"
+ * requirement of a TIC_HDR-style "Vocabulary"-list.
+ * conditionals_tbl TIC_HDR-style "Vocabulary"-list table, initialized
+ * as an array.
+ * conditionals Pointer to "tail" of Conditionals Vocabulary-list
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * The lists of synonymous forms of the #ELSE and #THEN operators
+ * are incorporated into the "Shared Words" Vocabulary.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Function name: is_a_then / is_an_else
+ * Synopsis: Indicate whether the given name is one of the
+ * [then] / [else] synonyms
+ *
+ * Inputs:
+ * Parameters:
+ * a_word Word to test
+ *
+ * Outputs:
+ * Returned Value: TRUE if the given name is one of the synonyms
+ *
+ * Process Explanation:
+ * The functions are twins, hence bundling them like this...
+ *
+ **************************************************************************** */
+
+
+/* **************************************************************************
+ *
+ * Support function: is_a_type
+ * Synopsis: Indicate whether the given name is a "shared word"
+ * whose FWord Token matches the one given
+ *
+ * Inputs:
+ * Parameters:
+ * tname Target name to look for
+ * fw_type The FWord Token type to match
+ *
+ * Outputs:
+ * Returned Value: TRUE if it matches
+ *
+ **************************************************************************** */
+
+
+static bool is_a_type( char *tname, fwtoken fw_type)
+{
+ bool retval = FALSE;
+ tic_fwt_hdr_t *found = (tic_fwt_hdr_t *)lookup_shared_f_exec_word( tname );
+ if ( found != NULL )
+ {
+ if ( found->pfield.fw_token == fw_type ) retval = TRUE;
+ }
+ return ( retval );
+}
+
+static bool is_a_then( char *a_word)
+{
+ bool retval = is_a_type( a_word, CONDL_ENDER);
+ return ( retval );
+}
+
+static bool is_an_else( char *a_word)
+{
+ bool retval = is_a_type( a_word, CONDL_ELSE);
+ return ( retval );
+}
+
+/* **************************************************************************
+ *
+ * This is a somewhat roundabout way of passing an "already ignoring"
+ * parameter to the various Conditional Operators. Each operator's
+ * Parameter-Field Pointer points to this. The calling routine
+ * must set it (or rely on the default); the routine that handles
+ * nesting of Conditionals must save and restore a local copy.
+ *
+ **************************************************************************** */
+
+static bool already_ignoring = FALSE;
+
+/* **************************************************************************
+ *
+ * Further down, will define and initialize a word-list table with
+ * all the functions that implement the Conditional Operators,
+ * and we'll link it in with the "Global Vocabulary" pointer.
+ *
+ * We'll call the word-list the "Conditionals Vocabulary Table",
+ * and refer to its entries as the "Conditionals Vocabulary",
+ * even though it isn't really a separate vocabulary...
+ *
+ **************************************************************************** */
+
+
+/* **************************************************************************
+ *
+ * We also need a few common routines to pass as "Ignoring" functions
+ * for a few occasional words that take another word or two from
+ * the input stream as their arguments. For example, if the user
+ * were to write: alias [otherwise] [else] and that were to
+ * occur within a segment already being ignored, we need to make
+ * sure that this doesn't get processed as an occurrence of [else]
+ * Similarly with macro-definitions.
+ *
+ * Since we are using the term "ignore a word" to mean "look it up and
+ * process it in Ignoring-state", we need a different term to name
+ * this class of routine; let's use the term "skip a word" where
+ * the "word" is strictly an input token, delimited by whitespace.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Function name: skip_a_word
+ * Synopsis: Consume one input-token ("word") from the
+ * Input Stream, with no processing
+ *
+ * Inputs:
+ * Parameters:
+ * pfield "Parameter field" pointer, to satisfy
+ * the calling convention, but not used
+ *
+ * Outputs:
+ * Returned Value: NONE
+ *
+ **************************************************************************** */
+
+void skip_a_word( tic_bool_param_t pfield )
+{
+ /* signed long wlen = */ get_word();
+}
+
+/* **************************************************************************
+ *
+ * Function name: skip_a_word_in_line
+ * Synopsis: Consume one input-token ("word") on the same line
+ * as the current line of input, from the Input
+ * Stream, with no processing.
+ *
+ * Inputs:
+ * Parameters:
+ * pfield "Parameter field" pointer, to satisfy
+ * the calling convention, but not used
+ * Global Variables:
+ * statbuf The word being processed, which expects
+ * another word on the same line; used
+ * for the Error message.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ *
+ * Error Detection:
+ * get_word_in_line() will check and report if no word on same line.
+ *
+ **************************************************************************** */
+void skip_a_word_in_line( tic_bool_param_t pfield )
+{
+ /* bool isokay = */ get_word_in_line( statbuf);
+}
+
+/* **************************************************************************
+ *
+ * Function name: skip_two_words_in_line
+ * Synopsis: Consume two input-tokens ("words") on the same line
+ * as the current line of input, from the Input
+ * Stream, with no processing.
+ *
+ * Inputs:
+ * Parameters:
+ * pfield "Parameter field" pointer, to satisfy
+ * the calling convention, but not used
+ * Global Variables:
+ * statbuf The word being processed, which expects
+ * two words on the same line; used for
+ * the Error message.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Memory Allocated
+ * Copy of statbuf for Error message.
+ * When Freed?
+ * End of this routine
+ *
+ * Error Detection:
+ * get_word_in_line() will check and report
+ *
+ **************************************************************************** */
+
+void skip_two_words_in_line( tic_bool_param_t pfield )
+{
+ char *func_cpy = strupr( strdup( statbuf));
+ if ( get_word_in_line( func_cpy) )
+ {
+ /* bool isokay = */ get_word_in_line( func_cpy);
+ }
+ free( func_cpy);
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: ignore_one_word
+ * Synopsis: Handle a word that needs processing while "ignoring"
+ * Ignore the rest.
+ *
+ * Inputs:
+ * Parameters:
+ * tname Target name to test
+ * Local Static Variables:
+ * already_ignoring The "Already Ignoring" flag
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * tic_found Set to the TIC-entry that has just been
+ * found, in case it's a Macro.
+ * Local Static Variables:
+ * already_ignoring Intermediately set to TRUE, then
+ * returned to former state.
+ *
+ * Process Explanation:
+ * When we are ignoring source input, we still need to be
+ * sensitive to the nesting of Conditional Operators, to
+ * consume comments and user -message text-bodies, and to
+ * expand Macros, among other things.
+ * Rather than create special cases here for each one, we have
+ * added an "ign_funct" pointer to those words where this
+ * is relevant, including Conditional Operators.
+ * Save the state of already_ignoring and set it to TRUE
+ * Execute the "Ignoring" Function associated with the entry
+ * Restore already_ignoring to its previous state.
+ * This is necessary if the word is a Conditional Operator and
+ * is harmless otherwise.
+ *
+ **************************************************************************** */
+
+static void ignore_one_word( char *tname)
+{
+ tic_bool_hdr_t *found = (tic_bool_hdr_t *)lookup_word( tname, NULL, NULL);
+ if ( found != NULL )
+ {
+ if ( found->ign_func != NULL )
+ {
+ bool save_already_ignoring = already_ignoring;
+ already_ignoring = TRUE ;
+ tic_found = (tic_hdr_t *)found;
+
+ found->ign_func( found->pfield);
+
+ already_ignoring = save_already_ignoring;
+ }
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: conditionally_tokenize
+ * Synopsis: Conduct tokenization while a Conditional-Tokenization
+ * operator is in effect. This is the core of the
+ * implementation of Conditional-Tokenization.
+ *
+ * Inputs:
+ * Parameters:
+ * cond The state of the Condition-Flag that the
+ * immediate Conditional Operator acquired.
+ * TRUE means "do not ignore". Its sense
+ * is reversed when [ELSE] is encountered.
+ * alr_ign TRUE means we are Already Ignoring source input,
+ * except for Conditional Operators...
+ * Global Variables:
+ * statbuf The symbol (word) just retrieved from input stream.
+ * iname Current Input File name (for Error Messages)
+ * lineno Current Line Number in Input File (ditto)
+ * trace_conditionals Whether to issue ADVISORY messages about
+ * the state of Conditional Tokenization.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * statbuf Will be advanced to the balancing [THEN] op'r.
+ * already_ignoring Set to TRUE if nested Conditional encountered;
+ * restored to previous state when done.
+ * Memory Allocated
+ * Duplicate of Input File name, for Error Messages
+ * When Freed?
+ * Just prior to exit from routine.
+ * Printout:
+ * ADVISORY messages, if "Trace-Conditionals" flag was selected.
+ *
+ * Global Behavior:
+ * Tokenization happens, or inputs are ignored, as necessary.
+ *
+ * Error Detection:
+ * End-of-file encountered on reading a word
+ * ERROR. Conditional Operators must be balanced within a file
+ * More than one [ELSE] encountered: ERROR if processing segment;
+ * if ignoring, WARNING.
+ *
+ * Process Explanation:
+ * Read a word at a time. Allow Macros to "pop" transparently,
+ * but not source files.
+ * If the word is a [THEN], we are done.
+ * If the word is an [ELSE], then, if we are not Already Ignoring,
+ * invert the sense of whether we are ignoring source input.
+ * If this is not the only [ELSE] in the block, report an Error
+ * and disregard it.
+ * If we are ignoring source input, for whatever reason, we still
+ * need to be sensitive to the nesting of Conditional Operators:
+ * If the word is a Conditional Operator, activate it with the
+ * "Already Ignoring" parameter set to TRUE; doing so will
+ * result in a nested call to this routine.
+ * Otherwise, i.e., if the word is not a Conditional Operator,
+ * we may still need to process it in "ignoring" mode:
+ * we need, for instance, to consume strings, comments
+ * and the text-bodies of user-messages in their entirety,
+ * in case there is a reference to an [ELSE] or suchlike.
+ * The words that need processing while "ignoring" will
+ * have a valid function-pointer in their ign_func field.
+ * If we are not ignoring source input, pass the word along to the
+ * tokenize_one_word routine and process it. If the word is
+ * a Conditional Operator, it will be handled in the context
+ * of normal (i.e., non-ignored) tokenization, and, again, a
+ * nested call to this routine will result...
+ *
+ * Revision History:
+ * Updated Thu, 23 Feb 2006 by David L. Paktor
+ * Conditional Blocks may begin with a Conditional Operator in
+ * a Macro definition and do not need to be concluded in
+ * the body of the Macro.
+ * Updated Fri, 10 Mar 2006 by David L. Paktor
+ * Recognize aliased string, comment and user-message delimiters
+ * in a segment that is being ignored; Conditional Operators
+ * within the text body of any of these are always consumed
+ * and never unintentionally processed. Macros are always
+ * processed; Conditional Operators inside a Macro body are
+ * recognized, so the Macro continues to function as intended.
+ *
+ **************************************************************************** */
+
+static void conditionally_tokenize( bool cond, bool alr_ign )
+{
+
+ signed long wlen;
+
+ /* Note: The following variables *must* remain within
+ * the scope of this routine; a distinct instance
+ * is needed each time this routine is re-entered
+ * (aka "a nested call").
+ */
+ bool ignoring;
+ bool first_else = TRUE; /* The "else" we see is the first. */
+ bool not_done = TRUE;
+ unsigned int cond_strt_lineno = lineno;
+ char *cond_strt_ifile_nam = strdup( iname);
+
+ ignoring = BOOLVAL( ( cond == FALSE ) || ( alr_ign != FALSE ) );
+
+ if ( trace_conditionals )
+ {
+ char *cond_val = cond ? "True" : "False" ;
+ char *cond_junct = alr_ign ? ", but Already " : "; ";
+ char *processg = ignoring ? "Ignoring" : "Processing" ;
+ tokenization_error( INFO,
+ "Tokenization-Condition is %s%s%s.\n",
+ cond_val, cond_junct, processg);
+ }
+
+ while ( not_done )
+ {
+ wlen = get_word();
+ if ( wlen == 0 )
+ {
+ continue;
+ }
+
+ if ( wlen < 0 )
+ {
+ tokenization_error( TKERROR,
+ "Conditional without conclusion; started");
+ just_where_started( cond_strt_ifile_nam, cond_strt_lineno);
+ not_done = FALSE ;
+ continue;
+ }
+
+ if ( is_a_then ( statbuf ) )
+ {
+ if ( trace_conditionals )
+ {
+ tokenization_error( INFO,
+ "Concluding Conditional");
+ just_started_at( cond_strt_ifile_nam, cond_strt_lineno);
+ }
+ not_done = FALSE ;
+ continue;
+ }
+
+ if ( is_an_else( statbuf ) )
+ {
+ if ( ! alr_ign )
+ {
+ if ( first_else )
+ {
+ ignoring = INVERSE( ignoring);
+ }
+ }
+
+ if ( ! first_else )
+ {
+ int severity = ignoring ? WARNING : TKERROR ;
+ char *the_scop = ignoring ? "(ignored)" : "the" ;
+ tokenization_error( severity, "Multiple %s directives "
+ "within %s scope of the Conditional",
+ strupr(statbuf), the_scop);
+ just_started_at( cond_strt_ifile_nam, cond_strt_lineno);
+ }else{
+ first_else = FALSE;
+ if ( trace_conditionals )
+ {
+ char *when_enc = alr_ign ? "While already" : "Now" ;
+ char *processg = alr_ign ? "ignoring" :
+ ignoring ? "Ignoring" : "Processing" ;
+ char *enc = alr_ign ? ", e" : ". E" ;
+
+ tokenization_error( INFO,
+ "%s %s%sncountered %s belonging to Conditional",
+ when_enc, processg, enc, strupr(statbuf) );
+ just_started_at( cond_strt_ifile_nam, cond_strt_lineno);
+ }
+ }
+
+ continue;
+ }
+
+ /* If we are ignoring source input, for whatever reason, we still
+ * need to be sensitive to the nesting of Conditional Operators
+ * and some other commands and directives, as indicated...
+ */
+ if ( ignoring )
+ {
+ ignore_one_word( statbuf );
+ }else{
+ /* And if we're not ignoring source input, process it! */
+ tokenize_one_word ( wlen );
+ }
+ }
+}
+
+/* **************************************************************************
+ *
+ * We will now define a series of fairly simple functions that
+ * will be performed by the various Conditional Operators in
+ * the "Conditionals Vocabulary".
+ *
+ * Each one takes, as an argument, the "parameter field" pointer,
+ * which, in all cases, points to the local already_ignoring
+ * flag, passed as an int to satisfy C's strong-typing. The
+ * routine will internally recast it as a bool .
+ *
+ * If it is TRUE, the routine will bypass the test for its particular
+ * type of condition, and go directly to conditionally_tokenize
+ * In most cases, testing for the condition would be harmless,
+ * but in the case where the test is for an item on the stack,
+ * it would be harmful because the sequence that put the item
+ * on the stack was also being ignored...
+ *
+ * We'll give these functions short prologs. Synonyms will simply
+ * have separate entries in the Vocabulary Table, associated
+ * with the same function.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * But first, a support routine...
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Function name: conditional_word_in_line
+ * Synopsis: Common code for the types of conditionals that
+ * require a word on the same line.
+ *
+ * Inputs:
+ * Parameters:
+ * alr_ign TRUE if we are already ignoring
+ * exist_test TRUE if the test is for "existence" of the word
+ * exist_funct Name of the function to call for the test
+ * Global Variables:
+ * stat_word Word for which to test
+ *
+ * Outputs:
+ * Returned Value: NONE
+ *
+ * Error Detection:
+ * The word in question must appear on the same line as the directive;
+ * the call to get_word_in_line() checks for that and reports.
+ * If the word did not appear on the same line, then the directive
+ * will be disregarded and processing will proceed as though it
+ * were absent. This may lead to a cascade of errors...
+ *
+ * Process Explanation:
+ * The supplied exist_funct() will test for the existence of
+ * the word, now read into statbuf , in the appropriate
+ * venue.
+ * We only call the exist_funct() if we are not already ignoring.
+ *
+ **************************************************************************** */
+
+static void conditional_word_in_line( bool alr_ign,
+ bool exist_test,
+ bool (*exist_funct)() )
+{
+ if ( get_word_in_line( statbuf) )
+ {
+ bool cond = FALSE;
+ if ( INVERSE( alr_ign) )
+ {
+ bool exists = exist_funct( statbuf);
+ cond = BOOLVAL( exists == exist_test);
+ }
+ conditionally_tokenize( cond, alr_ign );
+ }
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: if_exists
+ * Synopsis: Test for existence of a given word, in the dictionary.
+ *
+ * Associated Tokenizer directives: [ifexist]
+ * #ifexist
+ * [#ifexist]
+ * [ifexists]
+ * #ifexists
+ * [#ifexists]
+ * (Note variants with and without final 's'
+ *
+ **************************************************************************** */
+
+static void if_exists( tic_param_t pfield )
+{
+ bool alr_ign = *pfield.bool_ptr;
+ conditional_word_in_line( alr_ign, TRUE, exists_in_current );
+}
+
+/* **************************************************************************
+ *
+ * Function name: if_not_exist
+ * Synopsis: Test for Non-existence, in the appropriate dictionary,)
+ * of the given word.
+ *
+ * Associated Tokenizer directives: [ifnexist]
+ * #ifnexist
+ * [#ifnexist]
+ * (Note: Variants with final 's' didn't make sense here.)
+ *
+ * Explanatory Notes:
+ * This is the exact inverse of if_exists
+ *
+ **************************************************************************** */
+
+static void if_not_exist( tic_bool_param_t pfield )
+{
+ bool alr_ign = *pfield.bool_ptr;
+ conditional_word_in_line( alr_ign, FALSE, exists_in_current );
+}
+
+/* **************************************************************************
+ *
+ * Function name: if_defined
+ * Synopsis: Test for existence of a user-defined symbol
+ *
+ * Associated Tokenizer directives: [ifdef]
+ * #ifdef
+ * [#ifdef]
+ *
+ **************************************************************************** */
+
+static void if_defined( tic_bool_param_t pfield )
+{
+ bool alr_ign = *pfield.bool_ptr;
+ conditional_word_in_line( alr_ign, TRUE, exists_as_user_symbol );
+}
+
+/* **************************************************************************
+ *
+ * Function name: if_not_defined
+ * Synopsis: Test for NON-existence of a user-defined symbol
+ *
+ * Associated Tokenizer directives: [ifndef]
+ * #ifndef
+ * [#ifndef]
+ *
+ **************************************************************************** */
+
+static void if_not_defined( tic_bool_param_t pfield )
+{
+ bool alr_ign = *pfield.bool_ptr;
+ conditional_word_in_line( alr_ign, FALSE, exists_as_user_symbol );
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: if_from_stack
+ * Synopsis: Test the number on top of the run-time stack
+ *
+ * Associated Tokenizer directive: [if]
+ *
+ * Process Explanation:
+ * When we are ignoring source input, and we still need to be
+ * sensitive to the nesting of Conditional Operators, we
+ * will not consume the number on the stack; this function
+ * is after all, being ignored and should not perform any
+ * action other than making sure the [else]s and [then]s
+ * get properly counted.
+ *
+ **************************************************************************** */
+
+static void if_from_stack( tic_bool_param_t pfield )
+{
+ bool alr_ign = *pfield.bool_ptr;
+ bool cond = FALSE;
+
+ if ( ! alr_ign )
+ {
+ long num = dpop();
+ if (num != 0)
+ {
+ cond = TRUE;
+ }
+ }
+ conditionally_tokenize( cond, alr_ign );
+}
+
+/* For future functions, use conditl.BlankTemplate.c */
+
+/* **************************************************************************
+ *
+ * Here, at long last, we define and initialize the structure containing
+ * all the functions we support for Conditional Operators.
+ *
+ **************************************************************************** */
+
+#define ADD_CONDL(str, func ) BUILTIN_BOOL_TIC(str, func, already_ignoring )
+
+static tic_bool_hdr_t conditionals_vocab_tbl[] = {
+ ADD_CONDL ("[ifexist]" , if_exists ) ,
+ ADD_CONDL ("[ifexists]" , if_exists ) ,
+ ADD_CONDL ("#ifexist" , if_exists ) ,
+ ADD_CONDL ("#ifexists" , if_exists ) ,
+ ADD_CONDL ("[#ifexist]" , if_exists ) ,
+ ADD_CONDL ("[#ifexists]" , if_exists ) ,
+ ADD_CONDL ("[ifnexist]" , if_not_exist ) ,
+ ADD_CONDL ("#ifnexist" , if_not_exist ) ,
+ ADD_CONDL ("[#ifnexist]" , if_not_exist ) ,
+ ADD_CONDL ("[ifdef]" , if_defined ) ,
+ ADD_CONDL ("#ifdef" , if_defined ) ,
+ ADD_CONDL ("[#ifdef]" , if_defined ) ,
+ ADD_CONDL ("[ifndef]" , if_not_defined ) ,
+ ADD_CONDL ("#ifndef" , if_not_defined ) ,
+ ADD_CONDL ("[#ifndef]" , if_not_defined ) ,
+ ADD_CONDL ("[if]" , if_from_stack )
+};
+
+
+/* **************************************************************************
+ *
+ * Function name: init_conditionals_vocab
+ * Synopsis: Initialize the "Conditionals Vocabulary Table"
+ * link-pointers dynamically, and link it in
+ * with the given ("Global") Vocabulary pointer.
+ *
+ **************************************************************************** */
+
+void init_conditionals_vocab( tic_hdr_t **tic_vocab_ptr )
+{
+ static const int conditionals_vocab_max_indx =
+ sizeof(conditionals_vocab_tbl)/sizeof(tic_bool_hdr_t);
+
+ init_tic_vocab( (tic_hdr_t *)conditionals_vocab_tbl,
+ conditionals_vocab_max_indx,
+ tic_vocab_ptr );
+}
+
Added: fcode-utils/toke/conditl.h
===================================================================
--- fcode-utils/toke/conditl.h (rev 0)
+++ fcode-utils/toke/conditl.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,46 @@
+#ifndef _TOKE_CONDITL_H
+#define _TOKE_CONDITL_H
+
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Function Prototypes for Conditional-Compilation support for Tokenizer
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+#include "types.h"
+#include "ticvocab.h"
+
+void init_conditionals_vocab( tic_hdr_t **tic_vocab_ptr );
+
+void skip_a_word( tic_bool_param_t pfield );
+void skip_a_word_in_line( tic_bool_param_t pfield );
+void skip_two_words_in_line( tic_bool_param_t pfield );
+
+#endif /* _TOKE_CONDITL_H */
Added: fcode-utils/toke/devnode.c
===================================================================
--- fcode-utils/toke/devnode.c (rev 0)
+++ fcode-utils/toke/devnode.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,595 @@
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Support routines for managing device-node vocabularies
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * The vocabulary that is created for a device-node must not remain
+ * available outside of that node. Also, nodes may be nested,
+ * child within parent.
+ * An attempt within a child-node to access directly a method defined
+ * in the parent must be flagged as an error. (Consider what would
+ * happen if the method in the parent-node used instance data, and
+ * the child-node has an instance of its own.)
+ * The correct way is to invoke the method via "$call-parent" or the like.
+ *
+ * We will, however, allow the user to specify a group of exceptions,
+ * words whose scope will be "global" within the tokenization.
+ * When "global" scope is initiated, definitions will be made to
+ * the "core" vocabulary until "device" scope is resumed.
+ * That will (mostly) all be handled in dictionary.c
+ *
+ **************************************************************************** */
+
+
+/* **************************************************************************
+ *
+ * Functions Exported:
+ * new_device_vocab Create the new device-node's data-structure
+ * delete_device_vocab Remove device-node's data-structure
+ * finish_device_vocab Remove struct and give messages when
+ * device is "finish"ed.
+ * exists_in_ancestor Issue a Message if the given word exists
+ * in an ancestor of the current dev-node.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Still to be done:
+ * Add a pair of fields to the data-structure for the Input File and
+ * Line Number where "finish-device" occurred. When a device-node
+ * is "finish"ed, do not delete it, but instead fill in those
+ * fields and the move the node to a separate linked-list.
+ * When looking whether a word exists in an ancestor-node, also
+ * check whether it was in a device-node that was finished and
+ * print both where it was started and where it was finished.
+ *
+ **************************************************************************** */
+
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include "devnode.h"
+#include "errhandler.h"
+#include "scanner.h"
+#include "vocabfuncts.h"
+#include "flowcontrol.h"
+#include "stream.h"
+#include "ticvocab.h"
+
+
+/* **************************************************************************
+ *
+ * Tokenization starts with an implicit "new-device" in effect.
+ * The top-level device-node is never removed.
+ *
+ * Initialize it here
+ *
+ **************************************************************************** */
+char default_top_dev_ifile_name[] = "Start of tokenization";
+
+static device_node_t top_level_dev_node = {
+ NULL , /* parent_node */
+ default_top_dev_ifile_name , /* ifile_name.
+ * Something to show, Just In Case
+ */
+ 0 , /* line_no */
+ NULL , /* tokens_vocab */
+};
+
+/* **************************************************************************
+ *
+ * Global Variables Exported.
+ * Pointers to:
+ * current_device_node data-structure of current device-node
+ * current_definitions vocab into which to add def'ns.
+ *
+ **************************************************************************** */
+
+device_node_t *current_device_node = &top_level_dev_node;
+tic_hdr_t **current_definitions = &(top_level_dev_node.tokens_vocab);
+
+
+/* **************************************************************************
+ *
+ * Internal Static Variables
+ * These are used to support the routines in_what_node()
+ * and show_node_start() , which are used to facilitate
+ * certain kinds of Messaging, as described later.
+ *
+ * in_what_buffr Buffer for the in_what_node() string
+ * show_where TRUE if the string needs to be followed-up
+ * show_which TRUE if follow-up should be just_where_started()
+ * rather than just_started_at()
+ * in_what_line Line Number to use in the follow-up
+ * in_what_file File Name to use in the follow-up
+ *
+ **************************************************************************** */
+
+static char in_what_buffr[50]; /* Ought to be more than enough. */
+static bool show_where = FALSE;
+static bool show_which;
+static int in_what_line;
+static char *in_what_file;
+
+
+/* **************************************************************************
+ *
+ * Function name: dev_vocab_control_struct_check
+ * Synopsis: Issue Warnings for unresolved flow-control constructs
+ * at start or end of a device-node.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * statbuf The command being processed.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout:
+ * Handled by announce_control_structs() routine
+ *
+ * Error Detection:
+ * Handled by announce_control_structs() routine
+ *
+ * Process Explanation:
+ * Set up a buffer with the error message, based on statbuf
+ * and pass it to announce_control_structs()
+ * Release it when done.
+ *
+ **************************************************************************** */
+
+static void dev_vocab_control_struct_check( void)
+{
+ char *ccs_messg;
+
+ ccs_messg = safe_malloc(strlen(statbuf) + 32,
+ "Device-Node control-structure check");
+
+ strcpy( ccs_messg, statbuf );
+ strupr( ccs_messg);
+ strcat( ccs_messg, " encountered");
+ announce_control_structs( WARNING, ccs_messg, 0 );
+ free( ccs_messg);
+}
+
+
+
+/* **************************************************************************
+ *
+ * Function name: new_device_vocab
+ * Synopsis: Create and initialize the data-structure for a
+ * new device-node when a "new-device" is created,
+ * with messages as appropriate.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * statbuf The word that was just read.
+ * iname Current Input-File Name
+ * lineno Current line-number
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * current_device_node Will point to the new data-structure
+ * Memory Allocated
+ * Space for the new device_node_t data-structure
+ * Space for a copy of the current input file name
+ * When Freed?
+ * By delete_device_vocab(), when the device-node is "finish"ed.
+ * Printout:
+ * Advisory message.
+ *
+ * Error Detection:
+ * In immediate-execution mode, Control Structures that have not
+ * been completed are questionable; Issue WARNINGS via the
+ * dev_vocab_control_struct_check() routine.
+ *
+ * Process Explanation:
+ * This routine is called when "new-device" is invoked, but only
+ * if we are in immediate-execution mode.
+ * Later on, in ERROR- or INFOrmative messages, we will want to
+ * be able to refer to the file and line-number in which this
+ * was encountered, so we include them in the structure.
+ *
+ **************************************************************************** */
+
+void new_device_vocab( void )
+{
+ device_node_t *new_node_data;
+
+ dev_vocab_control_struct_check();
+
+ /* Advisory message will mention previous device-node
+ * if there was one. Either way starts out the same:
+ */
+#define NEW_DEV_MSG_START "Encountered %s. Starting new device-node."
+
+ if ( current_device_node == &top_level_dev_node )
+ {
+ tokenization_error(INFO, NEW_DEV_MSG_START "\n", statbuf );
+ }else{
+ tokenization_error(INFO, NEW_DEV_MSG_START
+ " Suspending definitions of parent-device node", statbuf );
+ started_at( current_device_node->ifile_name,
+ current_device_node->line_no );
+ }
+
+ /* Now to business... */
+ new_node_data = safe_malloc( sizeof(device_node_t),
+ "creating new-device vocab data" );
+ new_node_data->parent_node = current_device_node;
+ new_node_data->ifile_name = strdup(iname);
+ new_node_data->line_no = lineno;
+ new_node_data->tokens_vocab = NULL;
+
+ current_device_node = new_node_data;
+
+ current_definitions = &(current_device_node->tokens_vocab);
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: delete_device_vocab
+ * Synopsis: Remove the vocabularies of the current device-node,
+ * along with its data-structure, when the device
+ * is "finish"ed; do not print messages.
+ * Do not remove the top-level device-node data-struct.
+ *
+ * Associated FORTH words: FINISH_DEVICE (interpretive state)
+ * END0 END1
+ * Associated Tokenizer directives: RESET-SYMBOLS (in "Normal" mode)
+ * FCODE-END
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * current_device_node Points to current device's struct
+ * Leads to chain of dev-node structs
+ *
+ * Outputs:
+ * Returned Value:
+ * Global Variables:
+ * current_device_node Parent-device's struct becomes current
+ * Memory Freed
+ * All that was allocated for the tokens and the definers
+ * vocabs in the current device-node
+ * The copy of the input file name, except the top-level
+ * The current_device_node data-structure, except the top-level
+ *
+ **************************************************************************** */
+
+void delete_device_vocab( void )
+{
+ reset_tic_vocab( current_definitions, NULL );
+
+ if ( current_device_node != &top_level_dev_node )
+ {
+ device_node_t *temp_node = current_device_node;
+ current_device_node = current_device_node->parent_node;
+ free( temp_node->ifile_name );
+ free(temp_node);
+ }
+
+ current_definitions = &(current_device_node->tokens_vocab);
+}
+
+/* **************************************************************************
+ *
+ * Function name: finish_device_vocab
+ * Synopsis: Remove the device-node data-structure and all its
+ * vocabularies when the device is "finish"ed,
+ * with appropriate messages.
+ * Do not remove the top-level device node data-struct.
+ *
+ * Associated FORTH word: FINISH_DEVICE
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * current_device_node Current device's struct pointer
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * current_device_node Parent-device's struct becomes current
+ * Printout:
+ * Advisory message.
+ *
+ * Error Detection:
+ * If current_device_node is already pointing at the top-level
+ * device node, it means there was no corresponding NEW-DEVICE
+ * Issue an ERROR.
+ * In immediate-execution mode, Control Structures that have not
+ * been completed are questionable; Issue WARNINGS via the
+ * dev_vocab_control_struct_check() routine.
+ *
+ * Process Explanation:
+ * This routine is called when "finish-device" is invoked, but only
+ * if we are in immediate-execution mode.
+ *
+ **************************************************************************** */
+
+void finish_device_vocab( void )
+{
+ bool at_top_level;
+
+ dev_vocab_control_struct_check();
+
+ /* We never remove the top-level device-node vocabulary,
+ * so we need to test whether we're about to.
+ */
+
+ at_top_level = BOOLVAL( current_device_node == &top_level_dev_node );
+ if ( at_top_level )
+ {
+ tokenization_error( TKERROR,
+ "Encountered %s without corresponding NEW-DEVICE. "
+ "Resetting definitions since start of tokenization.\n",
+ statbuf );
+ }else{
+ tokenization_error(INFO,
+ "Encountered %s. Resetting definitions of device node",
+ statbuf );
+ started_at( current_device_node->ifile_name,
+ current_device_node->line_no );
+ }
+
+ /* Now to business... */
+ delete_device_vocab();
+
+ /* Did we just get to the top-level device-node vocabulary
+ * when we weren't before?
+ */
+ if ( INVERSE(at_top_level) )
+ {
+ if ( current_device_node == &top_level_dev_node )
+ {
+ tokenization_error(INFO,
+ "Resuming definitions since start of tokenization.\n" );
+ }else{
+ tokenization_error(INFO,
+ "Resuming definitions of parent device-node" );
+ started_at( current_device_node->ifile_name,
+ current_device_node->line_no );
+ }
+ }
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: in_what_node
+ * Synopsis: Format a string for use in a Message that might
+ * identify the start of the given device-node.
+ *
+ * Inputs:
+ * Parameters:
+ * the_node The device-node vocabulary about which
+ * to construct the identifying phrase.
+ * Local Static Variables:
+ * in_what_buffr Buffer in which to format the string.
+ * Global Variables:
+ * current_definitions Device-node vocabulary currently
+ * in effect.
+ *
+ * Outputs:
+ * Returned Value: Pointer to buffer w/ formatted string
+ * Local Static Variables:
+ * in_what_buffr Will contain the formatted string.
+ * show_where TRUE if the string needs to be followed-up
+ * (i.e., did not contain a terminating
+ * new-line) by just_where_started()
+ * or by just_started_at()
+ * show_which TRUE if the follow-up call should be
+ * to just_where_started() rather
+ * than to just_started_at()
+ * in_what_line Copy of line_no field from the_node
+ * in_what_file Copy of ifile_name field from the_node
+ *
+ * Process Explanation:
+ * Calling routine must ascertain that Global-scope is not in effect.
+ * The returned phrase can be used as a string argument in a Message.
+ * Set show_where TRUE if the_node->line_no is non-zero.
+ * Set show_which TRUE if the_node is either the Current or the
+ * Top-Level device-node
+ * If the originating line-number in the given Node structure is zero,
+ * the returned phrase will contain a terminating new-line.
+ * (This only happens if the given Node is the top-level Node,
+ * and it's the Current Node, and the "official" starting-point
+ * hasn't yet been established by an "FCode-Starter" such as
+ * FCODE-VERSION2 . Once that command has been given, even
+ * definitions that were made prior to it belong to the Node
+ * that started there.)
+ * Otherwise, show_where is returned TRUE, and show_which becomes
+ * relevant. If the given node is the Current or the Top-Level
+ * node, text about the originating file-name and line-number
+ * merely describes a node that is already uniquely identified,
+ * so the message appended to the buffer will have the phrase
+ * "which began" (which introduces what is known in grammar as
+ * an Appositive Subordinate Clause) and show_which will be
+ * returned TRUE. If the given node is not uniquely identifiable
+ * without the file- and line- phrase, then the Subordinate Clause
+ * is Indicative, and should be introduced with "that" (and no
+ * comma); in that case, we will return show_which as FALSE.
+ * After the calling routine displays the message in which the
+ * returned phrase is used, it must call show_node_start()
+ * to display the followe-up message, if any.
+ *
+ **************************************************************************** */
+
+char *in_what_node(device_node_t *the_node)
+{
+ bool top_node = BOOLVAL( the_node == &top_level_dev_node);
+ bool curr_node = BOOLVAL( the_node == current_device_node);
+ bool known_node = BOOLVAL( top_node || curr_node );
+ bool no_line = BOOLVAL( the_node->line_no == 0);
+
+ show_where = INVERSE( no_line );
+ show_which = known_node;
+ in_what_line = the_node->line_no;
+ in_what_file = the_node->ifile_name;
+
+ sprintf( in_what_buffr, "in the%s device-node%s",
+ INVERSE( known_node ) ? ""
+ : top_node ? " top-level" : " current" ,
+
+ no_line ? ".\n"
+ : known_node ? ", which began" : "" );
+
+
+ return( in_what_buffr);
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: show_node_start
+ * Synopsis: Follow-up to the in_what_node() call. Print out,
+ * if applicable, the text about the originating
+ * file-name and line-number
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Local Static Variables:
+ * show_where Nothing to do if not TRUE
+ * show_which TRUE if should call just_where_started()
+ * rather than just_started_at()
+ * in_what_line Line Number to use in the follow-up
+ * in_what_file File Name to use in the follow-up
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * show_where Force to FALSE
+ * Printout:
+ * Follow-up to the in_what_node() call. Applicable text
+ * about the originating file-name and line-number.
+ *
+ * Process Explanation:
+ * By forcing show_where to FALSE after this is called, we
+ * can safely allow routines that might or might not have
+ * called in_what_node() to call this routine, without
+ * needing any additional "bookkeeping".
+ *
+ **************************************************************************** */
+
+void show_node_start( void)
+{
+ if ( show_where)
+ {
+ if ( show_which )
+ {
+ just_where_started( in_what_file, in_what_line);
+ }else{
+ just_started_at( in_what_file, in_what_line);
+ }
+ show_where = FALSE;
+ }
+}
+
+
+
+/* **************************************************************************
+ *
+ * Function name: exists_in_ancestor
+ * Synopsis: Issue a Message and return an indication if
+ * the given word exists in an ancestor of
+ * the current device-node.
+ * Used for additional error-message information.
+ *
+ *
+ * Inputs:
+ * Parameters:
+ * m_name "Method" name
+ * Global Variables:
+ * current_device_node Leads to chain of dev-node data-structs
+ * scope_is_global TRUE if "global" scope is in effect
+ *
+ * Outputs:
+ * Returned Value: TRUE if word found
+ * Printout:
+ * If m_name exists in an ancestor-node, print an ADVISORY
+ * giving the location where the ancestor originated.
+ *
+ * Error Detection:
+ * None here. Calling routine detected error; see below.
+ *
+ * Process Explanation:
+ * This routine was called as the result of detecting an error:
+ * viz., m_name was not found in either the current node
+ * or the base vocabulary. (Except: If "global" scope is
+ * in effect, we didn't search the current device-node).
+ *
+ **************************************************************************** */
+
+bool exists_in_ancestor( char *m_name)
+{
+ tic_hdr_t *found;
+ bool retval = FALSE;
+ if ( current_device_node != NULL )
+ {
+ device_node_t *grandpa = current_device_node->parent_node;
+
+ if ( scope_is_global ) grandpa = current_device_node;
+
+ for ( ; grandpa != NULL; grandpa = grandpa->parent_node )
+ {
+ found = lookup_tic_entry( m_name, grandpa->tokens_vocab);
+ if ( found != NULL )
+ {
+ retval = TRUE;
+ break;
+ }
+ }
+ if ( grandpa != NULL )
+ {
+ char as_what_buf[32] = "";
+ if ( as_a_what( found->fword_defr, as_what_buf) )
+ {
+ strcat( as_what_buf, " ");
+ }
+ tokenization_error(INFO, "%s is defined %s%s", m_name,
+ as_what_buf, in_what_node( grandpa) );
+ show_node_start();
+ }
+ }
+
+ return(retval );
+}
Added: fcode-utils/toke/devnode.h
===================================================================
--- fcode-utils/toke/devnode.h (rev 0)
+++ fcode-utils/toke/devnode.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,86 @@
+#ifndef _TOKE_DEVNODE_H
+#define _TOKE_DEVNODE_H
+
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * External/Prototype/Structure definitions for device-node management
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "types.h"
+#include "ticvocab.h"
+
+/* **************************************************************************
+ * Structure Name: device_node_t
+ * Data for managing a device node; pointers
+ * to vocabs, data for messaging.
+ *
+ * Fields:
+ * parent_node Pointer to similar data for parent node
+ * line_no Copy of Line Number where "new-device" was invoked
+ * ifile_name Name of Input File where "new-device" was invoked
+ * tokens_vocab Pointer to vocab for this device's tokens
+ *
+ **************************************************************************** */
+
+typedef struct device_node {
+ struct device_node *parent_node ;
+ char *ifile_name ;
+ unsigned int line_no ;
+ tic_hdr_t *tokens_vocab ;
+} device_node_t;
+
+
+/* ************************************************************************** *
+ *
+ * Global Variables Exported
+ *
+ **************************************************************************** */
+
+extern char default_top_dev_ifile_name[];
+extern device_node_t *current_device_node;
+extern tic_hdr_t **current_definitions;
+
+/* ************************************************************************** *
+ *
+ * Function Prototypes / Functions Exported:
+ *
+ **************************************************************************** */
+void new_device_vocab( void );
+void delete_device_vocab( void );
+void finish_device_vocab( void );
+char *in_what_node(device_node_t *the_node);
+void show_node_start( void);
+bool exists_in_ancestor( char *m_name);
+
+#endif /* _TOKE_DEVNODE_H */
Modified: fcode-utils/toke/dictionary.c
===================================================================
--- fcode-utils/toke/dictionary.c 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/toke/dictionary.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -24,6 +24,12 @@
*
*/
+/* **************************************************************************
+ * Modifications made in 2005 by IBM Corporation
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Modifications Author: David L. Paktor dlpaktor(a)us.ibm.com
+ **************************************************************************** */
+
#include <stdio.h>
#include <stdlib.h>
#if defined(__linux__) && ! defined(__USE_BSD)
@@ -32,543 +38,2008 @@
#include <string.h>
#include <errno.h>
-#include "toke.h"
+#include "emit.h"
+#include "macros.h"
+#include "scanner.h"
+#include "ticvocab.h"
#include "dictionary.h"
+#include "vocabfuncts.h"
+#include "devnode.h"
+#include "clflags.h"
+#include "parselocals.h"
+#include "errhandler.h"
+#include "tokzesc.h"
+#include "conditl.h"
-typedef struct token {
- u8 *name;
- u16 fcode;
- struct token *next;
-} token_t;
+/* **************************************************************************
+ *
+ * Revision History:
+ * Updated Fri, 29 Jul 2005 by David L. Paktor
+ * Retrofit to handle "Current Device" as a separate vocabulary;
+ * if one is in effect, searches through it occur first, as
+ * do definitions to it, ahead of the general vocabulary. This
+ * is to support managing device-node vocabularies correctly.
+ * Updated Mon, 12 Dec 2005 by David L. Paktor
+ * Allow the user to specify a group of exceptions, words whose
+ * scope will be "global" within the tokenization. Under "global"
+ * scope, definitions will be made to the "core" vocabulary.
+ *
+ * Wed, 14 Dec 2005 by David L. Paktor
+ * Found a problem with the current approach. Need to be able to
+ * temporarily suspend meaning of "instance". Define: (1) an
+ * alias for INSTANCE called GENERIC_INSTANCE (2) a macro
+ * called INSTANCE that effectively no-ops it out; and, when
+ * it is time to restore "INSTANCE" to normal functionality,
+ * (3) an alias for GENERIC_INSTANCE called INSTANCE .
+ * Problem is that macros are treated as a separate vocabulary
+ * from FWords (and their aliases) and searching one before the
+ * other (either way) renders the second one searched unable to
+ * supercede the first one: If macros are searched first, (2)
+ * will be found ahead of the built-in FWord (which is what we
+ * want) but later, when we search for (3) among the FWords, it
+ * will not be found ahead of (2). If, on the other hand, we
+ * search FWords first, the macro defined in (2) will never be
+ * found.
+ * We need a way to define both (all?) types of definitions in a
+ * single vocabulary that will honor the LIFO order of def'ns.
+ *
+ * Mon, 19 Dec 2005 by David L. Paktor
+ * Begin development of implementation of a way to define both (all?)
+ * types of definitions in a single tic_hdr_t type vocabulary.
+ *
+ **************************************************************************** */
-static token_t *dictionary=NULL;
-static token_t *forthwords=NULL;
-static u16 lookup_token_dict(char *name, token_t *dict)
+
+/* **************************************************************************
+ *
+ * We will be creating several different lists of initial built-in
+ * definitions; together, they constitute the Global Vocabulary.
+ * (We will avoid the term "dictionary", since, in classical
+ * Forth terminology, it refers to the complete collection of
+ * vocabularies in an application.) The usage of the pointer
+ * to the Global Vocabulary is central to the operation of this
+ * program and the maintenance programmer needs to understand it.
+ * We may also refer to the Global Vocabulary as the "core" vocab.
+ *
+ * Each initial list will be created as an array of TIC-header entries.
+ * Because the global vocabulary is expandable by the user,
+ * we will not be searching the lists as arrays but rather as
+ * linked-lists; the run-time initialization routine will fill
+ * in their link-fields and also will link the various lists
+ * together, so we can group their initial declarations according
+ * to our convenience.
+ *
+ * A single pointer, called the "Global Vocabulary Dictionary Pointer"
+ * (okay, so classical Forth terminology isn't completely rigorous...)
+ * and abbreviated GV_DP, will point to the "tail" of the "thread".
+ * Similar vocabularies will be created for the device-nodes; look
+ * in the file devnode.fth for a more detailed discussion of those.
+ *
+ * The "FC-Tokens" list contains the names and FCode numeric tokens
+ * of the straightforward FORTH words that simply write a token
+ * directly to the tokenized output. We need to access these
+ * without being confused by aliases or other distractions, so
+ * we will keep a pointer to them especially for that purpose.
+ * Therefore it is IMPORTANT: that the "FC-Tokens" list MUST be the
+ * first table linked by the initialization routine, so that its
+ * last-searched entry's link-field is NULL.
+ *
+ * The "FWords" list contains FORTH words that require additional
+ * special action at tokenization-time. Their numeric values
+ * are derived from the fword_token enumeration declaration,
+ * and are used as the control-expression for a SWITCH statement
+ * with a large number of CASE labels in the handle_internal()
+ * function.
+ *
+ * The "Shared Words" list contains FORTH words that can be executed
+ * similarly both during "Tokenizer Escape" mode (i.e., the scope
+ * of the special brackets: tokenizer[ ... ]tokenizer ) and
+ * also within "Normal Tokenization" mode. Their numeric values
+ * are derived and used the same way as the "FWords". Since we
+ * will be needing to do a separate search through them at times,
+ * we will also need a lower-bracket pointer for them. (An upper
+ * bracket is irrelevant for these, because aliases can be added.
+ * This is not the case for the "FC-Tokens" list, because searches
+ * through those will be conducted from within this program.)
+ *
+ * The "definer" field in the TIC-header structure is primarily used to
+ * detect attempts to apply the TO directive to an inappropriate
+ * target. Its numeric values are a subset of the "FWord tokens".
+ * Certain "FC-Token" names are specified to be valid TO targets;
+ * their entries' "definer" fields will be initialized accordingly.
+ * Entries in FWord Token lists that are "shared" between "Normal
+ * Tokenization" and "Tokenizer Escape" modes will have their
+ * "definer" fields initialized to COMMON_FWORD . All other
+ * entries' "definer" fields will be initialized to UNSPECIFIED .
+ *
+ * Other files maintain and support additional lists with the same
+ * structure, which need to be linked together with the lists
+ * declared here. We prefer to keep the GV_DP private to this
+ * file, so it will be passed as a parameter where needed. (I'm
+ * not pleased to note, however, that it can't be kept completely
+ * private; it's needed for add_user_macro() and possibly other
+ * functions outside this file.)
+ *
+ * The words that can only be used during "Tokenizer Escape" mode and
+ * the IBM-style "Locals", as well as the device-node vocabularies,
+ * will need to be separate and will not be linked together with
+ * the Global Vocabulary.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * We'll be initializing the lists later, but will be referencing
+ * the pointers sooner, so we need to declare the pointers here.
+ *
+ * We will keep all of these pointers private to this file.
+ *
+ **************************************************************************** */
+
+static tic_hdr_t *global_voc_dict_ptr = NULL; /* The Global Vocabulary */
+static tic_hdr_t *fc_tokens_list_ender = NULL; /* Tokens search ends here */
+static tic_hdr_t *fc_tokens_list_start = NULL; /* Start the search here */
+static tic_hdr_t *shared_fwords_ender = NULL; /* Shared FWords search end */
+static tic_hdr_t *global_voc_reset_ptr = NULL; /* Reset-point for G.V. */
+
+
+/* **************************************************************************
+ *
+ * Function name: lookup_core_word
+ * Synopsis: Return a pointer to the data-structure of the named
+ * word in the "Global" Vocabulary
+ *
+ * Inputs:
+ * Parameters:
+ * tname The name to look up
+ * Local Static Variables:
+ * global_voc_dict_ptr "Tail" of Global Vocabulary
+ *
+ * Outputs:
+ * Returned Value: Pointer to the data-structure, or
+ * NULL if not found.
+ *
+ **************************************************************************** */
+
+tic_hdr_t *lookup_core_word( char *tname)
{
- token_t *curr;
-
- for (curr=dict; curr!=NULL; curr=curr->next)
- if (!strcasecmp(name,(char *)curr->name))
- break;
+ tic_hdr_t *found ;
- if (curr)
- return curr->fcode;
-#ifdef DEBUG_TOKE
- printf("warning: token '%s' does not exist.\n", name);
-#endif
- return 0xffff;
+ found = lookup_tic_entry( tname, global_voc_dict_ptr);
+ return ( found ) ;
}
-u16 lookup_token(char *name)
+/* **************************************************************************
+ *
+ * Function name: exists_in_core
+ * Synopsis: Confirm whether the given name exists in the
+ * Global (aka "core") Vocabulary. Search the
+ * Global Vocabulary exclusively.
+ *
+ * Inputs:
+ * Parameters:
+ * name The name for which to look
+ * Local Static Variables:
+ * global_voc_dict_ptr "Tail" of Global Vocabulary
+ *
+ * Outputs:
+ * Returned Value: TRUE if name is found.
+ *
+ **************************************************************************** */
+
+bool exists_in_core( char *name)
{
- return lookup_token_dict(name, dictionary);
+ return exists_in_tic_vocab( name, global_voc_dict_ptr );
}
-u16 lookup_fword(char *name)
+/* **************************************************************************
+ *
+ * Function name: handle_core_word
+ * Synopsis: Perform a function in the "Global" Vocabulary and
+ * indicate whether the name is valid.
+ *
+ * Inputs:
+ * Parameters:
+ * tname The name to handle
+ * Local Static Variables:
+ * global_voc_dict_ptr "Tail" of Global Vocabulary
+ *
+ * Outputs:
+ * Returned Value: TRUE if the given name is valid in Global Vocab
+ *
+ * Error Detection:
+ * If the name is not in the "Global" Vocabulary, let the calling
+ * routine determine whether to print an error message or to
+ * try it out as a number.
+ *
+ **************************************************************************** */
+
+bool handle_core_word( char *tname )
{
- return lookup_token_dict(name, forthwords);
+ bool retval;
+
+ retval = handle_tic_vocab( tname, global_voc_dict_ptr );
+
+ return ( retval ) ;
}
-static int add_token_dict(u16 number, char *name, token_t **dict)
+
+/* **************************************************************************
+ *
+ * Function name: create_core_alias
+ * Synopsis: Create, in the "Global" ("core") Vocabulary, an entry
+ * for NEW_NAME that behaves the same as the latest
+ * definition of OLD_NAME, and whose behavior will
+ * not change even if a new definition of OLD_NAME
+ * is overlaid. Indicate if successful.
+ *
+ * Inputs:
+ * Parameters:
+ * new_name The name for the new alias to be created
+ * old_name The name of the old function to be duplicated
+ * Local Static Variables:
+ * global_voc_dict_ptr "Tail" of Global Vocabulary
+ *
+ * Outputs:
+ * Returned Value: TRUE if OLD_NAME was found.
+ * Local Static Variables:
+ * global_voc_dict_ptr Updated with the new entry
+ * Memory Allocated
+ * By support routine.
+ *
+ * Process Explanation:
+ * Both the "old" and "new" names are presumed to already point to
+ * stable, freshly allocated memory-spaces.
+ *
+ **************************************************************************** */
+
+bool create_core_alias( char *new_name, char *old_name)
{
- token_t *curr;
+ bool retval = create_tic_alias( new_name, old_name, &global_voc_dict_ptr);
+ return ( retval );
+}
- curr=malloc(sizeof(token_t));
- if(!curr) {
- printf("Out of memory while adding token.\n");
- exit(-ENOMEM);
+/* **************************************************************************
+ *
+ * The functions that go into the various lists' FUNCT field may be
+ * defined below, or might be defined externally.
+ *
+ * Often, we will need a function that merely recasts the type of the
+ * parameter field before passing it to the function that does
+ * the actual work.
+ *
+ * Prologs will be brief or even non-existent.
+ *
+ * Initialization macro definitions will accompany the functions.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * For the "FCode-Tokens" list, simply generate the token directly.
+ * We need this layer for param type conversion.
+ * In case we're ever able to eliminate it, (or just on General
+ * Principles) we'll invoke it via a macro...
+ *
+ **************************************************************************** */
+
+static void emit_fc_token( tic_param_t pfield)
+{
+ u16 fc_tok = (u16)pfield.deflt_elem;
+ emit_fcode( fc_tok);
+}
+
+#define FC_TOKEN_FUNC emit_fc_token
+
+#define BUILTIN_FCODE( tok, nam) \
+ VALPARAM_TIC(nam, FC_TOKEN_FUNC, tok , UNSPECIFIED )
+
+/* Built-in FCodes with known definers: */
+#define BI_FCODE_VALUE( tok, nam) \
+ VALPARAM_TIC(nam, FC_TOKEN_FUNC, tok , VALUE )
+
+#define BI_FCODE_VRBLE( tok, nam) \
+ VALPARAM_TIC(nam, FC_TOKEN_FUNC, tok , VARIABLE )
+
+#define BI_FCODE_DEFER( tok, nam) \
+ VALPARAM_TIC(nam, FC_TOKEN_FUNC, tok , DEFER )
+
+#define BI_FCODE_CONST( tok, nam) \
+ VALPARAM_TIC(nam, FC_TOKEN_FUNC, tok , CONST )
+
+/* **************************************************************************
+ *
+ * The "FCode-Tokens" list includes tokens that are identified
+ * in the Standard as Obsolete. We will define a function
+ * that issues a WARNING before generating the token, and
+ * assign it to those elements of the list.
+ *
+ * Control the message via a command-line flag.
+ *
+ **************************************************************************** */
+
+static void obsolete_warning( void)
+{
+ if ( obso_fcode_warning )
+ {
+ tokenization_error( WARNING, "%s is an Obsolete FCode.\n",
+ strupr(statbuf) );
+ }
+}
+
+static void obsolete_fc_token( tic_param_t pfield)
+{
+ obsolete_warning();
+ emit_fc_token( pfield);
+}
+
+#define OBSO_FC_FUNC obsolete_fc_token
+
+#define OBSOLETE_FCODE( tok, nam) \
+ VALPARAM_TIC(nam, OBSO_FC_FUNC, tok , UNSPECIFIED )
+
+#define OBSOLETE_VALUE( tok, nam) \
+ VALPARAM_TIC(nam, OBSO_FC_FUNC, tok , VALUE )
+
+
+/* **************************************************************************
+ *
+ * The function for most of the "FWords" list, handle_internal() ,
+ * is defined externally, but not exported in a .h file,
+ * because we want to keep it as private as possible.
+ * We will declare its prototype here.
+ *
+ * Initialization macros for both "Normal Mode"-only and
+ * "Shared" entries are also defined here.
+ *
+ * Arguments:
+ * fwt (fword_token) Value of the FWord Token (from Enum list)
+ * nam (string) Name of the entry as seen in the source
+ *
+ **************************************************************************** */
+
+void handle_internal( tic_param_t pfield);
+/* "Skip-a-string when Ignoring" function. Same args and limited-proto ... */
+void skip_string( tic_param_t pfield);
+
+#define FWORD_EXEC_FUNC handle_internal
+
+#define BUILTIN_FWORD( fwt, nam) \
+ FWORD_TKN_TIC(nam, FWORD_EXEC_FUNC, fwt, BI_FWRD_DEFN )
+
+#define SHARED_FWORD( fwt, nam) \
+ FWORD_TKN_TIC(nam, FWORD_EXEC_FUNC, fwt, COMMON_FWORD )
+
+/* Variants: When Ignoring, SKip One Word */
+#define SHR_FWD_SKOW( fwt, nam) \
+ DUALFUNC_FWT_TIC(nam, FWORD_EXEC_FUNC, fwt, skip_a_word, COMMON_FWORD )
+
+/* Variants: When Ignoring, SKip one Word in line */
+#define SH_FW_SK_WIL( fwt, nam) \
+ DUALFUNC_FWT_TIC(nam, FWORD_EXEC_FUNC, fwt, \
+ skip_a_word_in_line, COMMON_FWORD )
+
+/* When Ignoring, SKip Two Words in line */
+#define SH_FW_SK2WIL( fwt, nam) \
+ DUALFUNC_FWT_TIC(nam, FWORD_EXEC_FUNC, fwt, \
+ skip_two_words_in_line, COMMON_FWORD )
+
+/* **************************************************************************
+ *
+ * Some of the entries in the "FWords" list -- both "Normal" (Built-in)
+ * and "Shared" also act as an "Ignore-handler".
+ *
+ * Arguments:
+ * nam (string) Name of the entry as seen in the source
+ * afunc (routine-name) Name of internal "active" function
+ * pval (integer) The "param field" item
+ * ifunc (routine-name) Name of "ignore-handling" function
+ *
+ **************************************************************************** */
+
+#define SHARED_IG_HDLR(nam, afunc, pval, ifunc) \
+ DUFNC_FWT_PARM(nam, afunc, pval, ifunc, COMMON_FWORD )
+
+/* A "Shared" entry that uses the same routine for both of its functions */
+#define SHR_SAMIG_FWRD( fwt, nam) \
+ DUFNC_FWT_PARM(nam, FWORD_EXEC_FUNC, fwt, FWORD_EXEC_FUNC, COMMON_FWORD )
+
+/* **************************************************************************
+ *
+ * But the "Normal" (Built-in) FWord Ignore-handler uses the same
+ * routine as the BUILTIN_FWORD for both of its functions.
+ *
+ * Arguments:
+ * fwt (fword_token) Value of the FWord Token (from Enum list)
+ * nam (string) Name of the entry as seen in the source
+ *
+ **************************************************************************** */
+#define BI_IG_FW_HDLR( fwt, nam) \
+ DUALFUNC_FWT_TIC(nam, FWORD_EXEC_FUNC, fwt, FWORD_EXEC_FUNC, BI_FWRD_DEFN )
+
+/* A variant: A "Built-In FWorD that SKiPs One Word", when Ignoring */
+#define BI_FWD_SKP_OW( fwt, nam) \
+ DUALFUNC_FWT_TIC(nam, FWORD_EXEC_FUNC, fwt, skip_a_word, BI_FWRD_DEFN )
+
+/* Another variant: A "Built-In FWorD String". skip_string when Ignoring */
+#define BI_FWD_STRING( fwt, nam) \
+ DUALFUNC_FWT_TIC(nam, FWORD_EXEC_FUNC, fwt, skip_string, BI_FWRD_DEFN )
+
+/* **************************************************************************
+ *
+ * In order to protect device-nodes' methods from being accessed
+ * by other device-nodes (with the attendant potential for
+ * disastrous consequences), we must establish a few rules:
+ *
+ * Each device-node has a separate vocabulary for its methods.
+ * New definitions are made to the "current" device's vocabulary.
+ * Searches for names go through the "current" device-node's
+ * vocabulary first, then through the core dictionary.
+ *
+ * A new-device (in interpretation-mode) creates a new device-node
+ * vocabulary. The node that had been current (presumably its
+ * parent) remains in memory but inactive.
+ *
+ * A finish-device (again, only in interpretation-mode) removes the
+ * current device-node's vocabulary from memory; its presumed
+ * parent once again becomes current.
+ *
+ * Tokenization starts with an implicit "new-device" in effect.
+ * The top-level device-node is never removed.
+ *
+ * The Global Variable current_definitions points to the vocabulary
+ * to which we will add and through which we will search first.
+ *
+ * If "global" scope is in effect, then current_definitions will
+ * point to the "Global" (also called "core") vocabulary.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Support for operations in "current" -- i.e., "global" vis-a-vis
+ * "device" -- scope.
+ * "Global" scope will not recognize words defined in "device" scope,
+ * but "device" scope will recognize "global" words.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Functions to enter "global" scope and resume "device" scope.
+ *
+ **************************************************************************** */
+
+static tic_hdr_t **save_device_definitions;
+/* Export the indication that "global" scope is in effect */
+bool scope_is_global = FALSE;
+
+
+void enter_global_scope( void )
+{
+ if ( scope_is_global )
+{
+ tokenization_error( WARNING,
+ "%s -- Global Scope already in effect; ignoring.\n",
+ strupr(statbuf) );
+ }else{
+ tokenization_error( INFO,
+ "Initiating Global Scope definitions.\n" );
+ scope_is_global = TRUE;
+ save_device_definitions = current_definitions;
+ current_definitions = &global_voc_dict_ptr;
+ }
+}
+
+void resume_device_scope( void )
+{
+ if ( scope_is_global )
+ {
+ tokenization_error( INFO,
+ "Terminating Global Scope definitions; "
+ "resuming Device-node definitions.\n" );
+ current_definitions = save_device_definitions;
+ scope_is_global = FALSE;
+ }else{
+ tokenization_error( WARNING,
+ "%s -- Device-node Scope already in effect; ignoring.\n",
+ strupr(statbuf) );
+ }
+
+}
+
+/* **************************************************************************
+ *
+ * Function name: lookup_current
+ * Synopsis: Return a pointer to the data-structure of the named
+ * word, either in the Current Device-Node vocab,
+ * or in the Global ("core") Vocabulary.
+ *
+ * Inputs:
+ * Parameters:
+ * tname The name to look for
+ * Global Variables:
+ * current_definitions Current vocabulary: Device-Node, or
+ * "core" if "global" scope in effect.
+ * scope_is_global TRUE if "global" scope is in effect
+ * Local Static Variables:
+ * global_voc_dict_ptr "Tail" of Global Vocabulary
+ *
+ * Outputs:
+ * Returned Value: Pointer to the data-structure, or
+ * NULL if not found.
+ *
+ * Process Explanation:
+ * If a current Device-Node Vocabulary in effect, search through it.
+ * If the given name was not found, and "global" scope is not in
+ * effect (i.e., "core" was not already searched), make a
+ * separate search through the Global ("core") Vocabulary
+ *
+ * Extraneous Remarks:
+ * This is the central routine for doing general word-searches that
+ * make use of the "normal"-mode search-list.
+ *
+ **************************************************************************** */
+
+tic_hdr_t *lookup_current( char *tname)
+{
+ /* Search Current Device Vocabulary ahead of global (core) vocabulary */
+ tic_hdr_t *retval;
+ retval = lookup_tic_entry( tname, *current_definitions);
+ if ( (retval == NULL) && INVERSE(scope_is_global) )
+{
+ retval = lookup_core_word( tname);
+ }
+ return ( retval );
+}
+
+/* **************************************************************************
+ *
+ * Function name: exists_in_current
+ * Synopsis: Confirm whether the given name exists either
+ * in the Current Device-Node vocab,
+ * or in the Global ("core") Vocabulary,
+ * or in Tokenizer Escape Mode, if that's current.
+ *
+ * Inputs:
+ * Parameters:
+ * tname The name to look for
+ *
+ * Outputs:
+ * Returned Value: TRUE if name is found
+ *
+ **************************************************************************** */
+
+bool exists_in_current( char *tname)
+{
+ tic_hdr_t *found = lookup_word( tname, NULL, NULL);
+ bool retval = BOOLVAL ( found != NULL);
+ return( retval);
}
- curr->next=*dict;
- curr->fcode=number;
- curr->name=(u8 *)name;
- *dict=curr;
- return 0;
+/* **************************************************************************
+ *
+ * Function name: handle_current
+ * Synopsis: Perform a function in the current device-node vocab,
+ * if one is in effect, or in the "Global" Vocabulary.
+ * Indicate whether the name is valid.
+ *
+ * Inputs:
+ * Parameters:
+ * tname The name to handle
+ * Global Variables:
+ * current_definitions Device-Node (or Global) Vocabulary
+ * currently in effect.
+ * scope_is_global TRUE if "global" scope is in effect
+ * Local Static Variables:
+ *
+ * Outputs:
+ * Returned Value: TRUE if the given name is valid
+ *
+ **************************************************************************** */
+
+bool handle_current( char *tname )
+{
+ bool retval = handle_tic_vocab( tname, *current_definitions );
+
+ if ( INVERSE(retval) && INVERSE(scope_is_global) )
+ {
+ retval = handle_core_word( tname );
+ }
+ return ( retval );
+
}
-int add_token(u16 number, char *name)
+
+/* **************************************************************************
+ *
+ * Function name: lookup_in_dev_node
+ * Synopsis: Return a pointer to the data-structure of the
+ * named word in the Current device node, if
+ * in "Device" scope. Used for error-reporting.
+ *
+ * Inputs:
+ * Parameters:
+ * tname The name to look for
+ * Global Variables:
+ * current_definitions Device-Node (or Global) Vocabulary
+ * currently in effect.
+ * scope_is_global FALSE if "Device" scope is in effect
+ *
+ * Outputs:
+ * Returned Value: Pointer to the data-structure, or
+ * NULL if not found.
+ *
+ **************************************************************************** */
+
+tic_hdr_t *lookup_in_dev_node( char *tname)
{
- return add_token_dict(number, name, &dictionary);
+ tic_hdr_t *retval = NULL;
+
+ if ( INVERSE(scope_is_global) )
+{
+ retval = lookup_tic_entry( tname, *current_definitions);
}
+ return ( retval );
+}
-static int add_special(u16 number, char *name)
+
+/* **************************************************************************
+ *
+ * In order to avoid unintentional "recursive"-ness, we need a way
+ * to render a newly created colon-definition non-findable
+ * until it's completed.
+ *
+ * We will accomplish this by saving and reverting the pointer to
+ * the newest entry, when we call the hide_last_colon() , and
+ * by restoring the pointer when we call reveal_last_colon()
+ *
+ * We need, therefore, to save the pointer to the last entry before
+ * we create the new entry.
+ *
+ **************************************************************************** */
+
+/* Update this each time a new definition is entered */
+static tic_hdr_t *save_current = NULL;
+
+/* **************************************************************************
+ *
+ * Function name: add_to_current
+ * Synopsis: Add a new entry to the "current" scope of definitions,
+ * which may be either the Global Vocabulary or the
+ * current Device-Node Vocabulary.
+ *
+ * Inputs:
+ * Parameters:
+ * name The name of the new entry
+ * fc_token The new entry's assigned FCode-number
+ * fw_definer The new entry's definer
+ * define_token If FALSE, suppress adding the entry,
+ * but preserve the side-effect of
+ * setting save_current
+ * Global Variables:
+ * current_definitions Pointer to pointer to "tail" of the
+ * Vocabulary currently in effect;
+ * either Device-node or Global.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * *current_definitions Updated with the new entry
+ * Local Static Variables:
+ * save_current Pointer to previous entry
+ * Memory Allocated
+ * For the new entry's copy of the name.
+ * When Freed?
+ * When the Device-Node is "finish"ed or the Global Vocabulary
+ * is reset, or when the program exits.
+ *
+ * Process Explanation:
+ * Because current_definitions points to the Global Vocabulary
+ * pointer during "global" scope, this routine is extremely
+ * straightforward.
+ * All user-defined words have the same action, i.e., emitting
+ * the assigned FCode-number. The new entry's "parameter
+ * field" size is, of course, zero; the "ignore-function"
+ * is NULL.
+ *
+ * Extraneous Remarks:
+ * The define_token parameter is a late addition, necessitated
+ * by the decision to continue processing after an erroneous
+ * attempt to create a definition inside a control-structure,
+ * in order to catch other errors.
+ *
+ *
+ **************************************************************************** */
+
+void add_to_current( char *name,
+ TIC_P_DEFLT_TYPE fc_token,
+ fwtoken definer,
+ bool define_token)
{
- return add_token_dict(number, name, &forthwords);
+ save_current = *current_definitions;
+ if ( define_token )
+{
+ char *nu_name = strdup( name);
+ add_tic_entry( nu_name, FC_TOKEN_FUNC, fc_token,
+ definer, 0 , NULL, current_definitions );
+ }
}
-void init_dictionary(void)
+
+void hide_last_colon ( void )
{
- add_token( 0x000, "end0" );
- add_token( 0x010, "b(lit)" );
- add_token( 0x011, "b(')" );
- add_token( 0x012, "b(\")" );
- add_token( 0x013, "bbranch" );
- add_token( 0x014, "b?branch" );
- add_token( 0x015, "b(loop)" );
- add_token( 0x016, "b(+loop)" );
- add_token( 0x017, "b(do)" );
- add_token( 0x018, "b(?do)" );
- add_token( 0x019, "i" );
- add_token( 0x01a, "j" );
- add_token( 0x01b, "b(leave)" );
- add_token( 0x01c, "b(of)" );
- add_token( 0x01d, "execute" );
- add_token( 0x01e, "+" );
- add_token( 0x01f, "-" );
- add_token( 0x020, "*" );
- add_token( 0x021, "/" );
- add_token( 0x022, "mod" );
- add_token( 0x023, "and" );
- add_token( 0x024, "or" );
- add_token( 0x025, "xor" );
- add_token( 0x026, "invert" );
- add_token( 0x027, "lshift" );
- add_token( 0x028, "rshift" );
- add_token( 0x029, ">>a" );
- add_token( 0x02a, "/mod" );
- add_token( 0x02b, "u/mod" );
- add_token( 0x02c, "negate" );
- add_token( 0x02d, "abs" );
- add_token( 0x02e, "min" );
- add_token( 0x02f, "max" );
- add_token( 0x030, ">r" );
- add_token( 0x031, "r>" );
- add_token( 0x032, "r@" );
- add_token( 0x033, "exit" );
- add_token( 0x034, "0=" );
- add_token( 0x035, "0<>" );
- add_token( 0x036, "0<" );
- add_token( 0x037, "0<=" );
- add_token( 0x038, "0>" );
- add_token( 0x039, "0>=" );
- add_token( 0x03a, "<" );
- add_token( 0x03b, ">" );
- add_token( 0x03c, "=" );
- add_token( 0x03d, "<>" );
- add_token( 0x03e, "u>" );
- add_token( 0x03f, "u<=" );
- add_token( 0x040, "u<" );
- add_token( 0x041, "u>=" );
- add_token( 0x042, ">=" );
- add_token( 0x043, "<=" );
- add_token( 0x044, "between" );
- add_token( 0x045, "within" );
- add_token( 0x046, "drop" );
- add_token( 0x047, "dup" );
- add_token( 0x048, "over" );
- add_token( 0x049, "swap" );
- add_token( 0x04A, "rot" );
- add_token( 0x04b, "-rot" );
- add_token( 0x04c, "tuck" );
- add_token( 0x04d, "nip" );
- add_token( 0x04e, "pick" );
- add_token( 0x04f, "roll" );
- add_token( 0x050, "?dup" );
- add_token( 0x051, "depth" );
- add_token( 0x052, "2drop" );
- add_token( 0x053, "2dup" );
- add_token( 0x054, "2over" );
- add_token( 0x055, "2swap" );
- add_token( 0x056, "2rot" );
- add_token( 0x057, "2/" );
- add_token( 0x058, "u2/" );
- add_token( 0x059, "2*" );
- add_token( 0x05a, "/c" );
- add_token( 0x05b, "/w" );
- add_token( 0x05c, "/l" );
- add_token( 0x05d, "/n" );
- add_token( 0x05e, "ca+" );
- add_token( 0x05f, "wa+" );
- add_token( 0x060, "la+" );
- add_token( 0x061, "na+" );
- add_token( 0x062, "char+" );
- add_token( 0x063, "wa1+" );
- add_token( 0x064, "la1+" );
- add_token( 0x065, "cell+" );
- add_token( 0x066, "chars" );
- add_token( 0x067, "/w*" );
- add_token( 0x068, "/l*" );
- add_token( 0x069, "cells" );
- add_token( 0x06a, "on" );
- add_token( 0x06b, "off" );
- add_token( 0x06c, "+!" );
- add_token( 0x06d, "@" );
- add_token( 0x06e, "l@" );
- add_token( 0x06f, "w@" );
- add_token( 0x070, "<w@" );
- add_token( 0x071, "c@" );
- add_token( 0x072, "!" );
- add_token( 0x073, "l!" );
- add_token( 0x074, "w!" );
- add_token( 0x075, "c!" );
- add_token( 0x076, "2@" );
- add_token( 0x077, "2!" );
- add_token( 0x078, "move" );
- add_token( 0x079, "fill" );
- add_token( 0x07a, "comp" );
- add_token( 0x07b, "noop" );
- add_token( 0x07c, "lwsplit" );
- add_token( 0x07d, "wljoin" );
- add_token( 0x07e, "lbsplit" );
- add_token( 0x07f, "bljoin" );
- add_token( 0x080, "wbflip" );
- add_token( 0x081, "upc" );
- add_token( 0x082, "lcc" );
- add_token( 0x083, "pack" );
- add_token( 0x084, "count" );
- add_token( 0x085, "body>" );
- add_token( 0x086, ">body" );
- add_token( 0x087, "fcode-revision" );
- add_token( 0x088, "span" );
- add_token( 0x089, "unloop" );
- add_token( 0x08a, "expect" );
- add_token( 0x08b, "alloc-mem" );
- add_token( 0x08c, "free-mem" );
- add_token( 0x08d, "key?" );
- add_token( 0x08e, "key" );
- add_token( 0x08f, "emit" );
- add_token( 0x090, "type" );
- add_token( 0x091, "(cr" );
- add_token( 0x092, "cr" );
- add_token( 0x093, "#out" );
- add_token( 0x094, "#line" );
- add_token( 0x095, "hold" );
- add_token( 0x096, "<#" );
- add_token( 0x097, "u#>" );
- add_token( 0x098, "sign" );
- add_token( 0x099, "u#" );
- add_token( 0x09a, "u#s" );
- add_token( 0x09b, "u." );
- add_token( 0x09c, "u.r" );
- add_token( 0x09d, "." );
- add_token( 0x09e, ".r" );
- add_token( 0x09f, ".s" );
- add_token( 0x0a0, "base" );
- add_token( 0x0a1, "convert" );
- add_token( 0x0a2, "$number" );
- add_token( 0x0a3, "digit" );
- add_token( 0x0a4, "-1" );
- add_token( 0x0a5, "0" );
- add_token( 0x0a6, "1" );
- add_token( 0x0a7, "2" );
- add_token( 0x0a8, "3" );
- add_token( 0x0a9, "bl" );
- add_token( 0x0aa, "bs" );
- add_token( 0x0ab, "bell" );
- add_token( 0x0ac, "bounds" );
- add_token( 0x0ad, "here" );
- add_token( 0x0ae, "aligned" );
- add_token( 0x0af, "wbsplit" );
- add_token( 0x0b0, "bwjoin" );
- add_token( 0x0b1, "b(<mark)" );
- add_token( 0x0b2, "b(>resolve)" );
- add_token( 0x0b3, "set-token-table" );
- add_token( 0x0b4, "set-table" );
- add_token( 0x0b5, "new-token" );
- add_token( 0x0b6, "named-token" );
- add_token( 0x0b7, "b(:)" );
- add_token( 0x0b8, "b(value)" );
- add_token( 0x0b9, "b(variable)" );
- add_token( 0x0ba, "b(constant)" );
- add_token( 0x0bb, "b(create)" );
- add_token( 0x0bc, "b(defer)" );
- add_token( 0x0bd, "b(buffer:)" );
- add_token( 0x0be, "b(field)" );
- add_token( 0x0bf, "b(code)" );
- add_token( 0x0c0, "instance" );
- add_token( 0x0c2, "b(;)" );
- add_token( 0x0c3, "b(to)" );
- add_token( 0x0c4, "b(case)" );
- add_token( 0x0c5, "b(endcase)" );
- add_token( 0x0c6, "b(endof)" );
- add_token( 0x0c7, "#" );
- add_token( 0x0c8, "#s" );
- add_token( 0x0c9, "#>" );
- add_token( 0x0ca, "external-token" );
- add_token( 0x0cb, "$find" );
- add_token( 0x0cc, "offset16" );
- add_token( 0x0cd, "evaluate" );
- add_token( 0x0d0, "c," );
- add_token( 0x0d1, "w," );
- add_token( 0x0d2, "l," );
- add_token( 0x0d3, "," );
- add_token( 0x0d4, "um*" );
- add_token( 0x0d5, "um/mod" );
- add_token( 0x0d8, "d+" );
- add_token( 0x0d9, "d-" );
- add_token( 0x0da, "get-token" );
- add_token( 0x0db, "set-token" );
- add_token( 0x0dc, "state" );
- add_token( 0x0dd, "compile" );
- add_token( 0x0de, "behavior" );
- add_token( 0x0f0, "start0" );
- add_token( 0x0f1, "start1" );
- add_token( 0x0f2, "start2" );
- add_token( 0x0f3, "start4" );
- add_token( 0x0fc, "ferror" );
- add_token( 0x0fd, "version1" );
- add_token( 0x0fe, "4-byte-id" );
- add_token( 0x0ff, "end1" );
- add_token( 0x101, "dma-alloc" );
- add_token( 0x102, "my-address" );
- add_token( 0x103, "my-space" );
- add_token( 0x104, "memmap" );
- add_token( 0x105, "free-virtual" );
- add_token( 0x106, ">physical" );
- add_token( 0x10f, "my-params" );
- add_token( 0x110, "property" );
- add_token( 0x111, "encode-int" );
- add_token( 0x112, "encode+" );
- add_token( 0x113, "encode-phys" );
- add_token( 0x114, "encode-string" );
- add_token( 0x115, "encode-bytes" );
- add_token( 0x116, "reg" );
- add_token( 0x117, "intr" );
- add_token( 0x118, "driver" );
- add_token( 0x119, "model" );
- add_token( 0x11a, "device-type" );
- add_token( 0x11b, "parse-2int" );
- add_token( 0x11c, "is-install" );
- add_token( 0x11d, "is-remove" );
- add_token( 0x11e, "is-selftest" );
- add_token( 0x11f, "new-device" );
- add_token( 0x120, "diagnostic-mode?" );
- add_token( 0x121, "display-status" );
- add_token( 0x122, "memory-test-issue" );
- add_token( 0x123, "group-code" );
- add_token( 0x124, "mask" );
- add_token( 0x125, "get-msecs" );
- add_token( 0x126, "ms" );
- add_token( 0x127, "finish-device" );
- add_token( 0x128, "decode-phys" );
- add_token( 0x12b, "interpose" );
- add_token( 0x130, "map-low" );
- add_token( 0x131, "sbus-intr>cpu" );
- add_token( 0x150, "#lines" );
- add_token( 0x151, "#columns" );
- add_token( 0x152, "line#" );
- add_token( 0x153, "column#" );
- add_token( 0x154, "inverse?" );
- add_token( 0x155, "inverse-screen?" );
- add_token( 0x156, "frame-buffer-busy?" );
- add_token( 0x157, "draw-character" );
- add_token( 0x158, "reset-screen" );
- add_token( 0x159, "toggle-cursor" );
- add_token( 0x15a, "erase-screen" );
- add_token( 0x15b, "blink-screen" );
- add_token( 0x15c, "invert-screen" );
- add_token( 0x15d, "insert-characters" );
- add_token( 0x15e, "delete-characters" );
- add_token( 0x15f, "insert-lines" );
- add_token( 0x160, "delete-lines" );
- add_token( 0x161, "draw-logo" );
- add_token( 0x162, "frame-buffer-adr" );
- add_token( 0x163, "screen-height" );
- add_token( 0x164, "screen-width" );
- add_token( 0x165, "window-top" );
- add_token( 0x166, "window-left" );
- add_token( 0x16a, "default-font" );
- add_token( 0x16b, "set-font" );
- add_token( 0x16c, "char-height" );
- add_token( 0x16d, "char-width" );
- add_token( 0x16e, ">font" );
- add_token( 0x16f, "fontbytes" );
- add_token( 0x170, "fb1-draw-character" );
- add_token( 0x171, "fb1-reset-screen" );
- add_token( 0x172, "fb1-toggle-cursor" );
- add_token( 0x173, "fb1-erase-screen" );
- add_token( 0x174, "fb1-blink-screen" );
- add_token( 0x175, "fb1-invert-screen" );
- add_token( 0x176, "fb1-insert-characters" );
- add_token( 0x177, "fb1-delete-characters" );
- add_token( 0x178, "fb1-insert-lines" );
- add_token( 0x179, "fb1-delete-lines" );
- add_token( 0x17a, "fb1-draw-logo" );
- add_token( 0x17b, "fb1-install" );
- add_token( 0x17c, "fb1-slide-up" );
- add_token( 0x180, "fb8-draw-character" );
- add_token( 0x181, "fb8-reset-screen" );
- add_token( 0x182, "fb8-toggle-cursor" );
- add_token( 0x183, "fb8-erase-screen" );
- add_token( 0x184, "fb8-blink-screen" );
- add_token( 0x185, "fb8-invert-screen" );
- add_token( 0x186, "fb8-insert-characters" );
- add_token( 0x187, "fb8-delete-characters" );
- add_token( 0x188, "fb8-insert-lines" );
- add_token( 0x189, "fb8-delete-lines" );
- add_token( 0x18a, "fb8-draw-logo" );
- add_token( 0x18b, "fb8-install" );
- add_token( 0x1a0, "return-buffer" );
- add_token( 0x1a1, "xmit-packet" );
- add_token( 0x1a2, "poll-packet" );
- add_token( 0x1a4, "mac-address" );
- add_token( 0x201, "device-name" );
- add_token( 0x202, "my-args" );
- add_token( 0x203, "my-self" );
- add_token( 0x204, "find-package" );
- add_token( 0x205, "open-package" );
- add_token( 0x206, "close-package" );
- add_token( 0x207, "find-method" );
- add_token( 0x208, "call-package" );
- add_token( 0x209, "$call-parent" );
- add_token( 0x20a, "my-package" );
- add_token( 0x20b, "ihandle>phandle" );
- add_token( 0x20d, "my-unit" );
- add_token( 0x20e, "$call-method" );
- add_token( 0x20f, "$open-package" );
- add_token( 0x210, "processor-type" );
- add_token( 0x211, "firmware-version" );
- add_token( 0x212, "fcode-version" );
- add_token( 0x213, "alarm" );
- add_token( 0x214, "(is-user-word)" );
- add_token( 0x215, "suspend-fcode" );
- add_token( 0x216, "abort" );
- add_token( 0x217, "catch" );
- add_token( 0x218, "throw" );
- add_token( 0x219, "user-abort" );
- add_token( 0x21a, "get-my-property" );
- add_token( 0x21b, "decode-int" );
- add_token( 0x21c, "decode-string" );
- add_token( 0x21d, "get-inherited-property" );
- add_token( 0x21e, "delete-property" );
- add_token( 0x21f, "get-package-property" );
- add_token( 0x220, "cpeek" );
- add_token( 0x221, "wpeek" );
- add_token( 0x222, "lpeek" );
- add_token( 0x223, "cpoke" );
- add_token( 0x224, "wpoke" );
- add_token( 0x225, "lpoke" );
- add_token( 0x226, "lwflip" );
- add_token( 0x227, "lbflip" );
- add_token( 0x228, "lbflips" );
- add_token( 0x229, "adr-mask" );
- add_token( 0x230, "rb@" );
- add_token( 0x231, "rb!" );
- add_token( 0x232, "rw@" );
- add_token( 0x233, "rw!" );
- add_token( 0x234, "rl@" );
- add_token( 0x235, "rl!" );
- add_token( 0x236, "wbflips" );
- add_token( 0x237, "lwflips" );
- add_token( 0x238, "probe" );
- add_token( 0x239, "probe-virtual" );
- add_token( 0x23b, "child" );
- add_token( 0x23c, "peer" );
- add_token( 0x23d, "next-property" );
- add_token( 0x23e, "byte-load" );
- add_token( 0x23f, "set-args" );
- add_token( 0x240, "left-parse-string" );
+ tic_hdr_t *temp_vocab;
+ /* The add_to_current() function will have been called before this
+ * one when a new colon-definition is created, so save_current
+ * will have been set to point to the entry that had been made
+ * just before the newest one, which we are hiding here.
+ */
+
+ temp_vocab = save_current ;
+ save_current = *current_definitions;
+ *current_definitions = temp_vocab;
+
+}
+
+void reveal_last_colon ( void )
+{
+ /* We call this function either when the colon-definition is
+ * completed, or when "recursive"-ness is intentional.
+ */
+ *current_definitions = save_current ;
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: create_current_alias
+ * Synopsis: Create an alias for OLD_NAME, called NEW_NAME, in
+ * the "current" scope of definitions, which may
+ * be either the Global ("core") Vocabulary or the
+ * current Device-Node Vocabulary. Indicate if
+ * successful (i.e., OLD_NAME was valid).
+ * This is actually a little trickier than it may at
+ * first appear; read the Rules in the Process
+ * Explanation for full details...
+ *
+ * Inputs:
+ * Parameters:
+ * new_name The name for the new alias to be created
+ * old_name The name of the old function to be duplicated
+ * Global Variables:
+ * current_definitions Device-node vocabulary currently
+ * in effect.
+ * scope_is_global TRUE if "global" scope is in effect
+ * Local Static Variables:
+ * global_voc_dict_ptr "Tail" of Global Vocabulary
+ *
+ * Outputs:
+ * Returned Value: TRUE if OLD_NAME was found.
+ * Global Variables:
+ * *current_definitions Updated with the new entry
+ * Memory Allocated
+ * By support routine.
+ * When Freed?
+ * When RESET-SYMBOLS is issued (if "global" scope is in effect)
+ * or when the device-node is "finish"ed.
+ * Printout:
+ * Advisory message if Rule 3 (see below) is invoked.
+ *
+ * Process Explanation:
+ * Both the "old" and "new" names are presumed to already point to
+ * stable, freshly allocated memory-spaces.
+ * Rules:
+ * (1)
+ * If "global" scope is in effect, and the "old" name is found in
+ * the Global Vocabulary, then the "new" name will be created
+ * in the Global Vocabulary.
+ * (2)
+ * Similarly, if "device" scope is in effect, and the "old" name is
+ * found in the current device-node's vocabulary, the "new" name
+ * will be created in the current device-node's vocabulary.
+ * (3)
+ * BUT!: If "device" scope is in effect, and the "old" name is found
+ * in the Global Vocabulary, then the "new" name will be created
+ * in the current device-node's vocabulary. It will only be
+ * recognized in the scope of that device-node, and will be
+ * removed from memory when the device-node is "finish"ed.
+ * And, yes, it *is* supposed to work that way... ;-)
+ *
+ * Again, because current_definitions points to the Global Vocab
+ * pointer during "global" scope, the first two rules of this
+ * routine are extremely straightforward; it's Rule 3 that you
+ * have to watch out for... ;-)
+ *
+ * And one other thing:
+ * We will always make the alias's pfld_size zero. See the
+ * prolog for create_tic_alias() in ticvocab.c for details...
+ *
+ * Extraneous Remarks:
+ * I will stretch the rules of well-structured code here, too.
+ *
+ **************************************************************************** */
+
+bool create_current_alias( char *new_name, char *old_name )
+{
+ bool retval = FALSE;
+
+ if ( create_tic_alias( new_name, old_name, current_definitions) )
+ {
+ return ( TRUE );
+ }
+
+ if ( INVERSE(scope_is_global) )
+ {
+ tic_hdr_t *found = lookup_core_word( old_name );
+ if ( found != NULL )
+ {
+ add_tic_entry( new_name, found->funct,
+ found->pfield.deflt_elem,
+ found->fword_defr,
+ 0, found->ign_func,
+ current_definitions );
+ retval = TRUE;
+ {
+ tokenization_error( INFO,
+ "%s is a Global definition, but its alias, %s, "
+ "will only be defined %s",
+ strupr( old_name), new_name,
+ in_what_node( current_device_node) );
+ show_node_start();
+ }
+ }
+ }
+
+ return ( retval );
+}
+
+/* **************************************************************************
+ *
+ * Support functions specific to the lists will be defined
+ * after the lists are created.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Create the initial list (or "Table") of FCode-Tokens.
+ *
+ * Most Standard FCode tokens are not specified as to their definition
+ * type, but a few have a definer specified as either a VALUE, a
+ * VARIABLE or a DEFER; we will enter them with the appropriate macro.
+ *
+ **************************************************************************** */
+
+static tic_hdr_t tokens_table[] =
+{
+ BUILTIN_FCODE( 0x000, "end0" ) ,
+ BUILTIN_FCODE( 0x010, "b(lit)" ) ,
+ BUILTIN_FCODE( 0x011, "b(')" ) ,
+ BUILTIN_FCODE( 0x012, "b(\")" ) ,
+ BUILTIN_FCODE( 0x013, "bbranch" ) ,
+ BUILTIN_FCODE( 0x014, "b?branch" ) ,
+ BUILTIN_FCODE( 0x015, "b(loop)" ) ,
+ BUILTIN_FCODE( 0x016, "b(+loop)" ) ,
+ BUILTIN_FCODE( 0x017, "b(do)" ) ,
+ BUILTIN_FCODE( 0x018, "b(?do)" ) ,
+ BUILTIN_FCODE( 0x019, "i" ) ,
+ BUILTIN_FCODE( 0x01a, "j" ) ,
+ BUILTIN_FCODE( 0x01b, "b(leave)" ) ,
+ BUILTIN_FCODE( 0x01c, "b(of)" ) ,
+ BUILTIN_FCODE( 0x01d, "execute" ) ,
+ BUILTIN_FCODE( 0x01e, "+" ) ,
+ BUILTIN_FCODE( 0x01f, "-" ) ,
+ BUILTIN_FCODE( 0x020, "*" ) ,
+ BUILTIN_FCODE( 0x021, "/" ) ,
+ BUILTIN_FCODE( 0x022, "mod" ) ,
+ BUILTIN_FCODE( 0x023, "and" ) ,
+ BUILTIN_FCODE( 0x024, "or" ) ,
+ BUILTIN_FCODE( 0x025, "xor" ) ,
+ BUILTIN_FCODE( 0x026, "invert" ) ,
+ BUILTIN_FCODE( 0x026, "not" ) , /* Synonym for "invert" */
+ BUILTIN_FCODE( 0x027, "lshift" ) ,
+ BUILTIN_FCODE( 0x027, "<<" ) , /* Synonym for "lshift" */
+ BUILTIN_FCODE( 0x028, "rshift" ) ,
+ BUILTIN_FCODE( 0x028, ">>" ) , /* Synonym for "rshift" */
+ BUILTIN_FCODE( 0x029, ">>a" ) ,
+ BUILTIN_FCODE( 0x02a, "/mod" ) ,
+ BUILTIN_FCODE( 0x02b, "u/mod" ) ,
+ BUILTIN_FCODE( 0x02c, "negate" ) ,
+ BUILTIN_FCODE( 0x02d, "abs" ) ,
+ BUILTIN_FCODE( 0x02e, "min" ) ,
+ BUILTIN_FCODE( 0x02f, "max" ) ,
+ BUILTIN_FCODE( 0x030, ">r" ) ,
+ BUILTIN_FCODE( 0x031, "r>" ) ,
+ BUILTIN_FCODE( 0x032, "r@" ) ,
+ BUILTIN_FCODE( 0x033, "exit" ) ,
+ BUILTIN_FCODE( 0x034, "0=" ) ,
+ BUILTIN_FCODE( 0x035, "0<>" ) ,
+ BUILTIN_FCODE( 0x036, "0<" ) ,
+ BUILTIN_FCODE( 0x037, "0<=" ) ,
+ BUILTIN_FCODE( 0x038, "0>" ) ,
+ BUILTIN_FCODE( 0x039, "0>=" ) ,
+ BUILTIN_FCODE( 0x03a, "<" ) ,
+ BUILTIN_FCODE( 0x03b, ">" ) ,
+ BUILTIN_FCODE( 0x03c, "=" ) ,
+ BUILTIN_FCODE( 0x03d, "<>" ) ,
+ BUILTIN_FCODE( 0x03e, "u>" ) ,
+ BUILTIN_FCODE( 0x03f, "u<=" ) ,
+ BUILTIN_FCODE( 0x040, "u<" ) ,
+ BUILTIN_FCODE( 0x041, "u>=" ) ,
+ BUILTIN_FCODE( 0x042, ">=" ) ,
+ BUILTIN_FCODE( 0x043, "<=" ) ,
+ BUILTIN_FCODE( 0x044, "between" ) ,
+ BUILTIN_FCODE( 0x045, "within" ) ,
+ BUILTIN_FCODE( 0x046, "drop" ) ,
+ BUILTIN_FCODE( 0x047, "dup" ) ,
+ BUILTIN_FCODE( 0x048, "over" ) ,
+ BUILTIN_FCODE( 0x049, "swap" ) ,
+ BUILTIN_FCODE( 0x04A, "rot" ) ,
+ BUILTIN_FCODE( 0x04b, "-rot" ) ,
+ BUILTIN_FCODE( 0x04c, "tuck" ) ,
+ BUILTIN_FCODE( 0x04d, "nip" ) ,
+ BUILTIN_FCODE( 0x04e, "pick" ) ,
+ BUILTIN_FCODE( 0x04f, "roll" ) ,
+ BUILTIN_FCODE( 0x050, "?dup" ) ,
+ BUILTIN_FCODE( 0x051, "depth" ) ,
+ BUILTIN_FCODE( 0x052, "2drop" ) ,
+ BUILTIN_FCODE( 0x053, "2dup" ) ,
+ BUILTIN_FCODE( 0x054, "2over" ) ,
+ BUILTIN_FCODE( 0x055, "2swap" ) ,
+ BUILTIN_FCODE( 0x056, "2rot" ) ,
+ BUILTIN_FCODE( 0x057, "2/" ) ,
+ BUILTIN_FCODE( 0x058, "u2/" ) ,
+ BUILTIN_FCODE( 0x059, "2*" ) ,
+ BUILTIN_FCODE( 0x05a, "/c" ) ,
+ BUILTIN_FCODE( 0x05b, "/w" ) ,
+ BUILTIN_FCODE( 0x05c, "/l" ) ,
+ BUILTIN_FCODE( 0x05d, "/n" ) ,
+ BUILTIN_FCODE( 0x05e, "ca+" ) ,
+ BUILTIN_FCODE( 0x05f, "wa+" ) ,
+ BUILTIN_FCODE( 0x060, "la+" ) ,
+ BUILTIN_FCODE( 0x061, "na+" ) ,
+ BUILTIN_FCODE( 0x062, "char+" ) ,
+ BUILTIN_FCODE( 0x062, "ca1+" ) , /* Synonym for char+" */
+ BUILTIN_FCODE( 0x063, "wa1+" ) ,
+ BUILTIN_FCODE( 0x064, "la1+" ) ,
+ BUILTIN_FCODE( 0x065, "cell+" ) ,
+ BUILTIN_FCODE( 0x065, "na1+" ) , /* Synonym for "cell+" */
+ BUILTIN_FCODE( 0x066, "chars" ) ,
+ BUILTIN_FCODE( 0x066, "/c*" ) , /* Synonym for "chars" */
+ BUILTIN_FCODE( 0x067, "/w*" ) ,
+ BUILTIN_FCODE( 0x068, "/l*" ) ,
+ BUILTIN_FCODE( 0x069, "cells" ) ,
+ BUILTIN_FCODE( 0x069, "/n*" ) , /* Synonym for "cells" */
+ BUILTIN_FCODE( 0x06a, "on" ) ,
+ BUILTIN_FCODE( 0x06b, "off" ) ,
+ BUILTIN_FCODE( 0x06c, "+!" ) ,
+ BUILTIN_FCODE( 0x06d, "@" ) ,
+ BUILTIN_FCODE( 0x06e, "l@" ) ,
+ BUILTIN_FCODE( 0x06f, "w@" ) ,
+ BUILTIN_FCODE( 0x070, "<w@" ) ,
+ BUILTIN_FCODE( 0x071, "c@" ) ,
+ BUILTIN_FCODE( 0x072, "!" ) ,
+ BUILTIN_FCODE( 0x073, "l!" ) ,
+ BUILTIN_FCODE( 0x074, "w!" ) ,
+ BUILTIN_FCODE( 0x075, "c!" ) ,
+ BUILTIN_FCODE( 0x076, "2@" ) ,
+ BUILTIN_FCODE( 0x077, "2!" ) ,
+ BUILTIN_FCODE( 0x078, "move" ) ,
+ BUILTIN_FCODE( 0x079, "fill" ) ,
+ BUILTIN_FCODE( 0x07a, "comp" ) ,
+ BUILTIN_FCODE( 0x07b, "noop" ) ,
+ BUILTIN_FCODE( 0x07c, "lwsplit" ) ,
+ BUILTIN_FCODE( 0x07d, "wljoin" ) ,
+ BUILTIN_FCODE( 0x07e, "lbsplit" ) ,
+ BUILTIN_FCODE( 0x07f, "bljoin" ) ,
+ BUILTIN_FCODE( 0x080, "wbflip" ) ,
+ BUILTIN_FCODE( 0x080, "flip" ) , /* Synonym for "wbflip" */
+ BUILTIN_FCODE( 0x081, "upc" ) ,
+ BUILTIN_FCODE( 0x082, "lcc" ) ,
+ BUILTIN_FCODE( 0x083, "pack" ) ,
+ BUILTIN_FCODE( 0x084, "count" ) ,
+ BUILTIN_FCODE( 0x085, "body>" ) ,
+ BUILTIN_FCODE( 0x086, ">body" ) ,
+ BUILTIN_FCODE( 0x087, "fcode-revision" ) ,
+ BUILTIN_FCODE( 0x087, "version" ) , /* Synonym for "fcode-revision" */
+ BI_FCODE_VRBLE( 0x088, "span" ) ,
+ BUILTIN_FCODE( 0x089, "unloop" ) ,
+ BUILTIN_FCODE( 0x08a, "expect" ) ,
+ BUILTIN_FCODE( 0x08b, "alloc-mem" ) ,
+ BUILTIN_FCODE( 0x08c, "free-mem" ) ,
+ BUILTIN_FCODE( 0x08d, "key?" ) ,
+ BUILTIN_FCODE( 0x08e, "key" ) ,
+ BUILTIN_FCODE( 0x08f, "emit" ) ,
+ BUILTIN_FCODE( 0x090, "type" ) ,
+ BUILTIN_FCODE( 0x091, "(cr" ) ,
+ BUILTIN_FCODE( 0x092, "cr" ) ,
+ BI_FCODE_VRBLE( 0x093, "#out" ) ,
+ BI_FCODE_VRBLE( 0x094, "#line" ) ,
+ BUILTIN_FCODE( 0x095, "hold" ) ,
+ BUILTIN_FCODE( 0x096, "<#" ) ,
+ BUILTIN_FCODE( 0x097, "u#>" ) ,
+ BUILTIN_FCODE( 0x098, "sign" ) ,
+ BUILTIN_FCODE( 0x099, "u#" ) ,
+ BUILTIN_FCODE( 0x09a, "u#s" ) ,
+ BUILTIN_FCODE( 0x09b, "u." ) ,
+ BUILTIN_FCODE( 0x09c, "u.r" ) ,
+ BUILTIN_FCODE( 0x09d, "." ) ,
+ BUILTIN_FCODE( 0x09e, ".r" ) ,
+ BUILTIN_FCODE( 0x09f, ".s" ) ,
+ BI_FCODE_VRBLE( 0x0a0, "base" ) ,
+ OBSOLETE_FCODE( 0x0a1, "convert" ) ,
+ BUILTIN_FCODE( 0x0a2, "$number" ) ,
+ BUILTIN_FCODE( 0x0a3, "digit" ) ,
+ BI_FCODE_CONST( 0x0a4, "-1" ) ,
+ BI_FCODE_CONST( 0x0a4, "true" ) , /* Synonym for "-1" */
+ BI_FCODE_CONST( 0x0a5, "0" ) ,
+ BI_FCODE_CONST( 0x0a5, "false" ) , /* Synonym for "0" */
+ BI_FCODE_CONST( 0x0a5, "struct" ) , /* Synonym for "0" */
+ BI_FCODE_CONST( 0x0a6, "1" ) ,
+ BI_FCODE_CONST( 0x0a7, "2" ) ,
+ BI_FCODE_CONST( 0x0a8, "3" ) ,
+ BI_FCODE_CONST( 0x0a9, "bl" ) ,
+ BI_FCODE_CONST( 0x0aa, "bs" ) ,
+ BI_FCODE_CONST( 0x0ab, "bell" ) ,
+ BUILTIN_FCODE( 0x0ac, "bounds" ) ,
+ BUILTIN_FCODE( 0x0ad, "here" ) ,
+ BUILTIN_FCODE( 0x0ae, "aligned" ) ,
+ BUILTIN_FCODE( 0x0af, "wbsplit" ) ,
+ BUILTIN_FCODE( 0x0b0, "bwjoin" ) ,
+ BUILTIN_FCODE( 0x0b1, "b(<mark)" ) ,
+ BUILTIN_FCODE( 0x0b2, "b(>resolve)" ) ,
+ OBSOLETE_FCODE( 0x0b3, "set-token-table" ) ,
+ OBSOLETE_FCODE( 0x0b4, "set-table" ) ,
+ BUILTIN_FCODE( 0x0b5, "new-token" ) ,
+ BUILTIN_FCODE( 0x0b6, "named-token" ) ,
+ BUILTIN_FCODE( 0x0b7, "b(:)" ) ,
+ BUILTIN_FCODE( 0x0b8, "b(value)" ) ,
+ BUILTIN_FCODE( 0x0b9, "b(variable)" ) ,
+ BUILTIN_FCODE( 0x0ba, "b(constant)" ) ,
+ BUILTIN_FCODE( 0x0bb, "b(create)" ) ,
+ BUILTIN_FCODE( 0x0bc, "b(defer)" ) ,
+ BUILTIN_FCODE( 0x0bd, "b(buffer:)" ) ,
+ BUILTIN_FCODE( 0x0be, "b(field)" ) ,
+ OBSOLETE_FCODE( 0x0bf, "b(code)" ) ,
+ BUILTIN_FCODE( 0x0c0, "instance" ) ,
+ BUILTIN_FCODE( 0x0c2, "b(;)" ) ,
+ BUILTIN_FCODE( 0x0c3, "b(to)" ) ,
+ BUILTIN_FCODE( 0x0c4, "b(case)" ) ,
+ BUILTIN_FCODE( 0x0c5, "b(endcase)" ) ,
+ BUILTIN_FCODE( 0x0c6, "b(endof)" ) ,
+ BUILTIN_FCODE( 0x0c7, "#" ) ,
+ BUILTIN_FCODE( 0x0c8, "#s" ) ,
+ BUILTIN_FCODE( 0x0c9, "#>" ) ,
+ BUILTIN_FCODE( 0x0ca, "external-token" ) ,
+ BUILTIN_FCODE( 0x0cb, "$find" ) ,
+ BUILTIN_FCODE( 0x0cc, "offset16" ) ,
+ BUILTIN_FCODE( 0x0cd, "evaluate" ) ,
+ BUILTIN_FCODE( 0x0cd, "eval" ) , /* Synonym for "evaluate" */
+ BUILTIN_FCODE( 0x0d0, "c," ) ,
+ BUILTIN_FCODE( 0x0d1, "w," ) ,
+ BUILTIN_FCODE( 0x0d2, "l," ) ,
+ BUILTIN_FCODE( 0x0d3, "," ) ,
+ BUILTIN_FCODE( 0x0d4, "um*" ) ,
+ BUILTIN_FCODE( 0x0d4, "u*x" ) , /* Synonym for "um*" */
+ BUILTIN_FCODE( 0x0d5, "um/mod" ) ,
+ BUILTIN_FCODE( 0x0d5, "xu/mod" ) , /* Synonym for "um/mod" */
+ BUILTIN_FCODE( 0x0d8, "d+" ) ,
+ BUILTIN_FCODE( 0x0d8, "x+" ) , /* Synonym for "d+" */
+ BUILTIN_FCODE( 0x0d9, "d-" ) ,
+ BUILTIN_FCODE( 0x0d9, "x-" ) , /* Synonym for "d-" */
+ BUILTIN_FCODE( 0x0da, "get-token" ) ,
+ BUILTIN_FCODE( 0x0db, "set-token" ) ,
+ BI_FCODE_VRBLE( 0x0dc, "state" ) ,
+ BUILTIN_FCODE( 0x0dd, "compile" ) ,
+ BUILTIN_FCODE( 0x0de, "behavior" ) ,
+ BUILTIN_FCODE( 0x0f0, "start0" ) ,
+ BUILTIN_FCODE( 0x0f1, "start1" ) ,
+ BUILTIN_FCODE( 0x0f2, "start2" ) ,
+ BUILTIN_FCODE( 0x0f3, "start4" ) ,
+ BUILTIN_FCODE( 0x0fc, "ferror" ) ,
+ BUILTIN_FCODE( 0x0fd, "version1" ) ,
+ OBSOLETE_FCODE( 0x0fe, "4-byte-id" ) ,
+ BUILTIN_FCODE( 0x0ff, "end1" ) ,
+ OBSOLETE_FCODE( 0x101, "dma-alloc" ) ,
+ BUILTIN_FCODE( 0x102, "my-address" ) ,
+ BUILTIN_FCODE( 0x103, "my-space" ) ,
+ OBSOLETE_FCODE( 0x104, "memmap" ) ,
+ BUILTIN_FCODE( 0x105, "free-virtual" ) ,
+ OBSOLETE_FCODE( 0x106, ">physical" ) ,
+ OBSOLETE_FCODE( 0x10f, "my-params" ) ,
+ BUILTIN_FCODE( 0x110, "property" ) ,
+ BUILTIN_FCODE( 0x110, "attribute" ) , /* Synonym for "property" */
+ BUILTIN_FCODE( 0x111, "encode-int" ) ,
+ BUILTIN_FCODE( 0x111, "xdrint" ) , /* Synonym for "encode-int" */
+ BUILTIN_FCODE( 0x112, "encode+" ) ,
+ BUILTIN_FCODE( 0x112, "xdr+" ) , /* Synonym for "encode+" */
+ BUILTIN_FCODE( 0x113, "encode-phys" ) ,
+ BUILTIN_FCODE( 0x113, "xdrphys" ) , /* Synonym for "encode-phys" */
+ BUILTIN_FCODE( 0x114, "encode-string" ) ,
+ BUILTIN_FCODE( 0x114, "xdrstring" ) , /* Synonym for "encode-string" */
+ BUILTIN_FCODE( 0x115, "encode-bytes" ) ,
+ BUILTIN_FCODE( 0x115, "xdrbytes" ) , /* Synonym for "encode-bytes" */
+ BUILTIN_FCODE( 0x116, "reg" ) ,
+ OBSOLETE_FCODE( 0x117, "intr" ) ,
+ OBSOLETE_FCODE( 0x118, "driver" ) ,
+ BUILTIN_FCODE( 0x119, "model" ) ,
+ BUILTIN_FCODE( 0x11a, "device-type" ) ,
+ BUILTIN_FCODE( 0x11b, "parse-2int" ) ,
+ BUILTIN_FCODE( 0x11b, "decode-2int" ) , /* Synonym for "parse-2int" */
+ BUILTIN_FCODE( 0x11c, "is-install" ) ,
+ BUILTIN_FCODE( 0x11d, "is-remove" ) ,
+ BUILTIN_FCODE( 0x11e, "is-selftest" ) ,
+ BUILTIN_FCODE( 0x11f, "new-device" ) ,
+ BUILTIN_FCODE( 0x120, "diagnostic-mode?" ) ,
+ BUILTIN_FCODE( 0x121, "display-status" ) ,
+ BUILTIN_FCODE( 0x122, "memory-test-issue" ) ,
+ OBSOLETE_FCODE( 0x123, "group-code" ) ,
+ BI_FCODE_VRBLE( 0x124, "mask" ) ,
+ BUILTIN_FCODE( 0x125, "get-msecs" ) ,
+ BUILTIN_FCODE( 0x126, "ms" ) ,
+ BUILTIN_FCODE( 0x127, "finish-device" ) ,
+ BUILTIN_FCODE( 0x128, "decode-phys" ) ,
+ BUILTIN_FCODE( 0x12b, "interpose" ) ,
+ BUILTIN_FCODE( 0x130, "map-low" ) ,
+ BUILTIN_FCODE( 0x130, "map-sbus" ) , /* Synonym for "map-low" */
+ BUILTIN_FCODE( 0x131, "sbus-intr>cpu" ) ,
+ BI_FCODE_VALUE( 0x150, "#lines" ) ,
+ BI_FCODE_VALUE( 0x151, "#columns" ) ,
+ BI_FCODE_VALUE( 0x152, "line#" ) ,
+ BI_FCODE_VALUE( 0x153, "column#" ) ,
+ BI_FCODE_VALUE( 0x154, "inverse?" ) ,
+ BI_FCODE_VALUE( 0x155, "inverse-screen?" ) ,
+ OBSOLETE_VALUE( 0x156, "frame-buffer-busy?" ) ,
+ BI_FCODE_DEFER( 0x157, "draw-character" ) ,
+ BI_FCODE_DEFER( 0x158, "reset-screen" ) ,
+ BI_FCODE_DEFER( 0x159, "toggle-cursor" ) ,
+ BI_FCODE_DEFER( 0x15a, "erase-screen" ) ,
+ BI_FCODE_DEFER( 0x15b, "blink-screen" ) ,
+ BI_FCODE_DEFER( 0x15c, "invert-screen" ) ,
+ BI_FCODE_DEFER( 0x15d, "insert-characters" ) ,
+ BI_FCODE_DEFER( 0x15e, "delete-characters" ) ,
+ BI_FCODE_DEFER( 0x15f, "insert-lines" ) ,
+ BI_FCODE_DEFER( 0x160, "delete-lines" ) ,
+ BI_FCODE_DEFER( 0x161, "draw-logo" ) ,
+ BI_FCODE_VALUE( 0x162, "frame-buffer-adr" ) ,
+ BI_FCODE_VALUE( 0x163, "screen-height" ) ,
+ BI_FCODE_VALUE( 0x164, "screen-width" ) ,
+ BI_FCODE_VALUE( 0x165, "window-top" ) ,
+ BI_FCODE_VALUE( 0x166, "window-left" ) ,
+ BUILTIN_FCODE( 0x16a, "default-font" ) ,
+ BUILTIN_FCODE( 0x16b, "set-font" ) ,
+ BI_FCODE_VALUE( 0x16c, "char-height" ) ,
+ BI_FCODE_VALUE( 0x16d, "char-width" ) ,
+ BUILTIN_FCODE( 0x16e, ">font" ) ,
+ BI_FCODE_VALUE( 0x16f, "fontbytes" ) ,
+ OBSOLETE_FCODE( 0x170, "fb1-draw-character" ) ,
+ OBSOLETE_FCODE( 0x171, "fb1-reset-screen" ) ,
+ OBSOLETE_FCODE( 0x172, "fb1-toggle-cursor" ) ,
+ OBSOLETE_FCODE( 0x173, "fb1-erase-screen" ) ,
+ OBSOLETE_FCODE( 0x174, "fb1-blink-screen" ) ,
+ OBSOLETE_FCODE( 0x175, "fb1-invert-screen" ) ,
+ OBSOLETE_FCODE( 0x176, "fb1-insert-characters" ) ,
+ OBSOLETE_FCODE( 0x177, "fb1-delete-characters" ) ,
+ OBSOLETE_FCODE( 0x178, "fb1-insert-lines" ) ,
+ OBSOLETE_FCODE( 0x179, "fb1-delete-lines" ) ,
+ OBSOLETE_FCODE( 0x17a, "fb1-draw-logo" ) ,
+ OBSOLETE_FCODE( 0x17b, "fb1-install" ) ,
+ OBSOLETE_FCODE( 0x17c, "fb1-slide-up" ) ,
+ BUILTIN_FCODE( 0x180, "fb8-draw-character" ) ,
+ BUILTIN_FCODE( 0x181, "fb8-reset-screen" ) ,
+ BUILTIN_FCODE( 0x182, "fb8-toggle-cursor" ) ,
+ BUILTIN_FCODE( 0x183, "fb8-erase-screen" ) ,
+ BUILTIN_FCODE( 0x184, "fb8-blink-screen" ) ,
+ BUILTIN_FCODE( 0x185, "fb8-invert-screen" ) ,
+ BUILTIN_FCODE( 0x186, "fb8-insert-characters" ) ,
+ BUILTIN_FCODE( 0x187, "fb8-delete-characters" ) ,
+ BUILTIN_FCODE( 0x188, "fb8-insert-lines" ) ,
+ BUILTIN_FCODE( 0x189, "fb8-delete-lines" ) ,
+ BUILTIN_FCODE( 0x18a, "fb8-draw-logo" ) ,
+ BUILTIN_FCODE( 0x18b, "fb8-install" ) ,
+ OBSOLETE_FCODE( 0x1a0, "return-buffer" ) ,
+ OBSOLETE_FCODE( 0x1a1, "xmit-packet" ) ,
+ OBSOLETE_FCODE( 0x1a2, "poll-packet" ) ,
+ BUILTIN_FCODE( 0x1a4, "mac-address" ) ,
+ BUILTIN_FCODE( 0x201, "device-name" ) ,
+ BUILTIN_FCODE( 0x201, "name" ) , /* Synonym for "device-name" */
+ BUILTIN_FCODE( 0x202, "my-args" ) ,
+ BI_FCODE_VALUE( 0x203, "my-self" ) ,
+ BUILTIN_FCODE( 0x204, "find-package" ) ,
+ BUILTIN_FCODE( 0x205, "open-package" ) ,
+ BUILTIN_FCODE( 0x206, "close-package" ) ,
+ BUILTIN_FCODE( 0x207, "find-method" ) ,
+ BUILTIN_FCODE( 0x208, "call-package" ) ,
+ BUILTIN_FCODE( 0x209, "$call-parent" ) ,
+ BUILTIN_FCODE( 0x20a, "my-parent" ) ,
+ BUILTIN_FCODE( 0x20b, "ihandle>phandle" ) ,
+ BUILTIN_FCODE( 0x20d, "my-unit" ) ,
+ BUILTIN_FCODE( 0x20e, "$call-method" ) ,
+ BUILTIN_FCODE( 0x20f, "$open-package" ) ,
+ OBSOLETE_FCODE( 0x210, "processor-type" ) ,
+ OBSOLETE_FCODE( 0x211, "firmware-version" ) ,
+ OBSOLETE_FCODE( 0x212, "fcode-version" ) ,
+ BUILTIN_FCODE( 0x213, "alarm" ) ,
+ BUILTIN_FCODE( 0x214, "(is-user-word)" ) ,
+ BUILTIN_FCODE( 0x215, "suspend-fcode" ) ,
+ BUILTIN_FCODE( 0x216, "abort" ) ,
+ BUILTIN_FCODE( 0x217, "catch" ) ,
+ BUILTIN_FCODE( 0x218, "throw" ) ,
+ BUILTIN_FCODE( 0x219, "user-abort" ) ,
+ BUILTIN_FCODE( 0x21a, "get-my-property" ) ,
+ BUILTIN_FCODE( 0x21a, "get-my-attribute" ) , /* Synonym for "get-my-property" */
+ BUILTIN_FCODE( 0x21b, "decode-int" ) ,
+ BUILTIN_FCODE( 0x21b, "xdrtoint" ) , /* Synonym for "decode-int" */
+ BUILTIN_FCODE( 0x21c, "decode-string" ) ,
+ BUILTIN_FCODE( 0x21c, "xdrtostring" ), /* Synonym for "decode-string" */
+ BUILTIN_FCODE( 0x21d, "get-inherited-property" ) ,
+ BUILTIN_FCODE( 0x21d, "get-inherited-attribute" ) , /* Synonym for "get-inherited-property" */
+ BUILTIN_FCODE( 0x21e, "delete-property" ) ,
+ BUILTIN_FCODE( 0x21e, "delete-attribute" ) , /* Synonym for "delete-property" */
+ BUILTIN_FCODE( 0x21f, "get-package-property" ) ,
+ BUILTIN_FCODE( 0x21f, "get-package-attribute" ) , /* Synonym for "get-package-property" */
+ BUILTIN_FCODE( 0x220, "cpeek" ) ,
+ BUILTIN_FCODE( 0x221, "wpeek" ) ,
+ BUILTIN_FCODE( 0x222, "lpeek" ) ,
+ BUILTIN_FCODE( 0x223, "cpoke" ) ,
+ BUILTIN_FCODE( 0x224, "wpoke" ) ,
+ BUILTIN_FCODE( 0x225, "lpoke" ) ,
+ BUILTIN_FCODE( 0x226, "lwflip" ) ,
+ BUILTIN_FCODE( 0x227, "lbflip" ) ,
+ BUILTIN_FCODE( 0x228, "lbflips" ) ,
+ OBSOLETE_FCODE( 0x229, "adr-mask" ) ,
+ BUILTIN_FCODE( 0x230, "rb@" ) ,
+ BUILTIN_FCODE( 0x231, "rb!" ) ,
+ BUILTIN_FCODE( 0x232, "rw@" ) ,
+ BUILTIN_FCODE( 0x233, "rw!" ) ,
+ BUILTIN_FCODE( 0x234, "rl@" ) ,
+ BUILTIN_FCODE( 0x235, "rl!" ) ,
+ BUILTIN_FCODE( 0x236, "wbflips" ) ,
+ BUILTIN_FCODE( 0x236, "wflips" ) , /* Synonym for "wbflips" */
+ BUILTIN_FCODE( 0x237, "lwflips" ) ,
+ BUILTIN_FCODE( 0x237, "lflips" ) , /* Synonym for "lwflips" */
+ OBSOLETE_FCODE( 0x238, "probe" ) ,
+ OBSOLETE_FCODE( 0x239, "probe-virtual" ) ,
+ BUILTIN_FCODE( 0x23b, "child" ) ,
+ BUILTIN_FCODE( 0x23c, "peer" ) ,
+ BUILTIN_FCODE( 0x23d, "next-property" ) ,
+ BUILTIN_FCODE( 0x23e, "byte-load" ) ,
+ BUILTIN_FCODE( 0x23f, "set-args" ) ,
+ BUILTIN_FCODE( 0x240, "left-parse-string" ) ,
+
/* FCodes from 64bit extension addendum */
- add_token( 0x22e, "rx@" );
- add_token( 0x22f, "rx!" );
- add_token( 0x241, "bxjoin" );
- add_token( 0x242, "<l@" );
- add_token( 0x243, "lxjoin" );
- add_token( 0x244, "wxjoin" );
- add_token( 0x245, "x," );
- add_token( 0x246, "x@" );
- add_token( 0x247, "x!" );
- add_token( 0x248, "/x" );
- add_token( 0x249, "/x*" );
- add_token( 0x24a, "xa+" );
- add_token( 0x24b, "xa1+" );
- add_token( 0x24c, "xbflip" );
- add_token( 0x24d, "xbflips" );
- add_token( 0x24e, "xbsplit" );
- add_token( 0x24f, "xlflip" );
- add_token( 0x250, "xlflips" );
- add_token( 0x251, "xlsplit" );
- add_token( 0x252, "xwflip" );
- add_token( 0x253, "xwflips" );
- add_token( 0x254, "xwsplit" );
+ BUILTIN_FCODE( 0x22e, "rx@" ) ,
+ BUILTIN_FCODE( 0x22f, "rx!" ) ,
+ BUILTIN_FCODE( 0x241, "bxjoin" ) ,
+ BUILTIN_FCODE( 0x242, "<l@" ) ,
+ BUILTIN_FCODE( 0x243, "lxjoin" ) ,
+ BUILTIN_FCODE( 0x244, "wxjoin" ) ,
+ BUILTIN_FCODE( 0x245, "x," ) ,
+ BUILTIN_FCODE( 0x246, "x@" ) ,
+ BUILTIN_FCODE( 0x247, "x!" ) ,
+ BUILTIN_FCODE( 0x248, "/x" ) ,
+ BUILTIN_FCODE( 0x249, "/x*" ) ,
+ BUILTIN_FCODE( 0x24a, "xa+" ) ,
+ BUILTIN_FCODE( 0x24b, "xa1+" ) ,
+ BUILTIN_FCODE( 0x24c, "xbflip" ) ,
+ BUILTIN_FCODE( 0x24d, "xbflips" ) ,
+ BUILTIN_FCODE( 0x24e, "xbsplit" ) ,
+ BUILTIN_FCODE( 0x24f, "xlflip" ) ,
+ BUILTIN_FCODE( 0x250, "xlflips" ) ,
+ BUILTIN_FCODE( 0x251, "xlsplit" ) ,
+ BUILTIN_FCODE( 0x252, "xwflip" ) ,
+ BUILTIN_FCODE( 0x253, "xwflips" ) ,
+ BUILTIN_FCODE( 0x254, "xwsplit" )
+};
- add_special(COLON, ":");
- add_special(SEMICOLON, ";");
- add_special(TOKENIZE, "'");
- add_special(AGAIN, "again");
- add_special(ALIAS, "alias");
- add_special(GETTOKEN, "[']");
- add_special(ASCII, "ascii");
- add_special(BEGIN, "begin");
- add_special(BUFFER, "buffer:");
- add_special(CASE, "case");
- add_special(CONST, "constant");
- add_special(CONTROL, "control");
- add_special(CREATE, "create");
- add_special(DECIMAL, "decimal");
- add_special(DEFER, "defer");
- add_special(CDO, "?do");
- add_special(DO, "do");
- add_special(ELSE, "else");
- add_special(ENDCASE, "endcase");
- add_special(ENDOF, "endof");
- add_special(EXTERNAL, "external");
- add_special(FIELD, "field");
- add_special(HEADERLESS, "headerless");
- add_special(HEADERS, "headers");
- add_special(HEX, "hex");
- add_special(IF, "if");
- add_special(CLEAVE, "?leave");
- add_special(LEAVE, "leave");
- add_special(CLOOP, "+loop");
- add_special(LOOP, "loop");
- add_special(OCTAL, "octal");
- add_special(OF, "of");
- add_special(REPEAT, "repeat");
- add_special(THEN, "then");
- add_special(TO, "to");
- add_special(UNTIL, "until");
- add_special(VALUE, "value");
- add_special(VARIABLE, "variable");
- add_special(WHILE, "while");
- add_special(OFFSET16, "offset16");
- add_special(BEGINTOK, "tokenizer[");
- add_special(EMITBYTE, "emit-byte");
- add_special(ENDTOK, "]tokenizer");
- add_special(FLOAD, "fload");
- add_special(STRING, "\"");
- add_special(PSTRING, ".\"");
- add_special(PBSTRING, ".(");
- add_special(SSTRING, "s\"");
- add_special(RECURSIVE, "recursive");
- add_special(NEXTFCODE, "next-fcode");
+static const int number_of_builtin_tokens =
+ sizeof(tokens_table)/sizeof(tic_hdr_t);
+
+/* **************************************************************************
+ *
+ * Support functions specific to the FCode-Tokens list.
+ *
+ **************************************************************************** */
+
+
+/* **************************************************************************
+ *
+ * Function name: emit_token
+ * Synopsis: Emit the FCode token for the given FCode name.
+ *
+ * Inputs:
+ * Parameters:
+ * fc_name The name of the FCode
+ * Local Static Variables:
+ * fc_tokens_list_start "Tail" of the "FC-Tokens" list
+ *
+ * Outputs:
+ * Returned Value: NONE
+ *
+ * Error Detection:
+ * This routine should only be called with hard-coded names from
+ * within the program. If the given name is not found in
+ * the Built-in Tokens Table, that is a FATAL error.
+ *
+ * Process Explanation:
+ * Because the "FCode-Tokens" table was linked first, and the
+ * pointer kept for this purpose, the "FC-Tokens" list can
+ * be a subset of the "core" list, yet, when necessary, can
+ * be searched with the same routines.
+ *
+ * Extraneous Remarks:
+ * I will bend the strict rules of well-structured code;
+ * the exception case should never occur.
+ *
+ **************************************************************************** */
+
+void emit_token( const char *fc_name)
+{
+
+ if ( handle_tic_vocab( (char *)fc_name, fc_tokens_list_start) )
+ {
+ return;
+ }
+
+ tokenization_error( FATAL, "Did not recognize FCode name %s", fc_name);
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: lookup_token
+ * Synopsis: Return a pointer to the data-structure of the named
+ * word in the "FC-Tokens" list
+ *
+ * Inputs:
+ * Parameters:
+ * tname The name to look up
+ * Local Static Variables:
+ * fc_tokens_list_start "Tail" of the "FC-Tokens" list
+ *
+ * Outputs:
+ * Returned Value: Pointer to the data-structure, or
+ * NULL if not found.
+ *
+ **************************************************************************** */
+
+tic_hdr_t *lookup_token( char *tname)
+{
+ tic_hdr_t *found ;
+
+ found = lookup_tic_entry( tname, fc_tokens_list_start);
+ return ( found ) ;
+}
+
+/* **************************************************************************
+ *
+ * Function name: entry_is_token
+ * Synopsis: Indicate whether the supplied pointer to a tic_hdr_t
+ * data-structure is one for which a single-token FCode
+ * number is assigned.
+ *
+ * Inputs:
+ * Parameters:
+ * test_entry The entry to test; may be NULL
+ * Local macros:
+ * FC_TOKEN_FUNC The function associated with
+ * most single-token entries.
+ * OBSO_FC_FUNC The function associated with
+ * "obsolete" FCode tokens.
+ *
+ * Outputs:
+ * Returned Value: TRUE if the data-structure is
+ * a single-token entry.
+ *
+ * Process Explanation:
+ * We cannot rely on the "definer" field to indicate whether
+ * it is a single-token entry; instead, we will look at
+ * the associated function.
+ * Keep this routine here to avoid needing to export the names
+ * of the permitted functions or their synonymous macros.
+ * If we ever need to change it, we can do so at a single
+ * point of maintenance.
+ * Because the entry might have been found in the initial list
+ * of entries to the "FCode-Tokens" list, we need to check
+ * whether the associated function is either the general
+ * single-token emitting function, FC_TOKEN_FUNC , or the
+ * function OBSO_FC_FUNC , which presents a message before
+ * emitting, but is still a valid single-token function.
+ *
+ **************************************************************************** */
+
+bool entry_is_token( tic_hdr_t *test_entry )
+{
+ bool retval = FALSE;
+ if ( test_entry != NULL )
+ {
+ if ( ( test_entry->funct == FC_TOKEN_FUNC ) ||
+ ( test_entry->funct == OBSO_FC_FUNC ) )
+ {
+ retval = TRUE;
+ }
+ }
+ return ( retval );
+}
+
+/* **************************************************************************
+ *
+ * Function name: token_entry_warning
+ * Synopsis: Issue whatever warnings the given token_entry
+ * requires. F['] needs this.
+ * Inputs:
+ * Parameters:
+ * test_entry The entry to test; may be NULL
+ * Local macro:
+ * OBSO_FC_FUNC The function associated with
+ * "obsolete" entries.
+ * Outputs:
+ * Returned Value: NONE
+ *
+ * Error Detection:
+ * Warnings required by the given token_entry.
+ *
+ * Extraneous Remarks:
+ * At present, it's only the "Obsolete" warning.
+ * But this is the place to add others,
+ * should they become necessary.
+ *
+ **************************************************************************** */
+
+void token_entry_warning( tic_hdr_t *t_entry)
+{
+ if ( t_entry->funct == OBSO_FC_FUNC )
+ {
+ obsolete_warning();
+ }
+}
+
+
+/* **************************************************************************
+ *
+ * Create the initial "FWords" list.
+ *
+ **************************************************************************** */
+
+static tic_fwt_hdr_t fwords_list[] = {
+
+ BI_FWD_SKP_OW(COLON, ":") ,
+ BUILTIN_FWORD(SEMICOLON, ";") ,
+ BI_FWD_SKP_OW(TICK, "'") ,
+ BUILTIN_FWORD(AGAIN, "again") ,
+ BI_FWD_SKP_OW(BRACK_TICK, "[']") ,
+ BI_FWD_SKP_OW(ASCII, "ascii") ,
+ BUILTIN_FWORD(BEGIN, "begin") ,
+ BI_FWD_SKP_OW(BUFFER, "buffer:") ,
+ BUILTIN_FWORD(CASE, "case") ,
+ BI_FWD_SKP_OW(CONST, "constant") ,
+ BI_FWD_SKP_OW(CONTROL, "control") ,
+ BI_FWD_SKP_OW(CREATE, "create") ,
+
+ BI_FWD_SKP_OW(DEFER, "defer") ,
+ BUILTIN_FWORD(CDO, "?do") ,
+ BUILTIN_FWORD(DO, "do") ,
+ BUILTIN_FWORD(ELSE, "else") ,
+ BUILTIN_FWORD(ENDCASE, "endcase") ,
+ BUILTIN_FWORD(ENDOF, "endof") ,
+ BUILTIN_FWORD(EXTERNAL, "external") ,
+ BI_FWD_SKP_OW(FIELD, "field") ,
+ BUILTIN_FWORD(FINISH_DEVICE, "finish-device" ) ,
+ BUILTIN_FWORD(HEADERLESS, "headerless") ,
+ BUILTIN_FWORD(HEADERS, "headers") ,
+
+ BUILTIN_FWORD(INSTANCE , "instance") ,
+
+ BUILTIN_FWORD(IF, "if") ,
+ BUILTIN_FWORD(UNLOOP, "unloop") ,
+ BUILTIN_FWORD(LEAVE, "leave") ,
+ BUILTIN_FWORD(PLUS_LOOP, "+loop") ,
+ BUILTIN_FWORD(LOOP, "loop") ,
+
+ BUILTIN_FWORD(OF, "of") ,
+ BUILTIN_FWORD(REPEAT, "repeat") ,
+ BUILTIN_FWORD(THEN, "then") ,
+ BI_FWD_SKP_OW(TO, "to") ,
+ BI_FWD_SKP_OW(IS, "is") , /* Deprecated synonym to TO */
+ BUILTIN_FWORD(UNTIL, "until") ,
+ BI_FWD_SKP_OW(VALUE, "value") ,
+ BI_FWD_SKP_OW(VARIABLE, "variable") ,
+ BUILTIN_FWORD(WHILE, "while") ,
+ BUILTIN_FWORD(OFFSET16, "offset16") ,
+
+ BI_FWD_STRING(STRING, "\"") , /* XXXXX */
+ BI_FWD_STRING(PSTRING, ".\"") , /* XXXXX */
+ BI_FWD_STRING(PBSTRING, ".(") , /* XXXXX */
+ BI_FWD_STRING(SSTRING, "s\"") , /* XXXXX */
+ BUILTIN_FWORD(IFILE_NAME, "[input-file-name]"),
+ BUILTIN_FWORD(ILINE_NUM, "[line-number]"),
+ BUILTIN_FWORD(RECURSE, "recurse") ,
+ BUILTIN_FWORD(RECURSIVE, "recursive") ,
+ BUILTIN_FWORD(RET_STK_FETCH, "r@") ,
+ BUILTIN_FWORD(RET_STK_FROM, "r>") ,
+ BUILTIN_FWORD(RET_STK_TO, ">r") ,
+ BUILTIN_FWORD(THEN, "endif" ) , /* Synonym for "then" */
+ BUILTIN_FWORD(NEW_DEVICE, "new-device" ) ,
+ BUILTIN_FWORD(LOOP_I, "i") ,
+ BUILTIN_FWORD(LOOP_J, "j") ,
/* version1 is also an fcode word, but it
* needs to trigger some tokenizer internals */
- add_special(VERSION1, "version1");
- add_special(START0, "start0");
- add_special(START1, "start1");
- add_special(START2, "start2");
- add_special(START4, "start4");
- add_special(END0, "end0");
- add_special(END1, "end1");
- add_special(FCODE_V1, "fcode-version1");
- add_special(FCODE_V2, "fcode-version2");
- add_special(FCODE_V3, "fcode-version3");
- add_special(FCODE_END, "fcode-end");
- add_special(FCODE_DATE, "fcode-date");
- add_special(FCODE_TIME, "fcode-time");
-
- add_special(HEXVAL, "h#");
- add_special(DECVAL, "d#");
- add_special(OCTVAL, "o#");
- add_special(CHAR, "char");
- add_special(CCHAR, "[char]");
- add_special(ABORTTXT, "abort\"");
+ BUILTIN_FWORD(VERSION1, "version1") ,
+ BUILTIN_FWORD(START0, "start0") ,
+ BUILTIN_FWORD(START1, "start1") ,
+ BUILTIN_FWORD(START2, "start2") ,
+ BUILTIN_FWORD(START4, "start4") ,
+ BUILTIN_FWORD(END0, "end0") ,
+ BUILTIN_FWORD(END1, "end1") ,
+ BUILTIN_FWORD(FCODE_V1, "fcode-version1") ,
+ BUILTIN_FWORD(FCODE_V2, "fcode-version2") ,
+ BUILTIN_FWORD(FCODE_V3, "fcode-version3") ,
+ BUILTIN_FWORD(FCODE_END, "fcode-end") ,
- add_special(ENCODEFILE, "encode-file");
+ /* Support for IBM-style Locals */
+ BI_FWD_STRING(CURLY_BRACE, "{") ,
+ BI_FWD_STRING(DASH_ARROW, "->") ,
+ BUILTIN_FWORD(EXIT, "exit") ,
+
+ BUILTIN_FWORD(CHAR, "char") ,
+ BUILTIN_FWORD(CCHAR, "[char]") ,
+ BI_FWD_STRING(ABORTTXT, "abort\"") ,
+
+ BUILTIN_FWORD(ENCODEFILE, "encode-file") ,
+
+ BI_IG_FW_HDLR(ESCAPETOK, "tokenizer[") ,
+ BI_IG_FW_HDLR(ESCAPETOK, "f[") , /* An IBM-ish synonym */
+};
+
+static const int number_of_builtin_fwords =
+ sizeof(fwords_list)/sizeof(tic_hdr_t);
+
+/* **************************************************************************
+ *
+ * Create the initial list of "Shared_Words" (words that can
+ * be executed similarly both during normal tokenization,
+ * and also within "Tokenizer Escape Mode").
+ *
+ **************************************************************************** */
+
+static tic_fwt_hdr_t shared_words_list[] = {
+ SHARED_FWORD(FLOAD, "fload") ,
+ /* As does the "Allow Multi-Line" directive */
+ SHR_SAMIG_FWRD(ALLOW_MULTI_LINE, "multi-line") ,
+
+ SHR_FWD_SKOW( F_BRACK_TICK, "f[']") ,
+
+ SH_FW_SK2WIL(ALIAS, "alias") ,
+ SHARED_FWORD(DECIMAL, "decimal") ,
+ SHARED_FWORD(HEX, "hex") ,
+ SHARED_FWORD(OCTAL, "octal") ,
+ SH_FW_SK_WIL(HEXVAL, "h#") ,
+ SH_FW_SK_WIL(DECVAL, "d#") ,
+ SH_FW_SK_WIL(OCTVAL, "o#") ,
+
+ SH_FW_SK_WIL(ASC_NUM, "a#") ,
+ SH_FW_SK_WIL(ASC_LEFT_NUM, "al#") ,
+
+ /* IBM-style extension. Might be generalizable... */
+ SHARED_FWORD(FLITERAL, "fliteral") ,
+
+ /* Directives to extract the value of a Command-Line symbol */
+ SH_FW_SK_WIL(DEFINED, "[defined]") ,
+ SH_FW_SK_WIL(DEFINED, "#defined") ,
+ SH_FW_SK_WIL(DEFINED, "[#defined]") ,
+
+ /* Present the current date or time, either as an */
+ /* in-line string or as a user-generated message. */
+ SHARED_FWORD(FCODE_DATE, "[fcode-date]") ,
+ SHARED_FWORD(FCODE_TIME, "[fcode-time]") ,
+
+ /* Current definition under construction, similarly */
+ SHARED_FWORD(FUNC_NAME, "[function-name]"),
+
+ /* Synonymous forms of the #ELSE and #THEN operators,
+ * associated with Conditional-Compilation,
+ * allowing for various syntax-styles, and for
+ * expansion by alias.
+ */
+
+ /* #ELSE operators */
+ SHARED_FWORD(CONDL_ELSE, "#else") ,
+ SHARED_FWORD(CONDL_ELSE, "[else]") ,
+ SHARED_FWORD(CONDL_ELSE, "[#else]") ,
+
+ /* #THEN operators */
+ SHARED_FWORD(CONDL_ENDER, "#then") ,
+ SHARED_FWORD(CONDL_ENDER, "[then]") ,
+ SHARED_FWORD(CONDL_ENDER, "[#then]") ,
+ /* #ENDIF variants for users who favor C-style notation */
+ SHARED_FWORD(CONDL_ENDER, "#endif") ,
+ SHARED_FWORD(CONDL_ENDER, "[endif]") ,
+ SHARED_FWORD(CONDL_ENDER, "[#endif]") ,
+
+
+ SHARED_FWORD(OVERLOAD, "overload" ) ,
+
+ SHARED_FWORD(GLOB_SCOPE , "global-definitions" ) ,
+ SHARED_FWORD(DEV_SCOPE , "device-definitions" ) ,
+
+ /* Directives to change a command-line flag value from source */
+ SH_FW_SK_WIL(CL_FLAG, "[FLAG]") ,
+ SH_FW_SK_WIL(CL_FLAG, "#FLAG") ,
+ SH_FW_SK_WIL(CL_FLAG, "[#FLAG]") ,
+
+ /* Directives to force display of a command-line flags' values */
+ SHARED_FWORD(SHOW_CL_FLAGS, "[FLAGS]") ,
+ SHARED_FWORD(SHOW_CL_FLAGS, "#FLAGS") ,
+ SHARED_FWORD(SHOW_CL_FLAGS, "[#FLAGS]") ,
+ SHARED_FWORD(SHOW_CL_FLAGS, "SHOW-FLAGS") ,
+
+ /* Directives to save and retrieve the FCode Assignment number */
+ SHARED_FWORD(PUSH_FCODE, "FCODE-PUSH") ,
+ SHARED_FWORD(POP_FCODE, "FCODE-POP") ,
+
+ /* Directive to reset the FCode Assignment number and
+ * re-initialize FCode Range overlap checking.
+ */
+ SHARED_FWORD(RESET_FCODE, "FCODE-RESET") ,
+
/* pci header generation is done differently
* across the available tokenizers. We try to
* be compatible to all of them
*/
- add_special(PCIHDR, "pci-header");
- add_special(PCIEND, "pci-end"); /* SUN syntax */
- add_special(PCIEND, "pci-header-end"); /* Firmworks syntax */
- add_special(PCIREV, "pci-revision"); /* SUN syntax */
- add_special(PCIREV, "pci-code-revision"); /* SUN syntax */
- add_special(PCIREV, "set-rev-level"); /* Firmworks syntax */
- add_special(NOTLAST, "not-last-image");
+ SHARED_FWORD(PCIHDR, "pci-header") ,
+ SHARED_FWORD(PCIEND, "pci-end") , /* SUN syntax */
+ SHARED_FWORD(PCIEND, "pci-header-end") , /* Firmworks syntax */
+ SHARED_FWORD(PCIREV, "pci-revision") , /* SUN syntax */
+ SHARED_FWORD(PCIREV, "pci-code-revision") , /* SUN syntax */
+ SHARED_FWORD(PCIREV, "set-rev-level") , /* Firmworks syntax */
+ SHARED_FWORD(NOTLAST, "not-last-image") ,
+ SHARED_FWORD(NOTLAST, "not-last-img") , /* Shorthand form */
+ SHARED_FWORD(ISLAST, "last-image") ,
+ SHARED_FWORD(ISLAST, "last-img") , /* Shorthand form */
+ SHARED_FWORD(SETLAST, "set-last-image") ,
+ SHARED_FWORD(SETLAST, "set-last-img") , /* Shorthand form */
+
+ SH_FW_SK_WIL(SAVEIMG, "save-image") ,
+ SH_FW_SK_WIL(SAVEIMG, "save-img") , /* Shorthand form */
+
+ SHARED_FWORD(RESETSYMBS, "reset-symbols") ,
+
+ /* User-Macro definers */
+ SHARED_IG_HDLR("[MACRO]", add_user_macro, 0 , skip_user_macro) ,
+
+ /* Comments and Remarks */
+ SHARED_IG_HDLR("\\", process_remark, '\n', process_remark) ,
+ SHARED_IG_HDLR("(", process_remark, ')', process_remark) ,
+
+ /* Directives to print or discard a user-generated message */
+ SHARED_IG_HDLR("[MESSAGE]", user_message, '\n', skip_user_message) ,
+ SHARED_IG_HDLR("#MESSAGE", user_message, '\n', skip_user_message) ,
+ SHARED_IG_HDLR("[#MESSAGE]", user_message, '\n', skip_user_message) ,
+ SHARED_IG_HDLR("#MESSAGE\"", user_message, '"' , skip_user_message) ,
+};
+
+static const int number_of_shared_words =
+ sizeof(shared_words_list)/sizeof(tic_hdr_t);
+
+/* **************************************************************************
+ *
+ * Function name: lookup_shared_word
+ * Synopsis: Return a pointer to the data-structure of the named
+ * word, only if it is a "Shared Word"
+ *
+ * Inputs:
+ * Parameters:
+ * tname The name to look for
+ * Local Static Variables:
+ * global_voc_dict_ptr "Tail" of Global Vocabulary
+ *
+ * Outputs:
+ * Returned Value: Pointer to the data-structure, or
+ * NULL if not found.
+ *
+ * Process Explanation:
+ * The "Shared Words" are scattered among the Global Vocabulary;
+ * the user is allowed to create aliases, which may be in the
+ * Current-Device. We will search through the "current" scope
+ * and decide whether the name we found is a "Shared Word" by
+ * looking for COMMON_FWORD in the "definer" field.
+ *
+ * Extraneous Remarks:
+ * This is the only place where an additional check of the
+ * "definer" field is required to identify a desired entry.
+ * Should another "definer"-type be required, I recommend
+ * defining a general-purpose function in ticvocab.c and
+ * applying it here and in the other place(s).
+ *
+ **************************************************************************** */
+
+tic_hdr_t *lookup_shared_word( char *tname)
+{
+ tic_hdr_t *found ;
+ tic_hdr_t *retval = NULL ;
+
+ found = lookup_current( tname );
+ if ( found != NULL )
+ {
+ if ( found->fword_defr == COMMON_FWORD )
+ {
+ retval = found ;
+ }
+ }
+
+ return ( retval );
+
}
+
+/* **************************************************************************
+ *
+ * Function name: handle_shared_word
+ * Synopsis: Perform the function associated with the given name
+ * only if it is a "Shared Word". Indicate if it was.
+ *
+ * Inputs:
+ * Parameters:
+ * tname The "target" name for which to look
+ *
+ * Outputs:
+ * Returned Value: TRUE if the name is a valid "Shared Word"
+ *
+ * Extraneous Remarks:
+ * This is very similar to a call to handle_tic_vocab() except
+ * for the additional filtering for a "Shared Word" definer.
+ *
+ **************************************************************************** */
+
+bool handle_shared_word( char *tname )
+{
+ tic_hdr_t *found ;
+ bool retval = FALSE;
+
+ found = lookup_shared_word( tname );
+ if ( found != NULL )
+ {
+ found->funct(found->pfield);
+ retval = TRUE;
+ }
+
+ return ( retval ) ;
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: lookup_shared_f_exec_word
+ * Synopsis: Return a pointer to the data-structure of the named
+ * word, only if it is a "Shared F-Exec Word"
+ *
+ * Inputs:
+ * Parameters:
+ * tname The name to look for
+ * Local Static Variables:
+ * global_voc_dict_ptr "Tail" of Global Vocabulary
+ * Macro Definitions:
+ * FWORD_EXEC_FUNC The "Active" function of the
+ * sub-class of "Shared Word"s
+ * that is the object of this
+ * routine's search
+ *
+ * Outputs:
+ * Returned Value: Pointer to the data-structure, or
+ * NULL if not found.
+ *
+ * Process Explanation:
+ * The "Shared F-Exec Words" are the subset of "Shared Words" that
+ * have the FWORD_EXEC_FUNC as their "Active" function.
+ *
+ * Extraneous Remarks:
+ * This is the only routine that requires a check of two fields;
+ * it seems unlikely that there will be any need to generalize
+ * the core of this routine...
+ *
+ **************************************************************************** */
+
+tic_hdr_t *lookup_shared_f_exec_word( char *tname)
+{
+ tic_hdr_t *found ;
+ tic_hdr_t *retval = NULL ;
+
+ found = lookup_shared_word( tname );
+ if ( found != NULL )
+ {
+ if ( found->funct == FWORD_EXEC_FUNC )
+ {
+ retval = found ;
+ }
+ }
+
+ return ( retval );
+
+}
+
+/* **************************************************************************
+ *
+ * Function name: init_dictionary
+ * Synopsis: Initialize all the vocabularies. For the Global
+ * Vocabulary, fill in the link fields in each of the
+ * otherwise pre-initialized built-in lists, link the
+ * lists together, and set the relevant pointers. For
+ * other lists, call their initialization routines.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * Local Static Variables:
+ * tokens_table Base of the "FC-Tokens" list
+ * number_of_builtin_tokens Number of "FC-Token" entries
+ * fwords_list Base of the "FWords" list
+ * number_of_builtin_fwords Number of "FWord" entries
+ * shared_words_list Base of the "Shared Words" list
+ * number_of_shared_words Number of "Shared Words" entries
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * global_voc_dict_ptr "Tail" of Global Vocabulary
+ * fc_tokens_list_start "Tail" of "FC-Tokens" list
+ * fc_tokens_list_ender End of "FC-Tokens" search
+ * shared_fwords_ender End of Shared Words" search
+ * global_voc_reset_ptr Reset-point for Global Vocab
+ *
+ * Process Explanation:
+ * The first linked will be the last searched.
+ * Link the "FC-Tokens" first, and mark their limits
+ * Link the "FWords" next,
+ * Mark the end-limit of the "Shared Words", and link them
+ * The "Conditionals", defined in another file, are also "Shared";
+ * link them next.
+ * Then link the Built-In Macros, also defined in another file.
+ * These constitute the Global Vocabulary.
+ * Mark the reset-point for the Global Vocabulary.
+ * The "Tokenizer Escape" mode vocabulary is not linked to the Global
+ * Vocabulary; call its initialization routine.
+ *
+ * Extraneous Remarks:
+ * I only wish I had done this sooner...
+ *
+ **************************************************************************** */
+
+void init_dictionary( void )
+{
+
+ global_voc_dict_ptr = NULL; /* Belt-and-suspenders... */
+
+ /* The "FC-Tokens" list must be linked first. */
+ fc_tokens_list_ender = global_voc_dict_ptr;
+ init_tic_vocab( tokens_table,
+ number_of_builtin_tokens,
+ &global_voc_dict_ptr ) ;
+ fc_tokens_list_start = global_voc_dict_ptr;
+
+ /* Link the "FWords" next */
+ init_tic_vocab( (tic_hdr_t *)fwords_list,
+ number_of_builtin_fwords,
+ &global_voc_dict_ptr ) ;
+
+ /* Mark the end-limit of the "Shared Words", and link them. */
+ shared_fwords_ender = global_voc_dict_ptr;
+ init_tic_vocab( (tic_hdr_t *)shared_words_list,
+ number_of_shared_words,
+ &global_voc_dict_ptr ) ;
+
+ /* Link the "Conditionals" to the Global Vocabulary. */
+ init_conditionals_vocab( &global_voc_dict_ptr ) ;
+
+ /* Link the Built-In Macros */
+ init_macros( &global_voc_dict_ptr ) ;
+
+ /* Mark the reset-point for the Global Vocabulary. */
+ global_voc_reset_ptr = global_voc_dict_ptr;
+
+ /* Initialize the "Tokenizer Escape" mode vocabulary */
+ init_tokz_esc_vocab();
+
+ /* Locals and Device-Node vocabularies are initially empty */
+
+}
+
+/* **************************************************************************
+ *
+ * Function name: reset_normal_vocabs
+ * Synopsis: Reset the vocabularies that were created in "Normal"
+ * (as distinguished from "Tokenizer Escape") mode
+ * to the proper state for a fresh tokenization.
+ *
+ * Associated FORTH words: END0 END1
+ * Associated Tokenizer directives: RESET-SYMBOLS (in "Normal" mode)
+ * FCODE-END
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * global_voc_reset_ptr Position to which to reset
+ * the "Global" Vocabulary
+ * current_device_node Vocab struct of current dev-node
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * global_voc_dict_ptr Reset to "Built-In" position
+ * current_device_node Reset to point at "root" dev-node
+ * Memory Freed
+ * All memory allocated by user-definitions in "normal" mode
+ * -- Macros, Conditionals and Device-node Vocabularies -- are
+ * reset via function call.
+ *
+ * Error Detection:
+ * Presence of extra device-node data structure(s) indicates that
+ * there were more "new-device" calls than "finish-device";
+ * report each as an ERROR
+ *
+ * Process Explanation:
+ * Vocabularies created in other files, that have different
+ * data-structures, will have "reset" routines of their
+ * own associated with them in the files in which they
+ * are created. Those routines will be called from here.
+ * Definitions in the "Tokenizer Escape Vocabulary", i.e.,
+ * the one in effect in "Tokenizer Escape" mode, are
+ * specifically not touched by this routine.
+ *
+ **************************************************************************** */
+
+void reset_normal_vocabs( void )
+{
+ reset_tic_vocab( &global_voc_dict_ptr, global_voc_reset_ptr );
+
+ /* Delete the top-level device-node vocab.
+ * If there are extra device-nodes,
+ * delete their data structures and show errors
+ */
+ do
+ {
+ if ( current_device_node->parent_node != NULL )
+ {
+ tokenization_error( TKERROR,
+ "Missing FINISH-DEVICE for new device");
+ started_at( current_device_node->ifile_name,
+ current_device_node->line_no );
+ }
+ delete_device_vocab();
+ } while ( current_device_node->parent_node != NULL );
+
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: reset_vocabs
+ * Synopsis: Reset all the vocabularies to the proper state
+ * for beginning a fresh tokenization, particularly
+ * when multiple files are named on the command-line
+ *
+ * Inputs:
+ * Parameters: NONE
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Memory Freed
+ * All memory allocated by user-definitions will be freed
+ *
+ * Process Explanation:
+ * Call the reset_normal_vocabs() routine to get the vocabularies
+ * that apply to "Normal" mode, then call the "reset" routine
+ * for the "Tokenizer Escape Vocabulary", which is supposed
+ * to persist across device-nodes but not across input-files
+ * named on the command-line.
+ *
+ **************************************************************************** */
+
+void reset_vocabs( void )
+{
+ reset_normal_vocabs();
+ reset_tokz_esc();
+}
Modified: fcode-utils/toke/dictionary.h
===================================================================
--- fcode-utils/toke/dictionary.h 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/toke/dictionary.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -1,3 +1,6 @@
+#ifndef _TOKE_DICTIONARY_H
+#define _TOKE_DICTIONARY_H
+
/*
* OpenBIOS - free your system!
* ( FCode tokenizer )
@@ -24,81 +27,152 @@
*
*/
-#define COLON 0x01
-#define SEMICOLON 0x02
-#define TOKENIZE 0x03
-#define AGAIN 0x04
-#define ALIAS 0x05
-#define GETTOKEN 0x06
-#define ASCII 0x07
-#define BEGIN 0x08
-#define BUFFER 0x09
-#define CASE 0x0a
-#define CONST 0x0b
-#define CONTROL 0x0c
-#define CREATE 0x0d
-#define DECIMAL 0x0e
-#define DEFER 0x0f
-#define CDO 0x10
-#define DO 0x11
-#define ELSE 0x12
-#define ENDCASE 0x13
-#define ENDOF 0x14
-#define EXTERNAL 0x15
-#define FIELD 0x16
-#define HEADERLESS 0x17
-#define HEADERS 0x18
-#define HEX 0x19
-#define IF 0x1a
-#define CLEAVE 0x1b
-#define LEAVE 0x1c
-#define CLOOP 0x1d
-#define LOOP 0x1e
-#define OCTAL 0x1f
-#define OF 0x20
-#define REPEAT 0x21
-#define THEN 0x22
-#define TO 0x23
-#define UNTIL 0x24
-#define VALUE 0x25
-#define VARIABLE 0x26
-#define WHILE 0x27
-#define OFFSET16 0x28
-#define BEGINTOK 0x29
-#define EMITBYTE 0x2a
-#define ENDTOK 0x2b
-#define FLOAD 0x2c
-#define STRING 0x2d
-#define PSTRING 0x2e
-#define PBSTRING 0x2f
-#define SSTRING 0x30
-#define RECURSIVE 0x31
-#define HEXVAL 0x32
-#define DECVAL 0x33
-#define OCTVAL 0x34
+/* **************************************************************************
+ * Modifications made in 2005 by IBM Corporation
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Modifications Author: David L. Paktor dlpaktor(a)us.ibm.com
+ **************************************************************************** */
-#define END0 0xdb
-#define END1 0xdc
-#define CHAR 0xdd
-#define CCHAR 0xde
-#define ABORTTXT 0xdf
+/* **************************************************************************
+ *
+ * Numeric values for FWord-type vocabulary entries. Used by the
+ * big "switch" statement in handle_internal(); a subset are
+ * also used as "definer-type" values associated with various
+ * types of definitions.
+ *
+ **************************************************************************** */
-#define NEXTFCODE 0xef
+typedef enum fword_token {
+ UNSPECIFIED = 0xBAADD00D , /* Default (absence-of) "definer" */
+ COMMON_FWORD = 0xC0EDC0DE , /* Definer indicating a "shared" FWord */
+ BI_FWRD_DEFN = 0xB1F4409D , /* Definer indicating a "built-in FWord" */
+ COLON = 1 ,
+ SEMICOLON ,
+ TICK ,
+ AGAIN ,
+ ALIAS ,
+ BRACK_TICK ,
+ F_BRACK_TICK ,
+ ASCII ,
+ BEGIN ,
+ BUFFER ,
+ CASE ,
+ CONST ,
+ CONTROL ,
+ CREATE ,
+ DECIMAL ,
+ DEFER ,
+ DEFINED ,
+ CDO ,
+ DO ,
+ ELSE ,
+ ENDCASE ,
+ ENDOF ,
+ EXTERNAL ,
+ INSTANCE ,
+ FIELD ,
+ NEW_DEVICE ,
+ FINISH_DEVICE ,
+ FLITERAL ,
+ HEADERLESS ,
+ HEADERS ,
+ HEX ,
+ IF ,
+ UNLOOP ,
+ LEAVE ,
+ LOOP_I ,
+ LOOP_J ,
+ LOOP ,
+ PLUS_LOOP ,
+ OCTAL ,
+ OF ,
+ REPEAT ,
+ THEN ,
+ TO ,
+ IS ,
+ UNTIL ,
+ VALUE ,
+ VARIABLE ,
+ WHILE ,
+ OFFSET16 ,
+ ESCAPETOK ,
+ EMITBYTE ,
+ FLOAD ,
+ STRING ,
+ PSTRING ,
+ PBSTRING ,
+ SSTRING ,
+ RECURSIVE ,
+ RECURSE ,
+ RET_STK_FETCH ,
+ RET_STK_FROM ,
+ RET_STK_TO ,
+ HEXVAL ,
+ DECVAL ,
+ OCTVAL ,
-#define ENCODEFILE 0xf0
+ ret_stk_from ,
+ ASC_NUM , /* Convert char seq to number */
+ ASC_LEFT_NUM , /* same, only left-justified. */
-#define FCODE_V1 0xf1
-#define FCODE_V3 0xf2
-#define NOTLAST 0xf3
-#define PCIREV 0xf4
-#define PCIHDR 0xf5
-#define PCIEND 0xf6
-#define START0 0xf7
-#define START1 0xf8
-#define START2 0xf9
-#define START4 0xfa
-#define VERSION1 0xfb
-#define FCODE_TIME 0xfc
-#define FCODE_DATE 0xfd
-#define FCODE_V2 0xfe
-#define FCODE_END 0xff
+ CONDL_ENDER , /* Conditional "[THEN] / [ENDIF]" variants */
+ CONDL_ELSE , /* Conditional "[ELSE]" directive variants */
+
+ PUSH_FCODE , /* Save the FCode Assignment number */
+ POP_FCODE , /* Retrieve the FCode Assignment number */
+ RESET_FCODE , /* Reset FCode Ass't nr and overlap checking */
+
+ CURLY_BRACE , /* Support for IBM-style Locals */
+ DASH_ARROW ,
+ LOCAL_VAL ,
+ EXIT ,
+
+ FUNC_NAME ,
+ IFILE_NAME ,
+ ILINE_NUM ,
+
+ CL_FLAG ,
+ SHOW_CL_FLAGS ,
+
+ OVERLOAD ,
+ ALLOW_MULTI_LINE ,
+ MACRO_DEF ,
+ GLOB_SCOPE ,
+ DEV_SCOPE ,
+
+ /* This value has to be adjusted
+ * so that FCODE_END comes
+ * out to be 0xff
+ */
+ END0 = 0xd7 , /* 0xd7 */
+ END1 , /* 0xd8 */
+ CHAR , /* 0xd9 */
+ CCHAR , /* 0xda */
+ ABORTTXT , /* 0xdb */
+
+ NEXTFCODE , /* 0xdc */
+
+ ENCODEFILE , /* 0xdd */
+
+ FCODE_V1 , /* 0xde */
+ FCODE_V3 , /* 0xdf */
+ NOTLAST , /* 0xef */
+ ISLAST , /* 0xf0 */
+ SETLAST , /* 0xf1 */
+ PCIREV , /* 0xf2 */
+ PCIHDR , /* 0xf3 */
+ PCIEND , /* 0xf4 */
+ RESETSYMBS , /* 0xf5 */
+ SAVEIMG , /* 0xf6 */
+ START0 , /* 0xf7 */
+ START1 , /* 0xf8 */
+ START2 , /* 0xf9 */
+ START4 , /* 0xfa */
+ VERSION1 , /* 0xfb */
+ FCODE_TIME , /* 0xfc */
+ FCODE_DATE , /* 0xfd */
+ FCODE_V2 , /* 0xfe */
+ FCODE_END = 0xff /* 0xff */
+} fwtoken ;
+
+#endif /* _TOKE_DICTIONARY_H */
Modified: fcode-utils/toke/emit.c
===================================================================
--- fcode-utils/toke/emit.c 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/toke/emit.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -24,283 +24,548 @@
*
*/
+/* **************************************************************************
+ * Modifications made in 2005 by IBM Corporation
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Modifications Author: David L. Paktor dlpaktor(a)us.ibm.com
+ **************************************************************************** */
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+
+#include "pcihdr.h"
+
#include "toke.h"
+#include "vocabfuncts.h"
#include "stack.h"
+#include "scanner.h"
#include "emit.h"
+#include "clflags.h"
+#include "errhandler.h"
+#include "stream.h"
+#include "nextfcode.h"
-extern bool offs16;
-extern int verbose;
-extern u8 *ostart, *opc, *oend;
+/* **************************************************************************
+ *
+ * Global Variables Imported
+ * verbose Enable optional messages, set by "-v" switch
+ * noerrors "Ignore Errors" flag, set by "-i" switch
+ *
+ **************************************************************************** */
-/* PCI data */
-extern u16 pci_vpd, pci_revision;
-extern bool pci_is_last_image;
-/* header pointers */
-extern u8 *fcode_hdr;
-extern u8 *pci_hdr;
+/* **************************************************************************
+ *
+ * Macro to zero-fill a field of the size of the given structure
+ * into the Output Buffer using the emit_byte() routine.
+ *
+ **************************************************************************** */
-extern bool haveend;
+#define EMIT_STRUCT(x) {int j; for (j=0; j < sizeof(x) ; j++ ) emit_byte(0); }
-u16 lookup_token(char *name);
-static bool little_endian(void)
+/* **************************************************************************
+ *
+ * Local Static Variables, offsets into Output Buffer of ...:
+ * fcode_start_ob_off First FCode-Start byte
+ * fcode_hdr_ob_off FCode Header (Format byte)
+ * fcode_body_ob_off First functional FCode after FCode Header.
+ * pci_hdr_ob_off Start of PCI ROM Header Block structure
+ * pci_data_blk_ob_off Start of PCI Data Header Block structure
+ *
+ * For all of these, -1 means "Not initialized"
+ *
+ *************************************************************************** */
+
+static int fcode_start_ob_off = -1;
+static int fcode_hdr_ob_off = -1;
+static int fcode_body_ob_off = -1;
+static int pci_hdr_ob_off = -1;
+static int pci_data_blk_ob_off = -1;
+
+/* **************************************************************************
+ *
+ * These are to detect a particular error: If FCode has
+ * been written, before an Fcode-start<n> or before
+ * a PCI-header
+ *
+ **************************************************************************** */
+
+static bool fcode_written = FALSE;
+
+/* **************************************************************************
+ *
+ * Variables and Functions Imported, with
+ * Exposure as Limited as possible:
+ * ostart
+ * olen
+ * increase_output_buffer
+ *
+ **************************************************************************** */
+
+extern u8 *ostart;
+extern int olen;
+extern void increase_output_buffer( void);
+
+
+/* **************************************************************************
+ *
+ * Function name: init_emit
+ * Synopsis: Initialize Local Static Variables before starting
+ * Output.
+ * Exposure as Limited as possible.
+ *
+ **************************************************************************** */
+void init_emit( void); /* Prototype. Limit Exposure. */
+void init_emit( void)
{
- static short one=1;
- return *(char *)&one==1;
+ fcode_start_ob_off = -1;
+ fcode_hdr_ob_off = -1;
+ fcode_body_ob_off = -1;
+ pci_hdr_ob_off = -1;
+ pci_data_blk_ob_off = -1;
+ fcode_written = FALSE;
+ haveend = FALSE; /* Get this one too... */
}
-int emit_byte(u8 data)
-{
- u8 *newout;
- int newsize;
- if(opc==oend) {
- /* need more output space */
- newsize = (oend - ostart) * 2;
- printf("Increasing output buffer to %d bytes.\n", newsize);
- if ((newout=realloc(ostart, newsize)) == NULL) {
- printf("toke: could not allocate %d bytes for output buffer\n", newsize);
- exit(-1);
- }
+/* **************************************************************************
+ *
+ * Function name: emit_byte
+ * Synopsis: Fundamental routine for placing a byte
+ * into the Output Buffer. Also, check
+ * whether the buffer needs to be expanded.
+ * For internal use only.
+ *
+ **************************************************************************** */
- /* move pointers */
- opc=newout+(opc-ostart);
- ostart=newout;
- oend=ostart+newsize;
+static void emit_byte(u8 data)
+{
+ if ( opc == olen)
+ {
+ increase_output_buffer();
}
- *opc=data;
+
+ *(ostart+opc) = data ;
opc++;
-
- return 0;
}
-int emit_fcode(u16 tok)
+void emit_fcode(u16 tok)
{
if ((tok>>8))
emit_byte(tok>>8);
emit_byte(tok&0xff);
-
- return 0;
+ fcode_written = TRUE;
}
-int emit_token(const char *name)
+static void emit_num32(u32 num)
{
- return emit_fcode(lookup_token((char *)name));
-}
-
-int emit_num32(u32 num)
-{
emit_byte(num>>24);
emit_byte((num>>16)&0xff);
emit_byte((num>>8)&0xff);
emit_byte(num&0xff);
- return 0;
}
-int emit_num16(u16 num)
+/* **************************************************************************
+ *
+ * Function name: user_emit_byte
+ * Synopsis: Action of user-mandated call to emit-byte.
+ * Covers the corner-case where this is the
+ * first command issued in the source input.
+ *
+ **************************************************************************** */
+
+void user_emit_byte(u8 data)
{
- emit_byte(num>>8);
- emit_byte(num&0xff);
-
- return 0;
+ emit_byte( data);
+ fcode_written = TRUE;
}
-int emit_offset(s16 offs)
+void emit_offset(s16 offs)
{
+ /* Calling routine will test for out-of-range FCode-Offset */
if (offs16)
- emit_num16(offs);
- else
- emit_byte(offs);
-
- return 0;
+ emit_byte(offs>>8);
+ emit_byte(offs&0xff);
}
-s16 receive_offset(void)
+void emit_literal(u32 num)
{
- s16 offs=0;
-
- if (offs16) {
- offs=((*opc)<<8)|(*(opc+1));
- } else
- offs=(*opc);
-
- return offs;
+ emit_token("b(lit)");
+ emit_num32(num);
}
-int emit_string(u8 *string, unsigned int cnt)
+void emit_string(u8 *string, signed int cnt)
{
- unsigned int i=0;
+ signed int i=0;
+ signed int cnt_cpy = cnt;
- if (cnt>255) {
- printf("string too long.");
- exit(1);
+ if ( cnt_cpy > STRING_LEN_MAX )
+ {
+ tokenization_error( TKERROR,
+ "String too long: %d characters. Truncating.\n",cnt);
+ cnt_cpy = STRING_LEN_MAX ;
}
- emit_byte(cnt);
- for (i=0; i<cnt; i++)
+ emit_byte(cnt_cpy);
+ for (i=0; i<cnt_cpy; i++)
emit_byte(string[i]);
-
- return 0;
}
-int emit_fcodehdr(void)
+void emit_fcodehdr(const char *starter_name)
{
- /* We comply with IEEE 1275-1994 */
- emit_byte(0x08);
- /* checksum */
- emit_num16(0);
+ /* Check for error conditions */
+ if ( fcode_written )
+ {
+ tokenization_error( TKERROR ,
+ "Cannot create FCode header after FCode output has begun.\n");
+ if ( ! noerrors ) return ;
+ }
- /* len */
- emit_num32(0);
+ fcode_header_t *fcode_hdr;
- return 0;
+ fcode_start_ob_off = opc;
+ emit_token( starter_name );
+
+ fcode_hdr_ob_off = opc;
+ fcode_hdr = (fcode_header_t *)(ostart+fcode_hdr_ob_off);
+
+ EMIT_STRUCT(fcode_header_t);
+
+ fcode_body_ob_off = opc;
+
+ /* Format = 8 means we comply with IEEE 1275-1994 */
+ fcode_hdr->format = 0x08;
+
}
-int finish_fcodehdr(void)
+/* **************************************************************************
+ *
+ * Function name: finish_fcodehdr
+ * Fill in the FCode header's checksum and length fields, and
+ * reset the FCode-header pointer for the next image.
+ *
+ * If haveend is true then the end0 has already been written
+ * and fcode_ender() has been called.
+ *
+ * Print a WARNING message if the end-of-file was encountered
+ * without an end0 or an fcode-end
+ *
+ * Print an informative message to standard-output giving the
+ * checksum. Call list_fcode_ranges() to print the
+ * value of the last FCode-token that was assigned or
+ * the Ranges of assigned FCode-token values if so be...
+ * The final FCode-binary file-length will be printed
+ * when the binary file is being closed.
+ *
+ **************************************************************************** */
+
+void finish_fcodehdr(void)
{
- u16 checksum=0;
- u32 len,i;
- if(!fcode_hdr)
+ if( fcode_hdr_ob_off == -1 )
{
- printf("warning: trying to fix up unknown fcode header\n");
- return -1;
+ tokenization_error( TKERROR,
+ "Missing FCode header.\n");
+ return ;
}
- /* If the program does not do this, we do */
+ /* If the program did not end cleanly, we'll handle it */
if (!haveend)
+ {
+ tokenization_error ( WARNING,
+ "End-of-file encountered without END0 or FCODE-END. "
+ "Supplying END0\n");
emit_token("end0");
+ fcode_ender();
+ }
- len=(unsigned long)opc-(unsigned long)(fcode_hdr-1);
+ /* Calculate and place checksum and length, if haven't already */
+ if ( fcode_start_ob_off != -1 )
+ {
+ u16 checksum;
+ int length;
+
+ u8 *fcode_body = ostart+fcode_body_ob_off;
+ u8 *ob_end = ostart+opc;
+ fcode_header_t *fcode_hdr =
+ (fcode_header_t *)(ostart+fcode_hdr_ob_off);
- for (i=8;i<len;i++)
- checksum+=fcode_hdr[i-1];
+ length = opc - fcode_start_ob_off;
- dpush((unsigned long)opc);
- opc=fcode_hdr+1;
- emit_num16(checksum);
- emit_num32(len);
- opc=(u8 *)dpop();
+ for ( checksum = 0;
+ fcode_body < ob_end ;
+ checksum += *(fcode_body++) ) ;
+
+ BIG_ENDIAN_WORD_STORE(fcode_hdr->checksum , checksum);
+ BIG_ENDIAN_LONG_STORE(fcode_hdr->length , length);
+
if (verbose)
- printf("toke: checksum is 0x%04x (%d bytes)\n",
- checksum, len);
+ {
+ printf( "toke: checksum is 0x%04x (%d bytes). ",
+ checksum, length);
+ list_fcode_ranges( TRUE);
+ }
+ }
- fcode_hdr=NULL;
+ /* Reset things for the next image... */
+ fcode_start_ob_off = -1;
+ fcode_hdr_ob_off = -1;
+ fcode_body_ob_off = -1;
+ fcode_written = FALSE;
haveend=FALSE;
- return 0;
}
-int emit_pcihdr(u16 vid, u16 did, u32 classid)
+/* **************************************************************************
+ *
+ * Function name: emit_pci_rom_hdr
+ * Synopsis: Write the PCI ROM Header Block into the Output Buffer
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * opc Output Buffer Position Counter
+ * ostart Start of Output Buffer
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * pci_hdr_ob_off PCI ROM Header Block Position
+ * (Offset) in Output Buffer
+ * FCode Output buffer:
+ * Write the part of the PCI ROM Header Block we know:
+ * Fill in the signature and the field reserved for
+ * "processor architecture unique data".
+ * Fill in the "Pointer to PCI Data Structure" with the
+ * size of the data structure, because the first PCI
+ * Data Structure will follow immediately.
+ *
+ * Error Detection: (Handled by calling routine)
+ *
+ **************************************************************************** */
+
+static void emit_pci_rom_hdr(void)
{
- int i;
+ rom_header_t *pci_hdr;
+ pci_hdr_ob_off = opc;
+ pci_hdr = (rom_header_t *)(ostart + pci_hdr_ob_off);
+
+ EMIT_STRUCT(rom_header_t);
/* PCI start signature */
- emit_byte(0x55); emit_byte(0xaa);
+ LITTLE_ENDIAN_WORD_STORE(pci_hdr->signature,0xaa55);
/* Processor architecture */
- emit_byte(0x34); emit_byte(0x00);
+ /* Note:
+ * The legacy code used to read:
+ *
+ * pci_hdr->reserved[0] = 0x34;
+ *
+ * I don't know what significance the literal 34 had, but
+ * by what might just be an odd coincidence, it is equal
+ * to the combined lengths of the PCI-ROM- and PCI-Data-
+ * headers.
+ *
+ * I suspect that it is more than merely an odd coincidence,
+ * and that the following would be preferable:
+ */
- /* 20 bytes of padding */
- for (i=0; i<20; i++) emit_byte(0x00);
+ LITTLE_ENDIAN_WORD_STORE( pci_hdr->reserved ,
+ (sizeof(rom_header_t) + sizeof(pci_data_t)) ) ;
+ /* already handled padding */
+
/* pointer to start of PCI data structure */
- emit_byte(0x1c); emit_byte(0x00);
+ LITTLE_ENDIAN_WORD_STORE(pci_hdr->data_ptr, sizeof(rom_header_t) );
- /* 2 bytes of zero padding */
- emit_byte(0x00); emit_byte(0x00);
+}
- /* PCI Data structure */
- emit_byte('P'); emit_byte('C'); emit_byte('I'); emit_byte('R');
- /* vendor id */
- emit_byte(vid&0xff); emit_byte(vid>>8);
- /* device id */
- emit_byte(did&0xff); emit_byte(did>>8);
- /* vital product data */
- emit_byte(0x00); emit_byte(0x00);
- /* length of pci data structure */
- emit_byte(0x18); emit_byte(0x00);
- /* PCI data structure revision */
- emit_byte(0x00);
-
- if (little_endian()) {
- /* reg level programming */
- emit_byte(classid & 0xff);
- /* class code */
- emit_byte((classid>>8)&0xff);
- emit_byte((classid>>16)&0xff);
- } else {
- /* class code */
- emit_byte((classid>>8)&0xff);
- emit_byte((classid>>16)&0xff);
- /* reg level programming */
- emit_byte(classid & 0xff);
+/* **************************************************************************
+ *
+ * Function name: emit_pci_data_block
+ * Synopsis: Write the PCI Data Block into the Output Buffer
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * opc Output Buffer Position Counter
+ * Data-Stack Items:
+ * Top: Class Code
+ * Next: Device ID
+ * 3rd: Vendor ID
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * pci_data_blk_ob_off PCI Data Header Block Position
+ * (Offset) in Output Buffer
+ * Data-Stack, # of Items Popped: 3
+ * FCode Output buffer:
+ * Write the PCI Data Header Block: Fill in the signature,
+ * Vendor ID, Device ID and Class Code, and everything
+ * else whose value we know. (Size and Checksum will
+ * have to wait until we finish the image...)
+ * Printout:
+ * Advisory of Vendor, Device and Class
+ *
+ * Error Detection: (Handled by calling routine)
+ *
+ **************************************************************************** */
+
+static void emit_pci_data_block(void)
+{
+ pci_data_t *pci_data_blk;
+ u32 class_id = dpop();
+ u16 dev_id = dpop();
+ u16 vend_id = dpop();
+
+ pci_data_blk_ob_off = opc;
+ pci_data_blk = (pci_data_t *)(ostart + pci_data_blk_ob_off);
+
+ EMIT_STRUCT(pci_data_t);
+
+ BIG_ENDIAN_LONG_STORE(pci_data_blk->signature , PCI_DATA_HDR );
+
+ LITTLE_ENDIAN_WORD_STORE(pci_data_blk->vendor , vend_id );
+ LITTLE_ENDIAN_WORD_STORE(pci_data_blk->device , dev_id );
+ LITTLE_ENDIAN_TRIPLET_STORE(pci_data_blk->class_code , class_id );
+
+ LITTLE_ENDIAN_WORD_STORE(pci_data_blk->dlen , sizeof(pci_data_t) );
+
+ pci_data_blk->drevision = PCI_DATA_STRUCT_REV ;
+
+ /* code type = open firmware = 1 */
+ pci_data_blk->code_type = 1;
+
+ /* last image flag */
+ pci_data_blk->last_image_flag = pci_is_last_image ? 0x80 : 0 ;
+
+ tokenization_error(INFO ,
+ "PCI header vendor id=0x%04x, "
+ "device id=0x%04x, class=%06x\n",
+ vend_id, dev_id, class_id );
+
+}
+
+/* **************************************************************************
+ *
+ * Function name: emit_pcihdr
+ * Synopsis: Supervise the writing of PCI Header information
+ * into the Output Buffer, when the PCI-HEADER
+ * tokenizer directive has been encountered.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * fcode_start_ob_off Initted if FCode output has begun
+ * noerrors The "Ignore Errors" flag
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * FCode Output buffer:
+ *
+ * Error Detection:
+ * An attempt to write a PCI Header after FCode output -- either an
+ * Fcode-start<n> or ordinary FCode -- has begun is an ERROR.
+ * Report it; do nothing further, unless "Ignore Errors" is set.
+ *
+ **************************************************************************** */
+
+void emit_pcihdr(void)
+{
+
+ /* Check for error conditions */
+ if (
+ /* FCODE-START<n> has already been issued */
+ ( fcode_start_ob_off != -1 )
+ /* Other FCode has been written */
+ || fcode_written
+ )
+ {
+ tokenization_error( TKERROR ,
+ "Cannot create PCI header after FCode output has begun.\n");
+ if ( ! noerrors ) return ;
}
- /* size of image - to be filled later */
- emit_byte(0x00); emit_byte(0x00);
- /* revision level */
- emit_byte(0x00); emit_byte(0x00);
- /* code type = open firmware */
- emit_byte(0x01);
- emit_byte(0x80);
- /* 2 bytes of padding */
- emit_byte(0x00); emit_byte(0x00);
+ emit_pci_rom_hdr();
- return 0;
+ emit_pci_data_block();
}
+/* **************************************************************************
+ *
+ * Function name: finish_pcihdr
+ * Synopsis: Fill-in the fields of the PCI Header that could
+ * not be determined until the end of the PCI-block.
+ *
+ *************************************************************************** */
-int finish_pcihdr(void)
+void finish_pcihdr(void)
{
- u8 *tpc;
- u32 imgsize=opc-ostart, imgblocks;
+
+ u32 imagesize ;
+ u32 imageblocks;
int padding;
- if(!pci_hdr)
+ rom_header_t *pci_hdr;
+ pci_data_t *pci_data_blk;
+
+ if( pci_data_blk_ob_off == -1 )
{
- printf("error: trying to fix up unknown pci header\n");
- return -1;
+ tokenization_error( TKERROR,
+ "%s without PCI-HEADER\n", strupr(statbuf) );
+ return ;
}
+ pci_hdr = (rom_header_t *)(ostart + pci_hdr_ob_off);
+ pci_data_blk = (pci_data_t *)(ostart + pci_data_blk_ob_off);
+
/* fix up vpd */
- tpc=opc;
- opc=pci_hdr+36;
- emit_byte(pci_vpd&0xff); emit_byte(pci_vpd>>8);
+ LITTLE_ENDIAN_WORD_STORE(pci_data_blk->vpd, pci_vpd);
- /* fix up image size */
- opc=pci_hdr+44;
- imgblocks=(imgsize+511)>>9; /* size is in 512byte blocks */
- emit_byte(imgblocks&0xff); emit_byte(imgblocks>>8);
+ /* Calculate image size and padding */
+ imagesize = opc - pci_hdr_ob_off; /* Padding includes PCI hdr */
+ imageblocks = (imagesize + 511) >> 9; /* Size in 512-byte blocks */
+ padding = (imageblocks << 9) - imagesize;
+
+ /* fix up image size. */
+ LITTLE_ENDIAN_WORD_STORE(pci_data_blk->ilen, imageblocks);
/* fix up revision */
- emit_byte(pci_revision&0xff); emit_byte(pci_revision>>8);
+ if ( big_end_pci_image_rev )
+ {
+ BIG_ENDIAN_WORD_STORE(pci_data_blk->irevision, pci_image_rev);
+ }else{
+ LITTLE_ENDIAN_WORD_STORE(pci_data_blk->irevision, pci_image_rev);
+ }
/* fix up last image flag */
- opc++;
- emit_byte(pci_is_last_image?0x80:0x00);
- opc=tpc;
+ pci_data_blk->last_image_flag = pci_is_last_image ? 0x80 : 0 ;
/* align to 512bytes */
- padding=((imgsize+511)&0xfffffe00)-imgsize;
+
printf("Adding %d bytes of zero padding to PCI image.\n",padding);
while (padding--)
emit_byte(0);
+ if ( ! pci_is_last_image )
+ {
+ printf("Note: PCI header is not last image.\n");
+ }
+ printf("\n");
- pci_hdr=NULL;
- return 0;
+ pci_hdr_ob_off = -1;
+ pci_data_blk_ob_off = -1;
}
void finish_headers(void)
{
- if (fcode_hdr) finish_fcodehdr();
- if (pci_hdr) finish_pcihdr();
+ if (fcode_hdr_ob_off != -1) finish_fcodehdr();
+ if (pci_hdr_ob_off != -1) finish_pcihdr();
}
Modified: fcode-utils/toke/emit.h
===================================================================
--- fcode-utils/toke/emit.h 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/toke/emit.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -1,3 +1,6 @@
+#ifndef _TOKE_EMIT_H
+#define _TOKE_EMIT_H
+
/*
* OpenBIOS - free your system!
* ( FCode tokenizer )
@@ -24,21 +27,90 @@
*
*/
-#ifndef _H_EMIT
-#define _H_EMIT
+/* **************************************************************************
+ * Modifications made in 2005 by IBM Corporation
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Modifications Author: David L. Paktor dlpaktor(a)us.ibm.com
+ **************************************************************************** */
+
+#include "types.h"
-int emit_byte(u8 data);
-int emit_fcode(u16 tok);
-int emit_token(const char *name);
-int emit_num32(u32 num);
-int emit_num16(u16 num);
-int emit_offset(s16 offs);
-s16 receive_offset(void);
-int emit_string(u8 *string, unsigned int cnt);
-int emit_fcodehdr(void);
-int finish_fcodehdr(void);
-int emit_pcihdr(u16 vid, u16 did, u32 classid);
-int finish_pcihdr(void);
+/* **************************************************************************
+ * Structure Name: fcode_header_t
+ * Synopsis: FCode Header within the Output Buffer
+ *
+ * Fields:
+ * format, checksum and length All as prescribed in P1275, Sec 5.2.2.5
+ *
+ * Note that the Checksum and Length fields are stated as byte-arrays
+ * rather than as integers. This is intended to guarantee that
+ * their endian-ness will remain independent of the endian-ness
+ * of the host-platform on which this Tokenizer is running.
+ * Note also that, as integers, both are BIG-Endian.
+ *
+ **************************************************************************** */
+
+typedef struct {
+ u8 format;
+ u8 checksum[2]; /* [0] = Hi byte, [1] = Lo */
+ u8 length[4]; /* [0] = Hi, [1] = Hi-mid, [2] = Lo-mid, [3] = Lo */
+} fcode_header_t;
+
+
+/* **************************************************************************
+ * Macro Name: STRING_LEN_MAX
+ * Max number of bytes allowable in an output string
+ *
+ * Arguments: NONE
+ *
+ * This value must remail hard-coded and immutable. It represents the
+ * maximum number allowed in a FORTH counted-string's count-byte
+ * (which is, of course, the maximum number that can be expressed
+ * in an unsigned byte).
+ * It should not be used for anything else (e.g., buffer sizes), and
+ * most especially not for anything that might be changed!
+ *
+ **************************************************************************** */
+
+#define STRING_LEN_MAX 255
+
+
+/* **************************************************************************
+ * Macro Name: GET_BUF_MAX
+ * Size alloted to input-string buffer
+ *
+ * Arguments: NONE
+ *
+ * This is a generous allotment for the buffer into which
+ * input strings are gathered. Overflow calculations are
+ * also based on it. It may be changed safely.
+ * We like to keep it a nice power-of-two to make the memory-
+ * allocation routine run efficiently and happily (Okay, so
+ * that's anthropormism: It's efficient and *we*'re happy.
+ * Better? I thought so... ;-)
+ *
+ **************************************************************************** */
+
+#define GET_BUF_MAX 1024
+
+
+/* ************************************************************************** *
+ *
+ * Function Prototypes / Functions Exported:
+ *
+ **************************************************************************** */
+
+void emit_fcode(u16 tok);
+void user_emit_byte(u8 data);
+
+void emit_offset(s16 offs);
+void emit_string(u8 *string, signed int cnt);
+void emit_fcodehdr(const char *starter_name);
+void finish_fcodehdr(void);
+void emit_pcihdr(void);
+void finish_pcihdr(void);
void finish_headers(void);
+void emit_end0(void);
+void emit_literal(u32 num);
-#endif /* _H_EMIT */
+#endif /* _TOKE_EMIT_H */
Added: fcode-utils/toke/errhandler.c
===================================================================
--- fcode-utils/toke/errhandler.c (rev 0)
+++ fcode-utils/toke/errhandler.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,956 @@
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Error-Handler for Tokenizer
+ *
+ * Controls printing of various classes of errors
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Functions Exported:
+ * init_error_handler Initialize the error-counts,
+ * announce the file names.
+ * tokenization_error Handle an error of the given class,
+ * print the given message in the
+ * standard format.
+ * started_at Supplemental message, giving a back-reference
+ * to the "starting" point of a compound
+ * error, including last-colon identification.
+ * just_started_at Supplemental back-reference to "starting" point
+ * of compound error, but without last-colon
+ * identification.
+ * where_started Supplemental message, giving a more terse back-
+ * -reference to "start" of compound-error.
+ * just_where_started Supplemental message, more terse back-reference,
+ * without last-colon identification.
+ * in_last_colon Supplemental back-reference message,
+ * identifying last Colon-definition.
+ * safe_malloc malloc with built-in failure test.
+ * error_summary Summarize final error-message status
+ * before completing tokenization.
+ *
+ **************************************************************************** */
+
+
+/* **************************************************************************
+ *
+ * We will define a set of bit-valued error-types and a
+ * global bit-mask. Each error-message will be associated
+ * with one of the bit-valued error-types. The bit-mask,
+ * which will be set by a combination of defaults and user
+ * inputs (mainly command-line arguments), will control
+ * whether an error-message of any given type is printed.
+ *
+ * Another bit-mask variable will accumulate the error-
+ * types that occur within any given run; at the end of
+ * the run, it will be examined to determine if the run
+ * failed, i.e., if the output should be suppressed.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Error-types fall into the following broad categories:
+ * FATAL Cause to immediately stop activity
+ * TKERROR Sufficient to make the run a failure,
+ * but not to stop activity.
+ * WARNING Not necessarily an error, but something
+ * to avoid. E.g., it might rely on
+ * assumptions that are not necessarily
+ * what the user/programmer wants. Or:
+ * It's a deprecated feature, or one
+ * that might be incompatible with
+ * other standard tokenizers.
+ * INFO Nothing is changed in processing, but
+ * an advisory is still in order.
+ * MESSAGE Message generated by the user. (Complete;
+ * new-line will be added by display routine.)
+ * P_MESSAGE Partial Message -- Instigated by user, but
+ * pre-formatted and not complete. New-line
+ * will be added by follow-up routine.
+ *
+ **************************************************************************** */
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include "types.h"
+#include "toke.h"
+#include "stream.h"
+#include "errhandler.h"
+#include "scanner.h"
+
+/* **************************************************************************
+ *
+ * Global Variables Imported
+ * iname Name of file currently being processed
+ * lineno Current line-number being processed
+ * noerrors "Ignore Errors" flag, set by "-i" switch
+ * opc FCode Output Buffer Position Counter
+ * verbose If true, enable Advisory Messages
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Internal Static Variables
+ * print_msg Whether beginning of a message was printed;
+ * therefore, whether to print the rest.
+ * errs_to_print Error Verbosity Mask. Bits set correspond
+ * to message-types that will be printed
+ * May be altered by Command-Line switches.
+ * err_types_found Accumulated Error-types. Bits
+ * set correspond to error-types
+ * that have occurred.
+ * message_dest Message Dest'n. Usually ERRMSG_DESTINATION
+ * (stdout) except when we need to switch.
+ * err_count Count of Error Messages
+ * warn_count Count of Warning Messages
+ * info_count Count of "Advisory" Messages
+ * user_msg_count Count of User-generated Messages
+ * fatal_err_exit Exit code to be used for "Fatal" error.
+ * This is a special accommodation
+ * for the safe_malloc routine.
+ *
+ **************************************************************************** */
+
+static bool print_msg ;
+static int errs_to_print = ( FATAL | TKERROR | WARNING |
+ MESSAGE | P_MESSAGE | FORCE_MSG ) ;
+static int err_types_found = 0 ;
+static int err_count = 0 ;
+static int warn_count = 0 ;
+static int info_count = 0 ;
+static int user_msg_count = 0 ;
+static int fatal_err_exit = -1 ;
+static FILE *message_dest; /* Would like to init to ERRMSG_DESTINATION
+ * here, but the compiler complains...
+ */
+
+/* **************************************************************************
+ *
+ * Internal Static Constant Structure
+ * err_category Correlate each error-type code with its
+ * Counter-variable and the printable
+ * form of its name.
+ * num_categories Number of entries in the err_category table
+ *
+ **************************************************************************** */
+
+typedef struct {
+ int type_bit ; /* Error-type single-bit code */
+ char *category_name ; /* Printable-name base */
+ char *single ; /* Suffix to print singular of name */
+ char *plural ; /* Suffix to print plural of name */
+ int *counter ; /* Associated Counter-variable */
+ bool new_line ; /* Whether to print new-line at end */
+} err_category ;
+
+static const err_category error_categories[] = {
+ /* FATAL must be the first entry in the table. */
+ /* No plural is needed; only one is allowed.... */
+ { FATAL, "Fatal Error", "", "", &err_count , TRUE },
+
+ { TKERROR, "Error" , "", "s", &err_count , FALSE },
+ { WARNING, "Warning" , "", "s", &warn_count , FALSE },
+ { INFO, "Advisor" , "y", "ies", &info_count , FALSE },
+ { MESSAGE , "Message" , "", "s", &user_msg_count , TRUE },
+ { P_MESSAGE , "Message" , "", "s", &user_msg_count , FALSE }
+};
+
+static const int num_categories =
+ ( sizeof(error_categories) / sizeof(err_category) );
+
+
+#ifdef NEEDS_STRUPR
+
+/* **************************************************************************
+ *
+ * Function name: toup
+ * Synopsis: Support function for strupper
+ * Converts one character
+ *
+ * Inputs:
+ * Parameters:
+ * chr_ptr Pointer to the character
+ *
+ * Outputs:
+ * Returned Value: None
+ * Supplied Pointers:
+ * The character pointed to is changed
+ *
+ * Process Explanation:
+ * Because this fills in a lack in the host system, we cannot
+ * rely on the functions islower or toupper , which are
+ * usually built-in but might be similarly missing.
+ *
+ **************************************************************************** */
+
+static void toup( char *chr_ptr)
+{
+ const unsigned char upcas_diff = ( 'a' - 'A' );
+ if ( ( *chr_ptr >= 'a' ) && ( *chr_ptr <= 'z' ) )
+ {
+ *chr_ptr -= upcas_diff ;
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: strupper
+ * Synopsis: Replacement for strupr on systems that don't
+ * seem to have it. A necessary hack.
+ *
+ * Inputs:
+ * Parameters:
+ * strung Pointer to the string to be changed
+ *
+ * Outputs:
+ * Returned Value: Same pointer that was passed in
+ * Supplied Pointers:
+ * The string pointed to will be converted to upper case
+ *
+ * Process Explanation:
+ * Because it fills in a lack in the host system, this routine
+ * does not rely on the functions islower or toupper
+ * which are usually built-in but might be missing.
+ *
+ **************************************************************************** */
+
+char *strupper( char *strung)
+{
+ char *strindx;
+ for (strindx = strung; *strindx != 0; strindx++)
+ {
+ toup( strindx);
+ }
+ return strung;
+}
+
+/* **************************************************************************
+ *
+ * If strupr is missing, it's a good bet that so is strlwr
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Function name: tolow
+ * Synopsis: Support function for strlower
+ * Converts one character
+ *
+ * Inputs:
+ * Parameters:
+ * chr_ptr Pointer to the character
+ *
+ * Outputs:
+ * Returned Value: None
+ * Supplied Pointers:
+ * The character pointed to is changed
+ *
+ * Process Explanation:
+ * Because this fills in a lack in the host system, we cannot
+ * rely on the functions isupper or tolower , which are
+ * usually built-in but might be similarly missing.
+ *
+ **************************************************************************** */
+
+static void tolow( char *chr_ptr)
+{
+ const unsigned char lowcas_diff = ( 'A' - 'a' );
+ if ( ( *chr_ptr >= 'A' ) && ( *chr_ptr <= 'Z' ) )
+ {
+ *chr_ptr -= lowcas_diff ;
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: strlower
+ * Synopsis: Replacement for strlwr on systems that don't
+ * seem to have it. A necessary hack.
+ *
+ * Inputs:
+ * Parameters:
+ * strung Pointer to the string to be changed
+ *
+ * Outputs:
+ * Returned Value: Same pointer that was passed in
+ * Supplied Pointers:
+ * The string pointed to will be converted to lower case
+ *
+ * Process Explanation:
+ * Because it fills in a lack in the host system, this routine
+ * does not rely on the functions isupper or tolower
+ * which are usually built-in but might be missing.
+ *
+ **************************************************************************** */
+
+char *strlower( char *strung)
+{
+ char *strindx;
+ for (strindx = strung; *strindx != 0; strindx++)
+ {
+ tolow( strindx);
+ }
+ return strung;
+}
+
+
+#endif /* NEEDS_STRUPR */
+
+/* **************************************************************************
+ *
+ * Function name: init_error_handler
+ * Synopsis: Initialize the error-handler before starting a
+ * new tokenization; both the aspects that will
+ * persist across the entire run and those that
+ * need to be reset, such as error-counts.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * verbose Set by "-v" switch
+ * Macro:
+ * ERRMSG_DESTINATION Error message destination;
+ * (Set by development-time switch)
+ * FFLUSH_STDOUT Flush STDOUT if err-msg-dest is STDERR
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * errs_to_print Add the INFO bit if verbose is set
+ * Local Static Variables:
+ * message_dest Point it at ERRMSG_DESTINATION (stderr)
+ * Reset the following to zero:
+ * err_types_found Accumulated Error-types.
+ * err_count Count of Error Messages
+ * warn_count Count of Warning Messages
+ * info_count Count of "Advisory" Messages
+ * user_msg_count Count of User-generated Messages
+ * Other Exotic Effects:
+ * Flush stdout if Error message destination is not stdout, to
+ * avoid collisions with stderr once Error Messaging begins.
+ *
+ * Extraneous Remarks:
+ * This needs to be done before attempting to read the input file,
+ * so that any Messages that occur there can be properly counted.
+ *
+ **************************************************************************** */
+
+void init_error_handler( void)
+{
+ message_dest = ERRMSG_DESTINATION;
+ if ( verbose ) errs_to_print |= INFO ;
+ err_types_found = 0 ;
+ err_count = 0 ;
+ warn_count = 0 ;
+ info_count = 0 ;
+ user_msg_count = 0 ;
+ FFLUSH_STDOUT
+}
+
+/* **************************************************************************
+ *
+ * Function name: tokenization_error
+ * Synopsis: Handle an error of the given class,
+ * print the given message in the standard format.
+ *
+ * Inputs:
+ * Parameters:
+ * err_type int One of the bit-valued error-types
+ * The remaining parameters are a format string and corresponding
+ * data objects such as would be sent to printf()
+ * Global Variables:
+ * errs_to_print Error Verbosity Mask.
+ * iname Name of file currently being processed
+ * lineno Current line-number being processed
+ * fatal_err_exit Exit code for "Fatal" error, if applicable.
+ * Macro:
+ * ERRMSG_DESTINATION Error message destination;
+ * (Development-time switch)
+ * Note: Whether this routine will or will not supply a new-line
+ * at the end of the printout depends on the category of the
+ * message. The new-line is included for a FATAL or a User-
+ * Generated Message, and excluded for the rest. For those,
+ * the calling routine must be responsible for including a
+ * new-line at the end of the format string or for otherwise
+ * finishing the line, as by calling started_at()
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * err_types_found Accumulated Error-types.
+ * print_msg Whether this message was printed;
+ * may be used by started_at()
+ * One of the following Category Counters
+ * will be incremented, as applicable:
+ * err_count
+ * warn_count
+ * info_count
+ * user_msg_count
+ * Printout: Directed to stdout or stderr
+ * (see definition of ERRMSG_DESTINATION)
+ *
+ * Error Detection:
+ * Err_type not in list
+ * Print special message; treat cause as an Error.
+ * Force printout.
+ *
+ * Process Explanation:
+ * Accumulated the Error-type into err_types_found
+ * Identify the Error-Category:
+ * Check the Error-Type against the bit-code.
+ * The Error-type may have more than one bit set,
+ * but if it matches the Category bit-code, it's it.
+ * If it doesn't match any Error-Category bit-code, print
+ * a special message and treat it as an ERROR code.
+ * Check the Error-Type against the Error Verbosity Mask;
+ * If it has a bit set, print the Error-Category, together
+ * with the source-file name and line number, and
+ * the rest of the message as supplied.
+ * The table that translates the Error-type into a printable
+ * Error-Category string also identifies the applicable
+ * Category Counter; increment it.
+ * Of course, there's no return from a FATAL error; it exits.
+ *
+ **************************************************************************** */
+
+void tokenization_error( int err_type, char* msg, ... )
+{
+ int indx ;
+
+ /* Initial settings: treat as an Error. */
+ char *catgy_name = "Error";
+ char *catgy_suffx = "";
+ int *catgy_counter = &err_count;
+ bool print_new_line = FALSE;
+
+ /* Accumulated the Error-type into err_types_found */
+ err_types_found |= err_type;
+
+ /* Identify the Error-Category. */
+ for ( indx = 0 ; indx < num_categories ; indx ++ )
+ {
+ if ( ( error_categories[indx].type_bit & err_type ) != 0 )
+ {
+ catgy_name = error_categories[indx].category_name;
+ catgy_suffx = error_categories[indx].single;
+ catgy_counter = error_categories[indx].counter;
+ print_new_line = error_categories[indx].new_line;
+ break;
+ }
+ }
+
+ /* Special message if err_type not in list; treat as an Error. */
+ if ( catgy_name == NULL )
+ {
+ fprintf(ERRMSG_DESTINATION,
+ "Program error: Unknown Error-Type, 0x%08x. "
+ " Will treat as Error.\n", err_type) ;
+ err_types_found |= TKERROR;
+ print_msg = TRUE ;
+ } else {
+ /* Check the Error-Type against the Error Verbosity Mask */
+ print_msg = BOOLVAL( ( errs_to_print & err_type ) != 0 );
+ }
+
+ if ( print_msg )
+ {
+ va_list argp;
+
+ if ( iname != NULL )
+ {
+ fprintf(ERRMSG_DESTINATION, "%s%s: File %s, Line %d. ",
+ catgy_name, catgy_suffx, iname, lineno);
+ }else{
+ /* Don't print iname or lineno if no file opened. */
+ fprintf(ERRMSG_DESTINATION, "%s%s: ",
+ catgy_name, catgy_suffx);
+ }
+
+ va_start(argp, msg);
+ vfprintf(ERRMSG_DESTINATION, msg, argp);
+ va_end(argp);
+ if ( print_new_line ) fprintf(ERRMSG_DESTINATION, "\n");
+
+ /* Increment the category-counter. */
+ *catgy_counter += 1;
+ }
+ if ( err_type == FATAL )
+ {
+ fprintf(ERRMSG_DESTINATION, "Tokenization terminating.\n");
+ error_summary();
+ exit ( fatal_err_exit );
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: print_where_started
+ * Synopsis: Supplemental message, following a tokenization_error,
+ * giving a back-reference to the "start" point of
+ * the compound-error being reported.
+ * This is a retro-fit; it does the heavy lifting for
+ * the routines started_at() , just_started_at() ,
+ * where_started() , just_where_started() and
+ * in_last_colon() .
+ *
+ * Inputs:
+ * Parameters:
+ * show_started Whether to print a phrase about "started"
+ * show_that_st Whether to print "that started" as opposed
+ * to " , which started"
+ * saved_ifile File-name saved for "back-reference"
+ * saved_lineno Line-number saved for "back-reference"
+ * may_show_incolon Whether to allow a call to in_last_colon()
+ * Needed to prevent infinite recursion...
+ * Global Variables:
+ * iname Name of file currently being processed
+ * lineno Current line-number being processed
+ * Local Static Variables:
+ * print_msg Whether the beginning part of the message
+ * was printed by tokenization_error()
+ * message_dest Message Destination. Is ERRMSG_DESTINATION
+ * (stdout) usually, except sometimes...
+ *
+ * Outputs:
+ * Returned Value: None
+ * Printout:
+ * The remainder of a message: the location of a back-reference.
+ * The phrase "that started" is switchable. This routine
+ * will supply the leading space and a new-line; the routines
+ * that call this can be used to finish the line.
+ *
+ * Process Explanation:
+ * This routine is called immediately after tokenization_error()
+ * If tokenization_error() didn't print, neither will we.
+ * The residual state of print_msg will tell us that.
+ * If the preceding message ended with something general about a
+ * "Colon Definition" or "Device-Node" or the like, we want
+ * the message to read: "that started on line ... [in file ...]"
+ * If the end of the preceding message was something more specific,
+ * we just want the message to read: "on line ... [in file ...]"
+ * If the saved input file name doesn't match our current input
+ * file name, we will print it and the saved line-number.
+ * If the file name hasn't changed, we will print only the saved
+ * line-number.
+ * If neither is changed, there's no point in printing any of the
+ * above-mentioned text.
+ * If a Colon-definition is in progress, show its name and the
+ * line on which it started. Protect against infinite loop!
+ * End the line.
+ *
+ * Extraneous Remarks:
+ * This is a retrofit. Earlier, it was just started_at() . Later,
+ * I generated more specific messages, and needed a way to leave
+ * out the "that started". I could, theoretically, have added
+ * the extra parameter to started_at() , but by now there are
+ * so many of calls to it that I'd rather leave them as is, and
+ * just change the name of the routine in the few places that
+ * need the terser form of the message.
+ *
+ **************************************************************************** */
+
+static void print_where_started( bool show_started,
+ bool show_that_st,
+ char * saved_ifile,
+ unsigned int saved_lineno,
+ bool may_show_incolon)
+{
+ if ( print_msg )
+ {
+ bool fil_is_diff;
+ bool lin_is_diff;
+
+ /* File names are case-sensitive */
+ fil_is_diff = BOOLVAL(strcmp(saved_ifile, iname) != 0 );
+ lin_is_diff = BOOLVAL(saved_lineno != lineno );
+ if ( fil_is_diff || lin_is_diff )
+ {
+ if ( show_started )
+ {
+ if ( show_that_st )
+ {
+ fprintf(message_dest, " that");
+ }else{
+ fprintf(message_dest, " , which");
+ }
+ fprintf(message_dest, " started");
+ }
+ fprintf(message_dest, " on line %d", saved_lineno);
+ if ( fil_is_diff )
+ {
+ fprintf(message_dest, " of file %s", saved_ifile);
+ }
+ }
+
+ if ( may_show_incolon )
+ {
+ in_last_colon();
+ }else{
+ fprintf(message_dest, "\n");
+ }
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: started_at
+ * Synopsis: Supplemental back-reference message,
+ * with the "that started" phrase,
+ * and with last-colon identification.
+ *
+ * Inputs:
+ * Parameters:
+ * saved_ifile File-name saved for "back-reference"
+ * saved_lineno Line-number saved for "back-reference"
+ *
+ * Outputs:
+ * Returned Value: None
+ * Global Variables:
+ * Printout:
+ * The "...started at..." remainder of a message, giving a back-
+ * -reference to the "start" point supplied in the params,
+ * and the start of the current Colon-definition if one is
+ * in effect.
+ * Will supply a new-line and can be used to finish the line.
+ *
+ **************************************************************************** */
+
+void started_at( char * saved_ifile, unsigned int saved_lineno)
+{
+ print_where_started( TRUE, TRUE, saved_ifile, saved_lineno, TRUE);
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: print_started_at
+ * Synopsis: Same as started_at() except output will be directed
+ * to stdout instead of to ERRMSG_DESTINATION
+ *
+ * Extraneous Remarks:
+ * A retrofit. Can you tell?
+ *
+ **************************************************************************** */
+
+void print_started_at( char * saved_ifile, unsigned int saved_lineno)
+{
+ message_dest = stdout;
+ started_at( saved_ifile, saved_lineno);
+ message_dest = ERRMSG_DESTINATION;
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: just_started_at
+ * Synopsis: Supplemental back-reference message,
+ * with the "that started" phrase,
+ * but without last-colon identification.
+ *
+ * Inputs:
+ * Parameters:
+ * saved_ifile File-name saved for "back-reference"
+ * saved_lineno Line-number saved for "back-reference"
+ *
+ * Outputs:
+ * Returned Value: None
+ * Global Variables:
+ * Printout:
+ * The "...started at..." remainder of a message, giving a back-
+ * -reference to the "start" point supplied in the params,
+ * and no more.
+ * Will supply a new-line and can be used to finish the line.
+ *
+ **************************************************************************** */
+
+void just_started_at( char * saved_ifile, unsigned int saved_lineno)
+{
+ print_where_started( TRUE, TRUE, saved_ifile, saved_lineno, FALSE);
+}
+
+/* **************************************************************************
+ *
+ * Function name: where_started
+ * Synopsis: Supplemental back-reference message,
+ * without the "that started" phrase,
+ * but with last-colon identification.
+ *
+ * Inputs:
+ * Parameters:
+ * saved_ifile File-name saved for "back-reference"
+ * saved_lineno Line-number saved for "back-reference"
+ *
+ * Outputs:
+ * Returned Value: None
+ * Global Variables:
+ * Printout:
+ * The remainder of a message, giving a back-reference to the
+ * "start" point supplied in the parameters, and the start
+ * of the current Colon-definition if one is in effect.
+ * Will supply a new-line and can be used to finish the line.
+ *
+ **************************************************************************** */
+
+void where_started( char * saved_ifile, unsigned int saved_lineno)
+{
+ print_where_started( FALSE, FALSE, saved_ifile, saved_lineno, TRUE);
+}
+
+/* **************************************************************************
+ *
+ * Function name: just_where_started
+ * Synopsis: Supplemental back-reference message,
+ * without the "that started" phrase,
+ * and without last-colon identification.
+ *
+ * Inputs:
+ * Parameters:
+ * saved_ifile File-name saved for "back-reference"
+ * saved_lineno Line-number saved for "back-reference"
+ *
+ * Outputs:
+ * Returned Value: None
+ * Global Variables:
+ * Printout:
+ * The remainder of a message, giving a back-reference to the
+ * "start" point supplied in the parameters, and no more.
+ * Will supply a new-line and can be used to finish the line.
+ *
+ **************************************************************************** */
+
+void just_where_started( char * saved_ifile, unsigned int saved_lineno)
+{
+ print_where_started( FALSE, FALSE, saved_ifile, saved_lineno, FALSE);
+}
+
+/* **************************************************************************
+ *
+ * Function name: in_last_colon
+ * Synopsis: Supplemental back-reference message, identifying
+ * last Colon-definition if one is in effect.
+ * Can be used to finish the line in either case.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * incolon TRUE if Colon-definition is in progress
+ * last_colon_defname Name of last colon-definition
+ * last_colon_filename File where last colon-def'n made
+ * last_colon_lineno Line number of last colon-def'n
+ * Local Static Variables:
+ * print_msg Whether the beginning part of the message
+ * was printed by tokenization_error()
+ * message_dest Message Destination. Is ERRMSG_DESTINATION
+ * (stdout) usually, except sometimes...
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout:
+ * Remainder of a message:
+ * "in definition of ... , which started ..."
+ *
+ * Process Explanation:
+ * Because this routine does some of its own printing, it needs
+ * to check the residual state of print_msg first.
+ * The calling routine does not need to test incolon ; it can
+ * call this to end the line in either case.
+ *
+ **************************************************************************** */
+
+void in_last_colon( void )
+{
+ if ( print_msg )
+ {
+ if ( incolon )
+ {
+ fprintf( message_dest, " in definition of %s ",
+ strupr( last_colon_defname) );
+ print_where_started( TRUE, FALSE,
+ last_colon_filename, last_colon_lineno, FALSE);
+ }else{
+ fprintf(message_dest, "\n");
+ }
+ }
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: safe_malloc
+ * Synopsis: malloc with built-in failure test.
+ *
+ * Inputs:
+ * Parameters:
+ * size size_t Size of memory-chunk to allocate
+ * phrase char * Phrase to print after "... while "
+ * in case of failure.
+ *
+ * Outputs:
+ * Returned Value: Pointer to allocated memory
+ * Global Variables:
+ * fatal_err_exit On memory allocation failure, change
+ * to a special system-defined value
+ *
+ * Error Detection:
+ * On memory allocation failure, declare a FATAL error. Set up
+ * for a special system-defined EXIT value that indicates
+ * insufficient memory.
+ *
+ * Process Explanation:
+ * It is the responsibility of the calling routine to be sure
+ * the "phrase" is unique within the program. It is intended
+ * as a debugging aid, to help localize the point of failure.
+ *
+ **************************************************************************** */
+
+_PTR safe_malloc( size_t size, char *phrase)
+{
+ _PTR retval ;
+ retval = malloc (size);
+ if ( !retval )
+ {
+ fatal_err_exit = -ENOMEM ;
+ tokenization_error( FATAL, "Out of memory while %s.", phrase);
+ }
+ return ( retval );
+}
+
+/* **************************************************************************
+ *
+ * Function name: error_summary
+ * Synopsis: Summarize final error-message status
+ * before completing tokenization.
+ * Indicate if OK to produce output.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * noerrors "Ignore Errors" flag, set by "-i" switch
+ * err_types_found Accumulated Error-types.
+ * error_categories Table of Error-types, Message-Counters
+ * and their printable names.
+ * opc FCode Output Buffer Position Counter
+ * (zero means there was no output).
+ *
+ * Outputs:
+ * Returned Value: True = OK to produce output (But caller
+ * must still verify non-zero opc)
+ * Printout:
+ * Various messages.
+ *
+ * Process Explanation:
+ * The first entry in the error_categories table is FATAL
+ * We won't need to print a tally of that...
+ *
+ **************************************************************************** */
+
+bool error_summary( void )
+{
+ /* Bit-mask of error-types that require suppressing output */
+ static const int suppress_mask = ( FATAL | TKERROR );
+ bool retval = TRUE;
+ bool suppressing = FALSE;
+
+ /* There's no escaping a FATAL error */
+ if ( ( err_types_found & FATAL ) != 0 )
+ {
+ /* FATAL error. Don't even bother with the tally. */
+ suppressing = TRUE;
+ } else {
+
+ if ( opc == 0 )
+ {
+ printf ( "Nothing Tokenized");
+ }else{
+ printf ( "Tokenization Completed");
+ }
+
+ if ( err_types_found != 0 )
+ {
+ int indx;
+ bool tally_started = FALSE ;
+ printf (". ");
+ /*
+ * Print a tally of the error-types;
+ * handle plurals and punctuation appropriately.
+ */
+ /* Start at indx = 1 to skip examining FATALs */
+ for ( indx = 1; indx < num_categories ; indx ++ )
+ {
+ if ( *(error_categories[indx].counter) > 0 )
+ {
+ printf ("%s %d %s%s",
+ tally_started ? "," : "" ,
+ *(error_categories[indx].counter),
+ error_categories[indx].category_name,
+ *(error_categories[indx].counter) > 1 ?
+ error_categories[indx].plural :
+ error_categories[indx].single );
+ /* Zero out the counter, to prevent displaying the
+ * number of Messages twice, since it's shared
+ * by the "Messages" and "P_Messages" categories.
+ */
+ *(error_categories[indx].counter) = 0;
+ tally_started = TRUE;
+ }
+ }
+ }
+ printf (".\n");
+
+ if ( ( err_types_found & suppress_mask ) != 0 )
+ { /* Errors found. Not OK to produce output */
+ /* Unless "Ignore Errors" flag set... */
+ if ( INVERSE(noerrors) )
+ {
+ suppressing = TRUE;
+ }else{
+ if ( opc > 0 )
+ {
+ printf ("Error-detection over-ridden; "
+ "producing binary output.\n");
+ }
+ }
+ }
+ }
+ if ( suppressing )
+ {
+ retval = FALSE ;
+ printf ("Suppressing binary output.\n");
+ }
+ return ( retval );
+}
+
Added: fcode-utils/toke/errhandler.h
===================================================================
--- fcode-utils/toke/errhandler.h (rev 0)
+++ fcode-utils/toke/errhandler.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,119 @@
+#ifndef _TOKE_ERRHANDLER_H
+#define _TOKE_ERRHANDLER_H
+
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Function Prototypes for Tokenizer Error-Handler
+ *
+ * Defines symbols for the various classes of errors
+ * for the Error-Handler and for all its users
+ *
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+#include "types.h"
+
+#define FATAL 0x80000000
+#define TKERROR 0x04000000
+#define WARNING 0x00200000
+#define INFO 0x00010000
+#define MESSAGE 0x00000800
+#define P_MESSAGE 0x00000040
+#define FORCE_MSG 0x00000001
+
+void init_error_handler( void);
+void tokenization_error( int err_type, char* msg, ... );
+void started_at( char * saved_ifile, unsigned int saved_lineno);
+void print_started_at( char * saved_ifile, unsigned int saved_lineno);
+void just_started_at( char * saved_ifile, unsigned int saved_lineno);
+void where_started( char * saved_ifile, unsigned int saved_lineno);
+void just_where_started( char * saved_ifile, unsigned int saved_lineno);
+void in_last_colon( void );
+_PTR safe_malloc( size_t size, char *phrase);
+bool error_summary( void ); /* Return TRUE if OK to produce output. */
+
+
+/* **************************************************************************
+ *
+ * Macros:
+ * ERRMSG_DESTINATION During development, I used this to switch
+ * error message destination between STDOUT and STDERR, until I
+ * settled on which is preferable. Recently, I have proven to
+ * my satisfaction that STDERR is preferable: error-messages
+ * produced by a sub-shell will be correctly synchronized with
+ * the error-messages we produce. When I tested using STDOUT
+ * for error-messages, that error-case looked garbled.
+ * FFLUSH_STDOUT fflush( stdout) if error message destination
+ * is STDERR, No-op if it's STDOUT. A few of these, judiciously
+ * placed, kept our own regular and error messages nicely in sync.
+ *
+ **************************************************************************** */
+
+#define ERRMSG_DESTINATION stderr
+#define FFLUSH_STDOUT fflush( stdout);
+
+/* We're no longer switching the above.
+ * The below is left here to show what had been done formerly.
+ */
+#if -1 /* Switchable error-message destination */
+#else /* Switchable error-message destination */
+#define ERRMSG_DESTINATION stdout
+#define FFLUSH_STDOUT /* Don't need to do anything here */
+#endif /* Switchable error-message destination */
+
+/* Some systems don't seem to have strupr */
+#ifdef SYS_IS_GNU_Linux
+#define NEEDS_STRUPR
+#endif /* SYS_IS_GNU_Linux */
+#ifdef SYS_IS_AIX
+#define NEEDS_STRUPR
+#endif /* SYS_IS_AIX */
+/* ??? Should this instead be tuned to Proc'r is PPC ??? Why? */
+
+#ifdef NEEDS_STRUPR
+
+/* **************************************************************************
+ *
+ * A necessary hack for systems that don't seem
+ * to have strupr and strlwr
+ * Let's avoid a naming conflict, just in case...
+ *
+ **************************************************************************** */
+
+extern char *strupper( char *strung);
+#define strupr strupper
+
+extern char *strlower( char *strung);
+#define strlwr strlower
+
+
+#endif /* NEEDS_STRUPR */
+
+#endif /* _TOKE_ERRHANDLER_H */
Added: fcode-utils/toke/flowcontrol.c
===================================================================
--- fcode-utils/toke/flowcontrol.c (rev 0)
+++ fcode-utils/toke/flowcontrol.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,2080 @@
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Support Functions for tokenizing FORTH Flow-Control structures.
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Functions Exported:
+ * These first two do their work after the calling routine
+ * has written the token for the required variant:
+ *
+ * mark_do Mark branches for "do" variants
+ * resolve_loop Resolve "loop" variants' branches
+ *
+ * The remaining routines' descriptions are all similar:
+ * Write the token(s), handle the outputs, mark
+ * or resolve the branches, and verify correct
+ * control-structure matching, for tokenizing
+ * the ........................ statement in FORTH
+ * emit_if IF
+ * emit_else ELSE
+ * emit_then THEN
+ * emit_begin BEGIN
+ * emit_again AGAIN
+ * emit_until UNTIL
+ * emit_while WHILE
+ * emit_repeat REPEAT
+ * emit_case CASE
+ * emit_of OF
+ * emit_endof ENDOF
+ * emit_endcase ENDCASE
+ *
+ * Three additional routines deal with matters of overall balance
+ * of the Control-Structures, and identify the start of any that
+ * were not balanced. The first just displays Messages:
+ *
+ * announce_control_structs
+ *
+ * The other two clear and re-balance them:
+ *
+ * clear_control_structs_to_limit
+ * clear_control_structs
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Still to be done:
+ * Correct analysis of Return-Stack usage around Flow-Control
+ * constructs, including within Do-Loops or before Loop
+ * Elements like I and J or UNLOOP or LEAVE.
+ * Similarly, Return-Stack usage around IF ... ELSE ... THEN
+ * statements needs analysis. For instance, the following:
+ *
+ * blablabla >R yadayada IF R> gubble ELSE flubble R> THEN
+ *
+ * is, in fact, correct, while something like:
+ *
+ * blablabla >R yadayada IF R> gubble THEN
+ *
+ * is an error.
+ *
+ * Implementing an analysis that would be sufficiently accurate
+ * to justify reporting an ERROR with certainty (rather than
+ * a mere WARNING speculatively) would probably require full
+ * coordination with management of Flow-Control constructs,
+ * and so is noted here.
+ *
+ **************************************************************************** */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "types.h"
+#include "toke.h"
+#include "emit.h"
+#include "vocabfuncts.h"
+#include "scanner.h"
+#include "stack.h"
+#include "errhandler.h"
+#include "flowcontrol.h"
+#include "stream.h"
+
+/* **************************************************************************
+ *
+ * Global Variables Imported
+ * opc FCode Output Buffer Position Counter
+ * noerrors "Ignore Errors" flag, set by "-i" switch
+ * do_loop_depth How deep we are inside DO ... LOOP variants
+ * incolon State of tokenization; TRUE if inside COLON
+ * statbuf The word just read from the input stream
+ * iname Name of input file currently being processed
+ * lineno Current line-number being processed
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Global Variables Exported
+ * control_stack_depth Number of items on "Control-Stack"
+ *
+ **************************************************************************** */
+
+int control_stack_depth = 0;
+
+
+/* **************************************************************************
+ *
+ * Internal Static Functions:
+ * push_cstag Push an item onto the Control-Stack
+ * pop_cstag Pop one item from the Control-Stack
+ * control_stack_size_test Test C-S depth; report if error
+ * control_structure_mismatch Print error-message
+ * offset_too_large Print error-message
+ * matchup_control_structure Error-check Control-Stack
+ * matchup_two_control_structures Error-check two Control-Stack entries
+ * emit_fc_offset Error-check and output FCode-Offset
+ * control_structure_swap Swap control-struct branch-markers
+ * mark_backward_target Mark target of backward-branch
+ * resolve_backward Resolve backward-target for branch
+ * mark_forward_branch Mark forward-branch
+ * resolve_forward Resolve forward-branch at target
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Internal Named Constants
+ * Note: These control-structure identifier tags -- a.k.a. cstags --
+ * are used to identify the matching components of particular
+ * control-structures. They are passed as parameters, and either
+ * "Pushed" onto the "Control-Stack", or compared with what is on
+ * "Top" of the "Control-Stack", as an error-check.
+ *
+ * name used by forth words:
+ * BEGIN_CSTAG BEGIN AGAIN UNTIL REPEAT
+ * IF_CSTAG IF ELSE THEN
+ * WHILE_CSTAG WHILE REPEAT THEN
+ * DO_CSTAG DO ?DO LOOP +LOOP
+ * CASE_CSTAG CASE OF ENDCASE
+ * OF_CSTAG OF ENDOF
+ * ENDOF_CSTAG ENDOF ENDCASE
+ *
+ * The numbers assigned are arbitrary; they were selected for a
+ * high unlikelihood of being encountered in normal usage,
+ * and constructed with a hint of mnemonic value in mind.
+ *
+ **************************************************************************** */
+ /* Mnemonic: */
+#define BEGIN_CSTAG 0xC57be916 /* CST BEGIN */
+#define IF_CSTAG 0xC57A901f /* CSTAG (0) IF */
+#define WHILE_CSTAG 0xC573412e /* CST WHILE */
+#define DO_CSTAG 0xC57A90d0 /* CSTAG (0) DO */
+#define CASE_CSTAG 0xC57Aca5e /* CSTA CASE */
+#define OF_CSTAG 0xC57A90f0 /* CSTAG OF (0) */
+#define ENDOF_CSTAG 0xC57e6d0f /* CST ENDOF */
+
+
+/* **************************************************************************
+ *
+ * Control-Structure identification, matching, completion and error
+ * messaging will be supported by a data structure, which we
+ * will call a CSTAG-Group
+ *
+ * It consists of one "Data-item" and several "Marker" items, thus:
+ *
+ * The Data-item in most cases will be a value of OPC (the Output
+ * Buffer Position Counter) which will be used in calculating
+ * an offset or placing an offset or both, as the case may be,
+ * for the control structure in question. The one exception
+ * is for a CSTAG-Group generated by a CASE statement; its
+ * Data-item will be an integer count of the number of "OF"s
+ * to be resolved when the ENDCASE statement is reached.
+ *
+ * The CSTAG for the FORTH word, as described above
+ * The name of the input file in which the word was encountered
+ * (actually, a pointer to a mem-alloc'ed copy of the filename)
+ * The line number, within the input file, of the word's invocation
+ * The Absolute Token Number in all Source Input of the word
+ * The FORTH word that started the structure, (used in error messages)
+ * A flag to indicate when two CSTAG-Groups are created together,
+ * which will be used to prevent duplicate error messages when,
+ * for instance, a DO is mismatched with a REPEAT .
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * "Control-Stack" Diagram Notation
+ *
+ * The CSTAG-Groups will be kept in an order resembling a data-stack,
+ * (even though it won't be the data-stack itself). We will refer
+ * to this list of structures as the "Control Stack", and in our
+ * comments we will show their arrangement in a format resembling
+ * stack-diagram remarks.
+ *
+ * In these "Control-Stack Diagrams", we will use the notation:
+ * <Stmt>_{FOR|BACK}w_<TAGNAM>
+ * to represent a CSTAG-Group generated by a <Stmt> -type of
+ * statement, with a "FORw"ard or "BACKw"ard branch-marker and
+ * a CSTAG of the <TAGNAM> type.
+ *
+ * A CASE-CSTAG-Group will have a different notation:
+ * N_OFs...CASE_CSTAG
+ *
+ * In all cases, a CSTAG-Group will be manipulated as a unit.
+ *
+ * The notation for Control-Stack Diagram remarks will largely resemble
+ * the classic form used in FORTH, i.e., enclosed in parentheses,
+ * lowest item to the left, top item on the right, with a double-
+ * hyphen to indicate "before" or "after".
+ *
+ * Enclosure in {curly-braces} followed by a subscript-range indicates
+ * that the Stack-item or Group is repeated.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * We are not keeping the "Control Stack" structures on the regular
+ * data stack because a sneaky combination of user-inputs could
+ * throw things into chaos were we to use that scheme. Consider
+ * what would happen if a number were put on the stack, say, in
+ * tokenizer-escape mode, in between elements of a flow-control
+ * structure... Theoretically, there is no reason to prohibit
+ * that, but it would be unexpectedly problematical for most
+ * FORTH-based tokenizers.
+ *
+ * Maintaining the "Control Stack" structures in a linked-list would
+ * be a more nearly bullet-proof approach. The theory of operation
+ * would be the same, broadly speaking, and there would be no need
+ * to check for NOT_CSTAG and no risk of getting the elements of
+ * the control-structures out of sync.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Structure Name: cstag_group_t
+ * Synopsis: Control-Structure Tag Group
+ *
+ * Fields:
+ * cs_tag Control-structure identifier tag
+ * cs_inp_fil Name of input file where C-S was started
+ * cs_line_num Line-number in Current Source when C-S was started
+ * cs_abs_token_num "Absolute" Token Number when C-S was started
+ * cs_word The FORTH word that started the C-S
+ * cs_not_dup FALSE if second "Control Stack" entry for same word
+ * cs_datum Data-Item of the Group
+ * prev Pointer to previous CSTAG-Group in linked-list
+ *
+ * All data using this structure will remain private to this file,
+ * so we declare it here rather than in the .h file
+ *
+ **************************************************************************** */
+
+typedef struct cstag_group {
+ unsigned long cs_tag;
+ char *cs_inp_fil;
+ unsigned int cs_line_num;
+ unsigned int cs_abs_token_num;
+ char *cs_word;
+ bool cs_not_dup;
+ unsigned long cs_datum;
+ struct cstag_group *prev;
+} cstag_group_t;
+
+/* **************************************************************************
+ *
+ * Internal Static Variables
+ * control_stack "Thread" Pointer to the linked-list of
+ * "Control Stack" structure entries
+ * not_cs_underflow Flag used to prevent duplicate messages
+ * not_consuming_two Flag used to prevent loss of messages
+ * didnt_print_otl Flag used to prevent duplicate messages
+ *
+ **************************************************************************** */
+
+static cstag_group_t *control_stack = NULL; /* "Top" of the "Stack" */
+
+/* **************************************************************************
+ *
+ * not_cs_underflow is used only by routines that make two calls to
+ * resolve a marker. It is set TRUE before the first call; if
+ * that call had a control-stack underflow, the error-message
+ * routine resets it to FALSE. The calling routine can then
+ * test it as the condition for the second call.
+ * Routines that make only one call to resolve a marker can ignore it.
+ *
+ **************************************************************************** */
+
+static bool not_cs_underflow; /* No need to initialize. */
+
+/* **************************************************************************
+ *
+ * not_consuming_two is also used only by routines that make two calls
+ * to resolve a marker, but for this case, those routines only need
+ * to reset it to FALSE and not to test it; that will be done by
+ * the control_structure_mismatch() routine when it looks at
+ * the cs_not_dup field. If the mismatch occurred because of
+ * a combination of control-structures that consume one each,
+ * the message will be printed even for the second "Control Stack"
+ * entry. The routine that changed it will have to set it back to
+ * TRUE when it's done with it.
+ *
+ * didnt_print_otl is used similarly, but only for the offset-too-large
+ * error in the DO ... LOOP type of control-structures.
+ *
+ **************************************************************************** */
+
+static bool not_consuming_two = TRUE;
+static bool didnt_print_otl = TRUE;
+
+
+/* **************************************************************************
+ *
+ * Function name: push_cstag
+ * Synopsis: Push a new CSTAG-Group onto the front ("Top")
+ * of the (notional) Control-Stack.
+ *
+ * Inputs:
+ * Parameters:
+ * cstag ID Tag for Control-Structure to "Push"
+ * datum The Data-Item for the new CSTAG-Group
+ * Global Variables:
+ * iname Name of input file currently being processed
+ * lineno Current-Source line-number being processed
+ * abs_tokenno "Absolute"Token Number of word being processed
+ * statbuf The word just read, which started the C-S
+ * Local Static Variables:
+ * control_stack Will become the new entry's "prev"
+ *
+ * Outputs:
+ * Returned Value: None
+ * Global Variables:
+ * control_stack_depth Incremented
+ * Local Static Variables:
+ * control_stack Will become the "previous" entry in the list
+ * Items Pushed onto Control-Stack:
+ * Top: A new CSTAG-Group, params as given
+ * Memory Allocated
+ * New CSTAG-Group structure
+ * Duplicate of name of current input file
+ * Duplicate of word just read
+ * When Freed?
+ * When Removing a CSTAG-Group, in pop_cstag()
+ *
+ **************************************************************************** */
+
+static void push_cstag( unsigned long cstag, unsigned long datum)
+{
+ cstag_group_t *cs_temp;
+
+ cs_temp = control_stack;
+ control_stack = safe_malloc( sizeof(cstag_group_t), "pushing CSTag");
+
+ control_stack->cs_tag = cstag;
+ control_stack->cs_inp_fil = strdup(iname);
+ control_stack->cs_line_num = lineno;
+ control_stack->cs_abs_token_num = abs_token_no;
+ control_stack->cs_word = strdup(statbuf);
+ control_stack->cs_not_dup = TRUE;
+ control_stack->cs_datum = datum;
+ control_stack->prev = cs_temp;
+
+ control_stack_depth++;
+
+}
+
+/* **************************************************************************
+ *
+ * Function name: pop_cstag
+ * Synopsis: Remove a CSTAG-Group from the front ("Top") of the
+ * (notional) Control-Stack.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * Local Static Variables:
+ * control_stack CSTAG-Group on "Top"
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * control_stack_depth Decremented
+ * Local Static Variables:
+ * control_stack "Previous" entry will become current
+ * Memory Freed
+ * mem-alloc'ed copy of input filename
+ * mem-alloc'ed copy of Control-structure FORTH word
+ * CSTAG-Group structure
+ * Control-Stack, # of Items Popped: 1
+ *
+ * Process Explanation:
+ * The calling routine might not check for empty Control-Stack,
+ * so we have to be sure and check it here.
+ *
+ **************************************************************************** */
+
+static void pop_cstag( void)
+{
+
+ if ( control_stack != NULL )
+ {
+ cstag_group_t *cs_temp;
+
+ cs_temp = control_stack->prev;
+ free( control_stack->cs_word );
+ free( control_stack->cs_inp_fil );
+ free( control_stack );
+ control_stack = cs_temp;
+
+ control_stack_depth--;
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: control_stack_size_test
+ * Synopsis: Detect Control Stack underflow; report if an ERROR.
+ *
+ * Inputs:
+ * Parameters:
+ * min_depth Minimum depth needed
+ * Global Variables:
+ * control_stack_depth Current depth of Control Stack
+ * statbuf Word to name in error message
+ *
+ * Outputs:
+ * Returned Value: TRUE if adequate depth
+ * Local Static Variables:
+ * not_cs_underflow Reset to FALSE if underflow detected.
+ * Printout:
+ * Error message is printed.
+ * Identify the colon definition if inside one.
+ *
+ * Process Explanation:
+ * Some statements need more than one item on the Control Stack;
+ * they will do their own control_stack_depth testing and
+ * make a separate call to this routine.
+ *
+ **************************************************************************** */
+
+static bool control_stack_size_test( int min_depth )
+{
+ bool retval = TRUE;
+
+ if ( control_stack_depth < min_depth )
+ {
+ retval = FALSE;
+ tokenization_error ( TKERROR,
+ "Control-Stack underflow at %s", strupr(statbuf) );
+ in_last_colon();
+
+ not_cs_underflow = FALSE; /* See expl'n early on in this file */
+ }
+
+ return( retval );
+}
+
+/* **************************************************************************
+ *
+ * Function name: control_structure_mismatch
+ * Synopsis: Report an ERROR after a Control Structure mismatch
+ * was detected.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * statbuf Word encountered, to name in error message
+ * Local Static Variables:
+ * control_stack "Pushed" Control-Structure Tag Group
+ * not_consuming_two See explanation early on in this file
+ * Control-Stack Items:
+ * Top: "Current" Control-Structure Tag Group
+ * Some of its "Marker" information
+ * will be used in the error message
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout:
+ * Error message is printed
+ *
+ * Process Explanation:
+ * This routine is called after a mismatch is detected, and
+ * before the CSTAG-Group is "Popped" from the notional
+ * Control-Stack.
+ * If the control_stack pointer is NULL, print a different
+ * Error message
+ * Don't print if the "Control Stack" entry is a duplicate and
+ * we're processing a statement that consumes two entries.
+ *
+ **************************************************************************** */
+
+static void control_structure_mismatch( void )
+{
+ if ( control_stack->cs_not_dup || not_consuming_two )
+ {
+ tokenization_error ( TKERROR,
+ "The %s is mismatched with the %s" ,
+ strupr(statbuf), strupr(control_stack->cs_word));
+ where_started( control_stack->cs_inp_fil, control_stack->cs_line_num );
+ }
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: offset_too_large
+ * Synopsis: Report an ERROR after a too-large fcode-offset
+ * was detected.
+ *
+ * Inputs:
+ * Parameters:
+ * too_large_for_16 TRUE if the offset is too large to be
+ * expressed as a 16-bit signed number.
+ * Global Variables:
+ * statbuf Word encountered, to name in error message
+ * offs16 Whether we are using 16-bit offsets
+ * Local Static Variables:
+ * control_stack "Pushed" Control-Structure Tag Group
+ * didnt_print_otl Switch to prevent duplicate message
+ * Control-Stack Items:
+ * Top: "Current" Control-Structure Tag Group
+ * Some of its "Marker" information
+ * will be used in the error message
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * didnt_print_otl Will be reset to FALSE
+ *
+ * Printout:
+ * Error message:
+ * Branch offset too large between <here> and <there>
+ * Advisory message, if we are using 8-bit offsets, will
+ * indicate whether switching to 16-bit offsets would help
+ *
+ * Process Explanation:
+ * Two branches are involved in a DO ... LOOP structure: an "outer"
+ * forward-branch and a slightly smaller "inner" backward-branch.
+ * In the majority of cases, if one offset exceeds the limit,
+ * both will. There is, however, a very small but distinct
+ * possibility that the offset for the smaller branch will not
+ * exceed the limit while the larger one does. To prevent two
+ * messages from being printed in the routine instance, but still
+ * assure that one will be printed in the rare eventuality, we
+ * utilize the flag called didnt_print_otl in conjunction
+ * with the cs_not_dup field.
+ *
+ **************************************************************************** */
+
+static void offset_too_large( bool too_large_for_16 )
+{
+ if ( control_stack->cs_not_dup || didnt_print_otl )
+ {
+ tokenization_error( TKERROR,
+ "Branch offset is too large between %s and the %s" ,
+ strupr(statbuf), strupr(control_stack->cs_word));
+ where_started( control_stack->cs_inp_fil, control_stack->cs_line_num );
+ if ( INVERSE( offs16 ) )
+ {
+ if ( too_large_for_16 )
+ {
+ tokenization_error ( INFO,
+ "Offset would be too large even if 16-bit offsets "
+ "were in effect.\n");
+ }else{
+ tokenization_error ( INFO,
+ "Offset might fit if 16-bit offsets "
+ "(e.g., fcode-version2) were used.\n" );
+ }
+ }
+ }
+ didnt_print_otl = FALSE;
+}
+
+/* **************************************************************************
+ *
+ * Function name: emit_fc_offset
+ * Synopsis: Test whether the given FCode-Offset is out-of-range;
+ * before placing it into the FCode Output Buffer.
+ *
+ * Inputs:
+ * Parameters:
+ * fc_offset The given FCode-Offset
+ * Global Variables:
+ * offs16 Whether we are using 16-bit offsets
+ * noerrors "Ignore Errors" flag
+ *
+ * Outputs:
+ * Returned Value: NONE
+ *
+ * Error Detection:
+ * Error if the given FCode-Offset exceeds the range that can
+ * be expressed by the size (i.e., 8- or 16- -bits) of the
+ * offsets we are using. Call offset_too_large() to print
+ * the Error message; also, if noerrors is in effect, issue
+ * a Warning showing the actual offset and how it will be coded.
+ *
+ * Process Explanation:
+ * For forward-branches, the OPC will have to be adjusted to
+ * indicate the location that was reserved for the offset
+ * to be written, rather than the current location. That
+ * will all be handled by the calling routine.
+ * We will rely on "C"'s type-conversion (type-casting) facilities.
+ * Look at the offset value both as an 8-bit and as a 16-bit offset,
+ * then determine the relevant course of action.
+ *
+ **************************************************************************** */
+
+static void emit_fc_offset( int fc_offset)
+{
+ int fc_offs_s16 = (s16)fc_offset;
+ int fc_offs_s8 = (s8)fc_offset;
+ bool too_large_for_8 = BOOLVAL( fc_offset != fc_offs_s8 );
+ bool too_large_for_16 = BOOLVAL( fc_offset != fc_offs_s16);
+
+ if ( too_large_for_16 || ( INVERSE(offs16) && too_large_for_8 ) )
+ {
+ offset_too_large( too_large_for_16 );
+ if ( noerrors )
+ {
+ int coded_as = offs16 ? (int)fc_offs_s16 : (int)fc_offs_s8 ;
+ tokenization_error( WARNING,
+ "Actual offset is 0x%x (=dec %d), "
+ "but it will be coded as 0x%x (=dec %d).\n",
+ fc_offset, fc_offset, coded_as, coded_as );
+ }
+ }
+
+ emit_offset( fc_offs_s16 );
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: matchup_control_structure
+ * Synopsis: Error-check. Compare the given control-structure
+ * identifier tag with the one in the CSTAG-Group
+ * on "Top" of the "Control Stack".
+ * If they don't match, report an error, and, if not
+ * "Ignoring Errors", return Error indication.
+ * If no error, pass the Data-item back to the caller.
+ * Do not consume the CSTAG-Group; that will be the
+ * responsibility of the calling routine.
+ *
+ * Inputs:
+ * Parameters:
+ * cstag Control-struc ID Tag expected by calling function
+ * Global Variables:
+ * noerrors "Ignore Errors" flag
+ * Local Static Variables:
+ * control_stack "Pushed" (current) Control-Structure Tag Group
+ * Control-Stack Items:
+ * Top: Current CSTAG-Group
+ *
+ * Outputs:
+ * Returned Value: TRUE = Successful match, no error.
+ *
+ * Error Detection:
+ * Control Stack underflow or cstag mismatch. See below for details.
+ *
+ * Process Explanation:
+ * If the expected cstag does not match the cs_tag from the CSTAG
+ * Group on "Top" of the "Control Stack", print an ERROR message,
+ * and, unless the "Ignore Errors" flag is in effect, prepare
+ * to return FALSE.
+ * However, if we've "underflowed" the "Control Stack", we dare not
+ * ignore errors; that could lead to things like attempting to
+ * write a forward-branch FCode-offset to offset ZERO, over the
+ * FCODE- or PCI- -header block. We don't want that...
+ * So, if the control_stack pointer is NULL, we will print an
+ * ERROR message and immediately return FALSE.
+ * Since we will not consume the CSTAG-Group, the calling routine
+ * can access the Data-Item and any "Marker" information it may
+ * still require via the local control_stack pointer. The caller
+ * will be responsible for removing the CSTAG-Group.
+ *
+ * Special Exception to "Ignore Errors":
+ * At the last usage of the CASE_CSTAG , for the ENDCASE statement,
+ * this routine will be called to control freeing-up memory, etc.
+ * For the OF statement, it will be called to control incrementing
+ * the OF-count datum.
+ * Processing an ENDCASE statement with the datum from any other
+ * CSTAG-Group can lead to a huge loop.
+ * Processing any other "resolver" with the datum from an ENDCASE
+ * CSTAG-Group can lead to mistaking a very low number for an
+ * offset into the Output Buffer and attempting to write to it.
+ * Incrementing the datum from any other CSTAG-Group can lead to
+ * a variety of unacceptable errors, too many to guess.
+ * So, if either the given cstag or the cs_tag field of the "Top"
+ * CSTAG-Group is a CASE_CSTAG , we will not ignore errors.
+ *
+ **************************************************************************** */
+
+static bool matchup_control_structure( unsigned long cstag )
+{
+ bool retval = FALSE;
+
+ if ( control_stack_size_test( 1) )
+ {
+ retval = TRUE;
+
+ if ( control_stack->cs_tag != cstag )
+ {
+ control_structure_mismatch();
+
+ if ( ( INVERSE(noerrors) )
+ || ( cstag == CASE_CSTAG )
+ || ( control_stack->cs_tag == CASE_CSTAG )
+ )
+ {
+ retval = FALSE;
+ }
+ }
+
+ }
+ return ( retval );
+}
+
+/* **************************************************************************
+ *
+ * Function name: control_structure_swap
+ * Synopsis: Swap control-structure branch-marker Groups
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Local Static Variables:
+ * control_stack Pointer to "Control Stack" linked-list
+ * Control-Stack Items:
+ * Top: CSTAG-Group_0
+ * Next: CSTAG-Group_1
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * control_stack Points to former "previous" and vice-versa
+ * Items on Control-Stack:
+ * Top: CSTAG-Group_1
+ * Next: CSTAG-Group_0
+ *
+ * Error Detection:
+ * If control-stack depth is not at least 2, CS underflow ERROR.
+ * This might trigger other routines' error detections also...
+ *
+ * Extraneous Remarks:
+ * Before control-structure identification was implemented, offsets
+ * were kept on the data-stack, and this was a single SWAP.
+ * When CSTAGs were added, the "Group" was only a pair kept on the
+ * data-stack -- the CSTAG and the Data-item -- and this
+ * became a TWO_SWAP()
+ * For a while, when I tried keeping the CSTAG-Group on the stack,
+ * this became a FOUR_SWAP()
+ * That turned out to be unacceptably brittle; this way is much
+ * more robust.
+ * I am so glad I called this functionality out into a separate
+ * routine, early on in the development process.
+ *
+ * This is the function called 1 CSROLL in section A.3.2.3.2
+ * of the ANSI Forth spec, which likewise corresponds to the
+ * modifier that Wil Baden, in his characteristically elegant
+ * nomenclature, dubbed: BUT
+ *
+ **************************************************************************** */
+
+static void control_structure_swap( void )
+{
+ if ( control_stack_size_test( 2) )
+ {
+ cstag_group_t *cs_temp;
+
+ cs_temp = control_stack->prev;
+
+ control_stack->prev = cs_temp->prev;
+ cs_temp->prev = control_stack;
+ control_stack = cs_temp;
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: matchup_two_control_structures
+ * Synopsis: For functions that resolve two CSTAG-Groups, both
+ * matchup both "Top of Control Stack" entries
+ * before processing them...
+ *
+ * Inputs:
+ * Parameters:
+ * top_cstag Control-struc ID Tag expected on "Top" CS entry
+ * next_cstag Control-struc ID Tag expected on "Next" CS entry
+ * Local Static Variables:
+ * not_cs_underflow Used for underflow detection.
+ * Control-Stack Items:
+ * Top: Current CSTAG-Group
+ * Next: Next CSTAG-Group
+ *
+ * Outputs:
+ * Returned Value: TRUE = Successful matches, no error.
+ * Global Variables:
+ * noerrors "Ignore Errors" flag; cleared, then restored
+ * Local Static Variables:
+ * not_consuming_two Cleared, then restored
+ * Control-Stack, # of Items Popped: 2 (if matches unsuccessful)
+ *
+ * Error Detection:
+ * Control Stack underflow detected by control_structure_swap()
+ * Control Structure mismatch detected by control_structure_mismatch()
+ *
+ * Process Explanation:
+ * We will use matchup_control_structure() to do the "heavy lifting".
+ * We will not be ignoring errors in these cases.
+ * Save the results of a match of top_cstag
+ * Swap the top two CS entries.
+ * If an underflow was detected, there's no more matching to be done.
+ * Otherwise:
+ * Save the results of a match of next_cstag
+ * Swap the top two CS entries again, to their original order.
+ * The result is TRUE if both matches were successful.
+ * If the matches were not successful, consume the top two entries
+ * (unless there's only one, in which case consume it).
+ *
+ **************************************************************************** */
+
+static bool matchup_two_control_structures( unsigned long top_cstag,
+ unsigned long next_cstag)
+{
+ bool retval;
+ bool topmatch;
+ bool nextmatch = FALSE;
+ bool sav_noerrors = noerrors;
+ noerrors = FALSE;
+ not_consuming_two = FALSE;
+
+ not_cs_underflow = TRUE;
+ topmatch = matchup_control_structure( top_cstag);
+ if ( not_cs_underflow )
+ {
+ control_structure_swap();
+ if ( not_cs_underflow )
+ {
+ nextmatch = matchup_control_structure( next_cstag);
+ control_structure_swap();
+ }
+ }
+
+ retval = BOOLVAL( topmatch && nextmatch);
+
+ if ( INVERSE( retval) )
+ {
+ pop_cstag();
+ pop_cstag();
+ }
+
+ not_consuming_two = TRUE;
+ noerrors = sav_noerrors;
+ return ( retval );
+}
+
+/* **************************************************************************
+ *
+ * Function name: mark_backward_target
+ * Synopsis: Mark the target of an expected backward-branch
+ *
+ * Associated FORTH words: BEGIN DO ?DO
+ *
+ * Inputs:
+ * Parameters:
+ * cstag Control-structure ID tag for calling function
+ * Global Variables:
+ * opc Output Buffer Position Counter
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Items Pushed onto Control-Stack:
+ * Top: <Stmt>_BACKw_<TAGNAM>
+ *
+ * Process Explanation:
+ * Just before this function is called, the token that begins the
+ * control-structure was written to the FCode Output buffer.
+ * OPC, the FCode Output Buffer Position Counter, is at the
+ * destination to which the backward-branch will be targeted.
+ * Create a CSTAG-Group with the given C-S Tag, and OPC as its datum;
+ * push it onto the Control-Stack.
+ * Later, when the backward-branch is installed, the FCode-offset
+ * will be calculated as the difference between the OPC at
+ * that time and the target-OPC we saved here.
+ *
+ **************************************************************************** */
+
+static void mark_backward_target(unsigned long cstag )
+{
+ push_cstag( cstag, (unsigned long)opc);
+}
+
+/* **************************************************************************
+ *
+ * Function name: mark_forward_branch
+ * Synopsis: Mark the location of, and reserve space for, the
+ * FCode-offset associated with a forward branch.
+ *
+ * Associated FORTH words: IF WHILE ELSE
+ *
+ * Inputs:
+ * Parameters:
+ * cstag Control-structure ID tag for calling function
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Items Pushed onto Control-Stack:
+ * Top: <Stmt>_FORw_<TAGNAM>
+ * FCode Output buffer:
+ * Place-holder FCode-offset of zero.
+ *
+ * Process Explanation:
+ * Just before this function is called, the forward-branch token
+ * that begins the control-structure was written to the FCode
+ * Output buffer.
+ * It will need an FCode-offset to the destination to which it will
+ * be targeted, once that destination is known.
+ * Create a CSTAG-Group with the given C-S Tag, and OPC as its datum;
+ * push it onto the Control-Stack. (This is the same action as
+ * for marking a backward-target.)
+ * Then write a place-holder FCode-offset of zero to the FCode
+ * Output buffer.
+ * Later, when the destination is known, the FCode-offset will be
+ * calculated as the difference between the OPC at that time
+ * and the FCode-offset location we're saving now. That offset
+ * will be over-written onto the place-holder offset of zero at
+ * the location in the Output buffer that we saved on the
+ * Control-Stack in this routine.
+ *
+ **************************************************************************** */
+
+static void mark_forward_branch(unsigned long cstag )
+{
+ mark_backward_target(cstag );
+ emit_offset(0);
+}
+
+/* **************************************************************************
+ *
+ * Function name: resolve_backward
+ * Synopsis: Resolve backward-target when a backward branch
+ * is reached. Write FCode-offset to reach saved
+ * target from current location.
+ *
+ * Associated FORTH words: AGAIN UNTIL REPEAT
+ * LOOP +LOOP
+ *
+ * Inputs:
+ * Parameters:
+ * cstag Control-structure ID tag for calling function
+ * Global Variables:
+ * opc Output Buffer Position Counter
+ * Control-Stack Items:
+ * Top: <Stmt>_BACKw_<TAGNAM>
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * opc Incremented by size of an FCode-offset
+ * Control-Stack, # of Items Popped: 1
+ * FCode Output buffer:
+ * FCode-offset to reach backward-target
+ *
+ * Error Detection:
+ * Test for Control-structure ID tag match.
+ *
+ * Process Explanation:
+ * Just before this function is called, the backward-branch token
+ * that ends the control-structure was written to the FCode
+ * Output buffer.
+ * The current OPC is at the point from which the FCode-offset
+ * is to be calculated, and at which it is to be written.
+ * The top of the Control-Stack should have the CSTAG-Group from
+ * the statement that prepared the backward-branch target that
+ * we expect to resolve. Its datum is the OPC of the target
+ * of the backward branch.
+ * If the supplied Control-structure ID tag does not match the one
+ * on top of the Control-Stack, announce an error. We will
+ * still write an FCode-offset, but it will be a place-holder
+ * of zero.
+ * Otherwise, the FCode-offset we will write will be the difference
+ * between the target-OPC and our current OPC.
+ *
+ **************************************************************************** */
+
+static void resolve_backward( unsigned long cstag)
+{
+ unsigned long targ_opc;
+ int fc_offset = 0;
+
+ if ( matchup_control_structure( cstag) )
+ {
+ targ_opc = control_stack->cs_datum;
+ fc_offset = targ_opc - opc;
+ }
+
+ emit_fc_offset( fc_offset );
+ pop_cstag();
+}
+
+/* **************************************************************************
+ *
+ * Function name: resolve_forward
+ * Synopsis: Resolve a forward-branch when its target has been
+ * reached. Write the FCode-offset into the space
+ * that was reserved.
+ *
+ * Associated FORTH words: ELSE THEN REPEAT
+ * LOOP +LOOP
+ *
+ * Inputs:
+ * Parameters:
+ * cstag Control-structure ID tag for calling function
+ * Global Variables:
+ * opc Output Buffer Position Counter
+ * Control-Stack Items:
+ * Top: <Stmt>_FORw_<TAGNAM>
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * opc Changed, then restored.
+ * Control-Stack, # of Items Popped: 1
+ * FCode Output buffer:
+ * FCode-offset is written to location where space was reserved
+ * when the forward-branch was marked.
+ *
+ * Error Detection:
+ * Test for Control-structure ID tag match.
+ *
+ * Process Explanation:
+ * Just before this function is called, the last token -- and
+ * possibly, FCode-offset -- that is within the scope of
+ * what the branch might skip was written to the FCode
+ * Output buffer.
+ * The current OPC is at the point from which the FCode-offset
+ * is to be calculated, but not at which it is to be written.
+ * The top of the Control-Stack should have the CSTAG-Group from
+ * the statement that prepared the forward-branch we expect
+ * to resolve, and for which our current OPC is the target.
+ * Its datum is the OPC of the space that was reserved for
+ * the forward-branch whose target we have just reached.
+ * If the supplied Control-structure ID tag does not match the one
+ * on top of the Control-Stack, announce an error and we're done.
+ * Otherwise, the datum is used both as part of the calculation of
+ * the FCode-offset we are about to write, and as the location
+ * to which we will write it.
+ * The FCode-offset is calculated as the difference between our
+ * current OPC and the reserved OPC location.
+ * We will not be ignoring errors in these cases, because we would
+ * be over-writing something that might not be a place-holder
+ * for a forward-branch at an earlier location in the FCode
+ * Output buffer.
+ *
+ **************************************************************************** */
+
+static void resolve_forward( unsigned long cstag)
+{
+ unsigned long resvd_opc;
+ bool sav_noerrors = noerrors;
+ bool cs_match_result;
+ noerrors = FALSE;
+ /* Restore the "ignore-errors" flag before we act on our match result
+ * because we want it to remain in effect for emit_fc_offset()
+ */
+ cs_match_result = matchup_control_structure( cstag);
+ noerrors = sav_noerrors;
+
+ if ( cs_match_result )
+ {
+ int saved_opc;
+ int fc_offset;
+
+ resvd_opc = control_stack->cs_datum;
+ fc_offset = opc - resvd_opc;
+
+ saved_opc = opc;
+ opc = resvd_opc;
+
+
+ emit_fc_offset( fc_offset );
+ opc = saved_opc;
+ }
+ pop_cstag();
+}
+
+
+/* **************************************************************************
+ *
+ * The functions that follow are the exported routines that
+ * utilize the preceding support-routines to effect their
+ * associated FORTH words.
+ *
+ * The routines they call will take care of most of the Error
+ * Detection via stack-depth checking and Control-structure
+ * ID tag matching, so those will not be called-out in the
+ * prologues.
+ *
+ **************************************************************************** */
+
+
+/* **************************************************************************
+ *
+ * Function name: emit_if
+ * Synopsis: All the actions when IF is encountered
+ *
+ * Associated FORTH word: IF
+ *
+ * Inputs:
+ * Parameters: NONE
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Items Pushed onto Control-Stack:
+ * Top: If_FORw_IF
+ * FCode Output buffer:
+ * Token for conditional branch -- b?branch -- followed by
+ * place-holder of zero for FCode-offset
+ *
+ *
+ **************************************************************************** */
+
+void emit_if( void )
+{
+ emit_token("b?branch");
+ mark_forward_branch( IF_CSTAG );
+}
+
+/* **************************************************************************
+ *
+ * Function name: emit_then
+ * Synopsis: All the actions when THEN is encountered; also
+ * part of another forward-branch resolver's action.
+ *
+ * Associated FORTH words: THEN ELSE
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Local Static Variables:
+ * control_stack Points to "Top" Control-Structure Tag Group
+ * Control-Stack Items:
+ * Top: If_FORw_IF | While_FORw_WHILE
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Control-Stack, # of Items Popped: 1
+ * FCode Output buffer:
+ * Token for forward-resolve -- b(>resolve) -- then the space
+ * reserved for the forward-branch FCode-offset is filled
+ * in so that it reaches the token after the b(>resolve) .
+ *
+ * Process Explanation:
+ * The THEN statement or the ELSE statement must be able to resolve
+ * a WHILE statement, in order to implement the extended flow-
+ * -control structures as described in sec. A.3.2.3.2 of the
+ * ANSI Forth Spec.
+ * But we must prevent the sequence IF ... BEGIN ... REPEAT from
+ * compiling as though it were: IF ... BEGIN ... AGAIN THEN
+ * We do this by having a separate CSTAG for WHILE and allowing
+ * it here but not allowing the IF_CSTAG when processing REPEAT.
+ *
+ **************************************************************************** */
+
+void emit_then( void )
+{
+ emit_token("b(>resolve)");
+ if ( control_stack != NULL )
+ {
+ if ( control_stack->cs_tag == WHILE_CSTAG )
+ {
+ control_stack->cs_tag = IF_CSTAG;
+ }
+ }
+ resolve_forward( IF_CSTAG );
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: emit_else
+ * Synopsis: All the actions when ELSE is encountered
+ *
+ * Associated FORTH word: ELSE
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * control_stack_depth Current depth of Control Stack
+ * Local Static Variables:
+ * not_cs_underflow If this is FALSE after the c-s swap, it
+ * means an underflow resulted; skip
+ * the call to resolve the first marker.
+ * Control-Stack Items:
+ * Top: {If_FORw_IF}1
+ * (Datum is OPC of earlier forward-branch; must be resolved.)
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Control-Stack, # of Items Popped: 1
+ * Items Pushed onto Control-Stack:
+ * Top: {If_FORw_IF}2
+ * (Datum is current OPC, after forward-branch is placed.)
+ * FCode Output buffer:
+ * Token for unconditional branch -- bbranch-- followed by
+ * place-holder of zero for FCode-offset. Then, token
+ * for forward-resolve -- b(>resolve) -- and the space
+ * reserved earlier for the conditional forward-branch
+ * FCode-offset is filled in to reach the token after
+ * the b(>resolve) .
+ *
+ * Error Detection:
+ * If the "Control-Stack" is empty, bypass the forward branch
+ * and let the call to control_structure_swap() report
+ * the underflow error. Then use not_cs_underflow to
+ * control whether to resolve the forward-branch.
+ *
+ * Process Explanation:
+ * The final item needed within the scope of what the earlier
+ * conditional branch might skip is an unconditional branch
+ * over the "else"-clause to follow. After that, the earlier
+ * conditional branch needs to be resolved. This last step
+ * is identical to the action of THEN .
+ *
+ **************************************************************************** */
+
+void emit_else( void )
+{
+ if ( control_stack_depth > 0 )
+ {
+ emit_token("bbranch");
+ mark_forward_branch( IF_CSTAG );
+ }
+ not_cs_underflow = TRUE;
+ control_structure_swap();
+ if ( not_cs_underflow )
+ {
+ emit_then();
+ }
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: emit_begin
+ * Synopsis: All the actions when BEGIN is encountered
+ *
+ * Associated FORTH word: BEGIN
+ *
+ * Inputs:
+ * Parameters: NONE
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Items Pushed onto Control-Stack:
+ * Top: Begin_BACKw_BEGIN
+ * (Datum is current OPC, target of future backward-branch)
+ * FCode Output buffer:
+ * Token for target of backward branch -- b(<mark)
+ *
+ **************************************************************************** */
+
+void emit_begin( void )
+{
+ emit_token("b(<mark)");
+ mark_backward_target( BEGIN_CSTAG );
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: emit_again
+ * Synopsis: All the actions when AGAIN is encountered
+ *
+ * Associated FORTH words: AGAIN REPEAT
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Control-Stack Items:
+ * Top: Begin_BACKw_BEGIN
+ * (Datum is OPC of backward-branch target at BEGIN)
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Control-Stack, # of Items Popped: 1
+ * FCode Output buffer:
+ * Token for unconditional branch -- bbranch -- followed by
+ * FCode-offset that reaches just after the b(<mark)
+ * token at the corresponding BEGIN statement.
+ *
+ * Process Explanation:
+ * The FCode-offset is calculated as the difference between our
+ * current OPC and the target-OPC saved on the Control-Stack.
+ *
+ **************************************************************************** */
+
+void emit_again( void )
+{
+ emit_token("bbranch");
+ resolve_backward( BEGIN_CSTAG );
+}
+
+/* **************************************************************************
+ *
+ * Function name: emit_until
+ * Synopsis: All the actions when UNTIL is encountered
+ *
+ * Associated FORTH word: UNTIL
+ *
+ * Process Explanation:
+ * Same as AGAIN except token is conditional branch -- b?branch --
+ * instead of unconditional.
+ *
+ **************************************************************************** */
+
+void emit_until( void )
+{
+ emit_token("b?branch");
+ resolve_backward( BEGIN_CSTAG );
+}
+
+/* **************************************************************************
+ *
+ * Function name: emit_while
+ * Synopsis: All the actions when WHILE is encountered
+ *
+ * Associated FORTH word: WHILE
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * control_stack_depth Number of items on "Control-Stack"
+ * Control-Stack Items:
+ * Top: Begin_BACKw_BEGIN
+ * (Datum is OPC of backward-branch target)
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Control-Stack: 1 item added below top item.
+ * Items on Control-Stack:
+ * Top: Begin_BACKw_BEGIN
+ * Next: While_FORw_WHILE
+ * FCode Output buffer:
+ * Token for conditional branch -- b?branch -- followed by
+ * place-holder of zero for FCode-offset
+ *
+ * Error Detection:
+ * If the "Control-Stack" is empty, bypass creating the branch
+ * and let the call to control_structure_swap() report
+ * the underflow error.
+ *
+ * Process Explanation:
+ * Output a conditional forward-branch sequence, similar to IF
+ * (except with a WHILE CSTAG), but be sure to leave the
+ * control-structure branch-marker that was created by the
+ * preceding BEGIN on top of the one just generated:
+ * the BEGIN needs to be resolved first in any case, and
+ * doing this here is the key to implementing the extended
+ * control-flow structures as described in sec. A.3.2.3.2
+ * of the ANSI Forth Spec.
+ *
+ * Extraneous Remarks:
+ * It was for the use of this function that Wil Baden coined the
+ * name BUT for the control-structure swap routine. The idea
+ * was that the implementation of WHILE could be boiled down
+ * to: IF BUT (couldn't quite fit an AND in there...;-} )
+ * Naturally, this implementation is a smidgeon more complicated...
+ *
+ **************************************************************************** */
+
+void emit_while( void )
+{
+ if ( control_stack_depth > 0 )
+ {
+ emit_token("b?branch");
+ mark_forward_branch( WHILE_CSTAG );
+ }
+ control_structure_swap();
+}
+
+/* **************************************************************************
+ *
+ * Function name: emit_repeat
+ * Synopsis: All the actions when REPEAT is encountered
+ *
+ * Associated FORTH word: REPEAT
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Local Static Variables:
+ * not_cs_underflow If FALSE after first call to resolve marker,
+ * an underflow resulted; skip second call.
+ * Control-Stack Items:
+ * Top: Begin_BACKw_BEGIN
+ * (Datum is OPC of backward-branch target at BEGIN)
+ * Next: If_FORw_IF
+ * (Datum is OPC of FCode-offset place-holder)
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * not_consuming_two Cleared, then restored
+ * Control-Stack, # of Items Popped: 2
+ * FCode Output buffer:
+ * Token for unconditional branch -- bbranch -- followed by
+ * FCode-offset that reaches just after the b(<mark)
+ * token at the corresponding BEGIN statement. Then
+ * the token for forward-resolve -- b(>resolve) -- and
+ * the space reserved for the conditional forward-branch
+ * FCode-offset is filled in so that it reaches the token
+ * after the b(>resolve) .
+ *
+ * Process Explanation:
+ * The action is identical to that taken for AGAIN followed
+ * by the action for THEN.
+ * The Local Static Variable not_consuming_two gets cleared
+ * and restored by this routine.
+ *
+ **************************************************************************** */
+
+void emit_repeat( void )
+{
+ if ( matchup_two_control_structures( BEGIN_CSTAG, WHILE_CSTAG ) )
+ {
+ not_cs_underflow = TRUE;
+ not_consuming_two = FALSE;
+ emit_again();
+ if ( not_cs_underflow )
+ {
+ emit_token("b(>resolve)");
+ resolve_forward( WHILE_CSTAG );
+ }
+ not_consuming_two = TRUE;
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: mark_do
+ * Synopsis: Common routine for marking the branches for
+ * the "do" variants
+ *
+ * Associated FORTH words: DO ?DO
+ *
+ * Inputs:
+ * Parameters: NONE
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * do_loop_depth Incremented
+ * Items Pushed onto Control-Stack:
+ * Top: Do_FORw_DO
+ * Next: Do_BACKw_DO
+ * FCode Output buffer:
+ * Place-holder of zero for FCode-offset
+ *
+ * Error Detection:
+ * The do_loop_depth counter will be used by other routines
+ * to detect misplaced "LEAVE", "UNLOOP", "I" and suchlike.
+ * (Imbalanced "LOOP" statements are detected by the CSTag
+ * matching mechanism.)
+ *
+ * Process Explanation:
+ * Just before this function is called, the forward-branching token
+ * for the "DO" variant that begins the control-structure was
+ * written to the FCode Output buffer.
+ * It needs an FCode-offset for a forward-branch to just after
+ * its corresponding "LOOP" variant and the FCode-offset
+ * associated therewith.
+ * That "LOOP" variant's associated FCode-offset is targeted
+ * to the token that follows the one for this "DO" variant
+ * and its FCode-offset.
+ * Mark the forward-branch with the C-S Tag for DO and write a
+ * place-holder FCode-offset of zero to FCode Output.
+ * Indicate that the mark that will be processed second (but which
+ * was made first) is a duplicate of the one that will be
+ * processed first.
+ * Then mark the backward-branch target, also with the DO C-S Tag.
+ * Finally, increment the do_loop_depth counter.
+ *
+ * Extraneous Remarks:
+ * This is more complicated to describe than to code... ;-)
+ *
+ **************************************************************************** */
+
+void mark_do( void )
+{
+ mark_forward_branch( DO_CSTAG);
+ control_stack->cs_not_dup = FALSE;
+ mark_backward_target( DO_CSTAG);
+ do_loop_depth++;
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: resolve_loop
+ * Synopsis: Common routine for resolving the branches for
+ * the "loop" variants.
+ *
+ * Associated FORTH words: LOOP +LOOP
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * statbuf Word read from input stream (either "loop"
+ * or "+loop"), used for Error Message.
+ * Local Static Variables:
+ * not_cs_underflow If FALSE after first call to resolve marker,
+ * an underflow resulted; skip second call.
+ * Control-Stack Items:
+ * Top: Do_FORw_DO
+ * Next: Do_BACKw_DO
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * do_loop_depth Decremented
+ * Local Static Variables:
+ * not_consuming_two Cleared, then restored
+ * didnt_print_otl Set, then set again at end.
+ * Control-Stack, # of Items Popped: 2
+ * FCode Output buffer:
+ * FCode-offset that reaches just after the token of the
+ * corresponding "DO" variant. Then the space reserved
+ * for the FCode-offset of the forward-branch associated
+ * with the "DO" variant is filled in so that it reaches
+ * the token just after the "DO" variant's FCode-offset.
+ *
+ * Error Detection:
+ * A value of zero in do_loop_depth before it's decremented
+ * indicates a DO ... LOOP imbalance, which is an ERROR,
+ * but our other error-reporting mechanisms will catch it,
+ * so we don't check or report it here.
+ *
+ * Process Explanation:
+ * Just before this function is called, the backward-branching
+ * token for the "LOOP" variant that ends the control-structure
+ * was written to the FCode Output buffer.
+ * It needs an FCode-offset for a backward-branch targeted just
+ * after its corresponding "DO" variant and the FCode-offset
+ * associated therewith.
+ * That "DO" variant's associated FCode-offset is targeted to
+ * the token that follows the one for this "LOOP" variant
+ * and its FCode-offset.
+ * Make sure there are two DO C-S Tag entries on the Control Stack.
+ * Resolve the backward-branch, matching your target to the first
+ * C-S Tag for DO
+ * Then resolve the forward-branch, targeting to your new OPC
+ * position, and also making sure you match the DO C-S Tag.
+ * We keep track of do_loop_depth for other error-detection
+ * by decrementing it; make sure it doesn't go below zero.
+ * Don't bother resolving the forward-branch if we underflowed
+ * the "Control Stack" trying to resolve the backward-branch.
+ * If the two top C-S Tag entries are not for a DO statement, the
+ * matchup_two_control_structures() routine will consume both
+ * or up to two of them, and we will place a dummy offset of
+ * zero to follow-up the backward-branching token that has
+ * already been written.
+ *
+ * Extraneous Remarks:
+ * This is only a little more complicated to describe
+ * than to code... ;-)
+ *
+ **************************************************************************** */
+
+void resolve_loop( void )
+{
+ if ( INVERSE( matchup_two_control_structures( DO_CSTAG, DO_CSTAG) ) )
+ {
+ emit_offset( 0 );
+ }else{
+ not_cs_underflow = TRUE;
+ didnt_print_otl = TRUE;
+ not_consuming_two = FALSE;
+ resolve_backward( DO_CSTAG);
+ if ( not_cs_underflow )
+ {
+ resolve_forward( DO_CSTAG);
+ }
+ if ( do_loop_depth > 0 ) do_loop_depth--;
+ not_consuming_two = TRUE;
+ didnt_print_otl = TRUE; /* Might have gotten cleared */
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: emit_case
+ * Synopsis: All the actions when CASE is encountered
+ *
+ * Associated FORTH word: CASE
+ *
+ * Inputs:
+ * Parameters: NONE
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Items Pushed onto Control-Stack:
+ * Top: N_OFs=0...CASE_CSTAG
+ * (Datum is 0 , Initial count of OF .. ENDOF pairs)
+ * FCode Output buffer:
+ * Token for start of a CASE structure -- b(case)
+ * Does not require an FCode-offset.
+ *
+ **************************************************************************** */
+
+void emit_case( void )
+{
+ push_cstag( CASE_CSTAG, 0);
+ emit_token("b(case)");
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: emit_of
+ * Synopsis: All the actions when OF is encountered
+ *
+ * Associated FORTH word: OF
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Control-Stack Items:
+ * Top: N_OFs...CASE_CSTAG
+ * (Datum is OF-count, number of OF .. ENDOF pairs)
+ * {Next and beyond}: {Endof_FORw_ENDOF}1..n_ofs
+ * { Repeat for OF-count number of times }
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Control-Stack, 1 Item Pushed, 1 modified:
+ * Top: Of_FORw_OF
+ * Next: N_OFs+1...CASE_CSTAG
+ * (Datum has been incremented)
+ * {3rd and beyond}: {Endof_FORw_ENDOF}1..n_ofs
+ * { Repeat for 1 through the un-incremented OF-count }
+ * (Same as Next etcetera at input-time.)
+ * FCode Output buffer:
+ * Token for OF statement -- b(of) -- followed by
+ * place-holder FCode-offset of zero
+ *
+ * Error Detection:
+ * Matchup CASE-cstag before incrementing OF-count
+ *
+ * Process Explanation:
+ * Main difference between this implementation and that outlined
+ * in "the book" (see below) is that we do not directly use
+ * the routine for the IF statement's flow-control; we will
+ * use a different CSTAG for better mismatch detection.
+ *
+ * Extraneous Remarks:
+ * This is a "by the book" (ANSI Forth spec, section A.3.2.3.2)
+ * implementation (mostly). Incrementing the OF-count here,
+ * after we've matched up the CSTAG, gives us (and the user)
+ * just a little bit more protection...
+ *
+ **************************************************************************** */
+
+void emit_of( void )
+{
+
+ if ( matchup_control_structure( CASE_CSTAG ) )
+ {
+ emit_token("b(of)");
+
+ /*
+ * See comment-block about "Control-Stack" Diagram Notation
+ * early on in this file.
+ *
+ */
+
+ /* ( {Endof_FORw_ENDOF}1..n_ofs N_OFs...CASE_CSTAG -- ) */
+
+ /* Increment the OF-count . */
+ (control_stack->cs_datum)++;
+
+ /* ( {Endof_FORw_ENDOF}1..n_ofs N_OFs+1...CASE_CSTAG -- ) */
+
+ mark_forward_branch( OF_CSTAG );
+ /* ( -- {Endof_FORw_ENDOF}1..n_ofs N_OFs+1...CASE_CSTAG Of_FORw_OF )
+ */
+ }
+ /* Leave the CSTAG-Group on the "Control-Stack" . */
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: emit_endof
+ * Synopsis: All the actions when ENDOF is encountered
+ *
+ * Associated FORTH word: ENDOF
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Control-Stack Items:
+ * Top: Of_FORw_OF
+ * Next: N_OFs+1...CASE_CSTAG
+ * (Datum has been incremented)
+ * {3rd and beyond}: {Endof_FORw_ENDOF}1..n_ofs
+ * { Repeat for 1 through the un-incremented OF-count )
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Control-Stack, 1 Item Popped, 1 new Item Pushed.
+ * Top: N_OFs...CASE_CSTAG
+ * (The count itself is unchanged from input-time, but
+ * the number of {Endof_FORw_ENDOF} CSTAG-Groups
+ * has caught up with this number, so it is
+ * no longer notated as " + 1 ").
+ * {Next and beyond}: {Endof_FORw_ENDOF}1..n_ofs
+ * { Repeat for 1 through the updated OF-count )
+ * FCode Output buffer:
+ * Token for ENDOF statement -- b(endof) -- followed by
+ * place-holder FCode-offset of zero. Then the space reserved
+ * for the FCode-offset of the forward-branch associated
+ * with the "OF" statement is filled in so that it reaches
+ * the token just after the "ENDOF" statement's FCode-offset.
+ *
+ * Error Detection:
+ * If control-stack depth is not at least 2, CS underflow ERROR
+ * and no further action.
+ * Routine that resolves the forward-branch checks for matchup error.
+ *
+ **************************************************************************** */
+
+void emit_endof( void )
+{
+ if ( control_stack_size_test( 2) )
+ {
+ emit_token("b(endof)");
+
+ /* See "Control-Stack" Diagram Notation comment-block */
+
+ /* Stack-diagrams might need to be split across lines. */
+
+ /* ( {Endof_FORw_ENDOF}1..n_ofs N_OFs+1...CASE_CSTAG ...
+ * ... Of_FORw_OF -- )
+ */
+ mark_forward_branch(ENDOF_CSTAG);
+ /* ( -- {Endof_FORw_ENDOF}1..n_ofs N_OFs+1...CASE_CSTAG ...
+ * ... Of_FORw_OF {Endof_FORw_ENDOF}n_ofs+1 )
+ */
+
+ control_structure_swap();
+ /* ( -- {Endof_FORw_ENDOF}1..n_ofs N_OFs+1...CASE_CSTAG ...
+ * ... {Endof_FORw_ENDOF}n_ofs+1 Of_FORw_OF )
+ */
+
+ resolve_forward( OF_CSTAG );
+ /* ( -- {Endof_FORw_ENDOF}1..n_ofs N_OFs+1...CASE_CSTAG ...
+ * ... {Endof_FORw_ENDOF}n_ofs+1 )
+ */
+
+ control_structure_swap();
+ /* ( -- {Endof_FORw_ENDOF}1..n_ofs ...
+ * ... {Endof_FORw_ENDOF}n_ofs+1 ...
+ * ... N_OFs+1...CASE_CSTAG )
+ */
+
+ /* The number of ENDOF-tagged Forward-Marker pairs has now
+ * caught up with the incremented OF-count; therefore,
+ * we can notate the above as:
+ *
+ * ( {Endof_FORw_ENDOF}1..n_ofs N_OFs CASE_CSTAG )
+ *
+ * and we are ready for another OF ... ENDOF pair,
+ * or for the ENDCASE statement.
+ */
+ }
+
+}
+
+/* **************************************************************************
+ *
+ * Function name: emit_endcase
+ * Synopsis: All the actions when ENDCASE is encountered
+ *
+ * Associated FORTH word: ENDCASE
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Control-Stack Items:
+ * Top: N_OFs...CASE_CSTAG
+ * (Datum is OF-count, number of OF .. ENDOF pairs)
+ * {Next and beyond}: {Endof_FORw_ENDOF}1..n_ofs
+ * { Repeat for OF-count number of times }
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Control-Stack, # of Items Popped: OF-count + 1
+ * FCode Output buffer:
+ * Token for ENDCASE statement -- b(endcase)
+ * Then the spaces reserved for the FCode-offsets of all the
+ * forward-branches associated with the OF-count number
+ * of ENDOF statements are filled in so that they reach
+ * the token just after this "ENDCASE" statement.
+ *
+ * Error Detection:
+ * Routine that resolves the forward-branch checks for matchup error
+ * for each forward-branch filled in, plus the matchup routine
+ * checks before the OF-count is retrieved.
+ *
+ * Process Explanation:
+ * Retrieve the OF-count and resolve that number of ENDOF statements
+ *
+ * Extraneous Remarks:
+ * The setup makes coding this routine appear fairly simple... ;-}
+ *
+ **************************************************************************** */
+
+void emit_endcase( void )
+{
+ unsigned long n_endofs ;
+ if ( matchup_control_structure( CASE_CSTAG) )
+ {
+ int indx;
+
+ emit_token("b(endcase)");
+ n_endofs = control_stack->cs_datum;
+ for ( indx = 0 ; indx < n_endofs ; indx++ )
+ {
+ /* Because matchup_control_structure doesn't pop the
+ * control-stack, we have the N_OFs...CASE_CSTAG
+ * item on top of the Endof_FORw_ENDOF item we
+ * want to resolve. We need to keep it there so
+ * the POP is valid for the other path as well
+ * as at the end of this one.
+ * So we SWAP to get at the Endof_FORw_ENDOF item.
+ */
+ control_structure_swap();
+ resolve_forward( ENDOF_CSTAG);
+ }
+ }
+ pop_cstag();
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: control_struct_incomplete
+ * Synopsis: Print a Message of given severity with origin info for
+ * a control-structure that has not been completed.
+ *
+ * Inputs:
+ * Parameters:
+ * c_s_entry Control-structure about which to display
+ * severity Severity of the messages to display.
+ * call_cond String identifying Calling Condition;
+ * used in the message.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ *
+ * Printout:
+ * Message of given severity...
+ *
+ * Process Explanation:
+ * The calling routine will be responsible for all filtering of
+ * duplicate structures and the like. This routine will
+ * simply display a message.
+ *
+ **************************************************************************** */
+
+static void control_struct_incomplete(
+ int severity,
+ char *call_cond,
+ cstag_group_t *c_s_entry)
+{
+ tokenization_error ( severity,
+ "%s before completion of %s" ,
+ call_cond, strupr(c_s_entry->cs_word));
+ where_started( c_s_entry->cs_inp_fil, c_s_entry->cs_line_num );
+}
+
+/* **************************************************************************
+ *
+ * Function name: announce_control_structs
+ * Synopsis: Print a series of Messages (of severity as specified)
+ * announcing that the calling event is occurring
+ * in the context of Control-Flow structure(s),
+ * back to the given limit. Leave the control
+ * structures in effect.
+ *
+ * Inputs:
+ * Parameters:
+ * severity Severity of the messages to display.
+ * call_cond String identifying Calling Condition;
+ * used in the message.
+ * abs_token_limit Limit, in terms of abs_token_no
+ * Local Static Variables:
+ * control_stack Pointer to "Top" of "Control-Stack"
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout:
+ * A Message for each unresolved Control-Flow structure.
+ *
+ **************************************************************************** */
+
+void announce_control_structs( int severity, char *call_cond,
+ unsigned int abs_token_limit)
+{
+ cstag_group_t *cs_temp = control_stack;
+ while ( cs_temp != NULL )
+ {
+ if ( cs_temp->cs_abs_token_num < abs_token_limit )
+ {
+ break;
+ }
+ if ( cs_temp->cs_not_dup )
+ {
+ control_struct_incomplete( severity, call_cond, cs_temp );
+ }
+ cs_temp = cs_temp->prev;
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: clear_control_structs_to_limit
+ * Synopsis: Clear items from the "Control-Stack" back to the given
+ * limit. Print error-messages with origin info for
+ * control-structures that have not been completed.
+ *
+ * Inputs:
+ * Parameters:
+ * call_cond String identifying Calling Condition;
+ * used in the Error message.
+ * abs_token_limit Limit, in terms of abs_token_no
+ * Global Variables:
+ * control_stack_depth Number of items on "Control-Stack"
+ * control_stack Pointer to "Top" of "Control-Stack"
+ * Control-Stack Items:
+ * The cs_inp_fil and cs_line_num tags of any item cleared
+ * from the "Control-Stack" are used in error-messages.
+ *
+ * Outputs:
+ * Returned Value:
+ * Global Variables:
+ * do_loop_depth Decremented when "DO" item cleared.
+ * control_stack_depth Decremented by called routine.
+ * Control-Stack, # of Items Popped: As many as go back to given limit
+ * Memory Freed
+ * By called routine.
+ *
+ * Error Detection:
+ * Any item on the "Control-Stack" represents a Control-Structure
+ * that was not completed when the Calling Condition was
+ * encountered. Error; identify the origin of the structure.
+ * No special actions if noerrors is set.
+ *
+ * Process Explanation:
+ * The given limit corresponds to the value of abs_token_no at
+ * the time the colon-definition (or whatever...) was created.
+ * Any kind of Control-Structure imbalance at the end of the
+ * colon-definition is an error and the entries must be cleared,
+ * but the colon-definition may have been created inside nested
+ * interpretation-time Control-Structures, and those must be
+ * preserved.
+ *
+ * Of course, if this routine is called with a given limit of zero,
+ * that would mean all the entries are to be cleared. That will
+ * be the way clear_control_structs() is implemented.
+ * We control the loop by the cs_abs_token_num field, but also
+ * make sure we haven't underflowed control_stack_depth
+ * We skip messages and other processing for items that are duplicates
+ * of others, based on the cs_not_dup field.
+ * If the cs_tag field is DO_CSTAG we decrement do_loop_depth
+ * The pop_cstag() routine takes care of the rest.
+ *
+ * Extraneous Remarks:
+ * This is a retrofit; necessary because we now permit definitions
+ * to occur inside interpretation-time Control-Structures. Calls
+ * to clear_control_structs() are already scattered around...
+ *
+ **************************************************************************** */
+
+void clear_control_structs_to_limit( char *call_cond,
+ unsigned int abs_token_limit)
+{
+ while ( control_stack_depth > 0 )
+ {
+ if ( control_stack->cs_abs_token_num < abs_token_limit )
+ {
+ break;
+ }
+ if ( control_stack->cs_not_dup )
+ {
+ control_struct_incomplete( TKERROR, call_cond, control_stack );
+ if ( control_stack->cs_tag == DO_CSTAG) do_loop_depth--;
+ }
+ pop_cstag();
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: clear_control_structs
+ * Synopsis: Make sure the "Control-Stack" is cleared, and print
+ * error-messages (giving origin information) for
+ * control-structures that have not been completed.
+ *
+ * Inputs:
+ * Parameters:
+ * call_cond String identifying Calling Condition;
+ * used in the Error message.
+ * Global Variables:
+ * control_stack_depth Number of items on "Control-Stack"
+ * control_stack Pointer to "Top" of "Control-Stack"
+ * Control-Stack Items:
+ * The cs_inp_fil and cs_line_num tags of any item found on
+ * the "Control-Stack" are used in error-messages.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * control_stack_depth Reset to zero.
+ * do_loop_depth Reset to zero.
+ * Control-Stack, # of Items Popped: All of them
+ *
+ * Error Detection:
+ * Any item on the "Control-Stack" represents a Control-Structure
+ * that was not completed when the Calling Condition was
+ * encountered. Error; identify the origin of the structure.
+ * No special actions if noerrors is set.
+ *
+ * Process Explanation:
+ * Filter the duplicate messages caused by structures (e.g., DO)
+ * that place two entries on the "Control-Stack" by testing
+ * the cs_not_dup field of the "Top" "Control-Stack" item,
+ * which would indicate double-entry...
+ *
+ * Extraneous Remarks:
+ * This is called before a definition of any kind, and after a
+ * colon-definition. Flow-control constructs should *never*
+ * be allowed to cross over between immediate-execution mode
+ * and compilation mode. Likewise, not between device-nodes.
+ * Also, at the end of tokenization, there should not be any
+ * unresolved flow-control constructs.
+ *
+ **************************************************************************** */
+
+void clear_control_structs( char *call_cond)
+{
+ clear_control_structs_to_limit( call_cond, 0);
+}
Added: fcode-utils/toke/flowcontrol.h
===================================================================
--- fcode-utils/toke/flowcontrol.h (rev 0)
+++ fcode-utils/toke/flowcontrol.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,74 @@
+#ifndef _TOKE_FLOWCONTROL_H
+#define _TOKE_FLOWCONTROL_H
+
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * External Variables and Function Prototypes for Support Functions
+ * used in tokenizing FORTH Flow-Control structures.
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+
+/* ************************************************************************** *
+ *
+ * Global Variables Exported
+ *
+ **************************************************************************** */
+
+extern int control_stack_depth;
+
+/* ************************************************************************** *
+ *
+ * Function Prototypes / Functions Exported:
+ *
+ **************************************************************************** */
+
+void emit_if( void );
+void emit_then( void );
+void emit_else( void );
+void emit_begin( void );
+void emit_again( void );
+void emit_until( void );
+void emit_while( void );
+void emit_repeat( void );
+void mark_do( void );
+void resolve_loop( void );
+void emit_case( void );
+void emit_of( void );
+void emit_endof( void );
+void emit_endcase( void );
+
+void announce_control_structs( int severity, char *call_cond,
+ unsigned int abs_token_limit);
+void clear_control_structs_to_limit( char *call_cond,
+ unsigned int abs_token_limit);
+void clear_control_structs( char *call_cond);
+
+#endif /* _TOKE_FLOWCONTROL_H */
Modified: fcode-utils/toke/macros.c
===================================================================
--- fcode-utils/toke/macros.c 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/toke/macros.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -24,6 +24,31 @@
*
*/
+/* **************************************************************************
+ * Modifications made in 2005 by IBM Corporation
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Modifications Author: David L. Paktor dlpaktor(a)us.ibm.com
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Support functions for the MACROS vocabulary, implemented
+ * as a TIC-Headerlist type of data structure, and linked in
+ * to the Global Vocabulary.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Functions Exported:
+ * init_macros Initialize the link-pointers in the
+ * initial "Built-In" portion of
+ * the macros vocabulary
+ * add_user_macro Add an entry to the macros vocabulary
+ * skip_user_macro Consume a Macro definition if Ignoring
+ *
+ **************************************************************************** */
+
#include <stdio.h>
#include <stdlib.h>
#if defined(__linux__) && ! defined(__USE_BSD)
@@ -32,107 +57,489 @@
#include <string.h>
#include <errno.h>
-#include "toke.h"
+#include "errhandler.h"
+#include "ticvocab.h"
+#include "stream.h"
+#include "scanner.h"
+#include "dictionary.h"
+#include "devnode.h"
+#include "macros.h"
-typedef struct macro {
- u8 *name;
- u8 *alias;
- struct macro *next;
-} macro_t;
+/* **************************************************************************
+ *
+ * Internal Static Variables
+ * macros_tbl Initial array of "Built-In" Macros
+ * number_of_builtin_macros Number of "Built-In" Macro entries.
+ *
+ **************************************************************************** */
-static macro_t *macros=NULL;
+/* **************************************************************************
+ *
+ * Revision History:
+ * Thu, 27 Oct 2005 by David L. Paktor
+ * Identify the macros that resolve to a single word.
+ * Remove them from here and enter them as synonymous entries
+ * in the Tokens, Specials or Shared-words vocabularies.
+ * Wed, 30 Nov 2005 by David L. Paktor
+ * Allow user-definition of macros.
+ * Fri, 06 Jan 2006 by David L. Paktor
+ * Re-define the Macros as a TIC-Headerlist, and make them
+ * part of the Global Vocabulary
+ *
+ **************************************************************************** */
-char *lookup_macro(char *name)
+
+
+/* **************************************************************************
+ *
+ * Function name: macro_recursion_error
+ * Synopsis: Function that will go temporarily into the FUNCT
+ * field of a Macro's TIC-entry, to protect against
+ * recursive macro invocations.
+ *
+ * Inputs:
+ * Parameters:
+ * pfield Param field of the TIC-entry; unused.
+ * Global Variables:
+ * statbuf The name being invoked erroneously.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout:
+ * Error Message.
+ *
+ * Error Detection:
+ * If this function is called, it is an ERROR
+ *
+ * Extraneous Remarks:
+ * This Tokenizer does not have the early-binding characterisitics
+ * of FORTH; its Macros are strings, evaluated when invoked
+ * rather than when they are defined. A reference to a name
+ * that matches the macro would cause recursion, possibly
+ * infinite. We will not allow that.
+ *
+ **************************************************************************** */
+
+static void macro_recursion_error( tic_param_t pfield)
{
- macro_t *curr;
-
- for (curr=macros; curr!=NULL; curr=curr->next)
- if (!strcasecmp(name,(char *)curr->name))
- break;
+ tokenization_error( TKERROR,
+ "Recursive invocation of macro named %s\n", statbuf);
+}
- return curr?(char *)curr->alias:NULL;
+
+/* **************************************************************************
+ *
+ * Function name: eval_mac_string
+ * Synopsis: Function that goes into FUNCT field of a TIC-entry
+ * in the Macros list. Protect against recursion.
+ *
+ * Inputs:
+ * Parameters:
+ * pfield Param field of the TIC-entry
+ * Global Variables:
+ * tic_found The TIC-entry that has just been found;
+ * it's the entry for this Macro.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * report_multiline Cleared to FALSE
+ * Global Behavior:
+ * The Macro will be evaluated as string input.
+ *
+ * Error Detection:
+ * An attempt at recursion will be detected because the FUNCT field
+ * of the Macro entry will have been temporarily be replaced by
+ * macro_recursion_error()
+ *
+ * Process Explanation:
+ * Save the address of the routine that is in the FUNCT field
+ * of the entry for this Macro. (Hey! It's this routine...)
+ * Replace the FUNCT field of the Macro entry with the Macro
+ * Recursion Error Detection routine
+ * Pass the address of the "resumption" routine and its argument
+ * (the entry for this Macro), to push_source()
+ * Recast the type of the parameter field to a string
+ * Make it the new Input Source Buffer.
+ * Suspend multi-line warning; see comment in body of add_user_macro()
+ * The multi-line warning flag is kept by push_source()
+ *
+ * Still to be done:
+ * If an error is encountered during Macro evaluation, display
+ * supplemental information giving the name of the Macro
+ * being run, and the file and line number in which it was
+ * defined.
+ * This will require changes to the way user Macros are added
+ * and retained, and to the way error messages are displayed.
+ *
+ * Revision History:
+ * Updated Thu, 23 Feb 2006 by David L. Paktor
+ * Do not process Macros (or, for that matter, User-defined
+ * Symbols or FLOADed files) with a routine that calls
+ * its own instance of tokenize(), because the Macro
+ * (etc.) might contain a phrase (such as the start of
+ * a conditional) that must be terminated within the
+ * body of a file, thus causing an undeserved Error.
+ * Instead, they need to be handled in a more sophis-
+ * ticated way, tied in with the operation of get_word()
+ * perhaps, that will make a smooth transition between
+ * the body of the Macro and the resumption of processing
+ * the source file. The end-of-file will only be seen
+ * at the end of an actual input file or when getting
+ * a delimited string.
+ * Updated Fri, 24 Feb 2006 by David L. Paktor
+ * Re-integrate Recursion Error Detection with the above.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * In order to integrate Recursion Error Detection with the smooth
+ * transition to resumption of processing the source file, we
+ * need to create a "resumption" routine that will restore the
+ * normal behavior of the macro after it's completed, by re-
+ * instating the address of the normal Macro-invocation routine;
+ * that routine, of course, is the one that passes the address
+ * of the "resumption" routine to push_source(). In order to
+ * get around this chicken-and-egg dilemma, we will create a
+ * local static variable into which the address of the normal
+ * Macro-invocation routine will be stored. We actually only
+ * need it once, but we'd rather avoid the overhead of checking,
+ * every time, whether it has already been set; since it's always
+ * the same, there's no harm in storing it every time.
+ *
+ **************************************************************************** */
+
+typedef void (*vfunct)(); /* Pointer to function returning void */
+static vfunct sav_mac_funct ;
+
+
+/* **************************************************************************
+ *
+ * This "resumption" routine will be called by pop_source()
+ * The parameter is the Macro dictionary-entry whose behavior
+ * is to be restored.
+ *
+ **************************************************************************** */
+
+static void mac_string_recovery( tic_hdr_t *macro_entry)
+{
+ (*macro_entry).funct = sav_mac_funct;
+ (*macro_entry).ign_func = sav_mac_funct;
}
-int add_macro(char *name, char *alias)
+/* **************************************************************************
+ *
+ * The normal Macro-invocation routine, at last...
+ *
+ **************************************************************************** */
+static void eval_mac_string( tic_param_t pfield)
{
- macro_t *curr;
+ int mac_str_len = strlen(pfield.chr_ptr);
+ /* We can't use (*tic_found).pfld_size for the string length
+ * because, if this is an alias for a macro, it will be zero...
+ */
+ /* We can change that by de-coupling the decision to free the
+ * param-field from whether pfld_size is non-zero (by intro-
+ * ducing yet another field into the tic_param_t struct),
+ * but we're not doing that today...
+ */
- curr=malloc(sizeof(macro_t));
- if(!curr) {
- printf("Out of memory while adding macro.\n");
- exit(-ENOMEM);
- }
+ sav_mac_funct = *tic_found->funct;
+ (*tic_found).funct = macro_recursion_error;
+ (*tic_found).ign_func = macro_recursion_error;
+ push_source( mac_string_recovery, tic_found, FALSE);
+ report_multiline = FALSE; /* Must be done AFTER call to push_source()
+ * because report_multiline is part of
+ * the state that push_source() saves.
+ */
+ init_inbuf( pfield.chr_ptr, mac_str_len);
+}
- curr->next=macros;
- curr->name=(u8 *)name;
- curr->alias=(u8 *)alias;
+/* **************************************************************************
+ *
+ * Builtin Macros do not need Recursion Error Detection.
+ * Intermediate routine to convert parameter type.
+ *
+ **************************************************************************** */
+static void eval_builtin_mac( tic_param_t pfield)
+{
+ eval_string( pfield.chr_ptr);
+}
+/* **************************************************************************
+ *
+ * Make a macro, because we might eliminate this layer later on.
+ *
+ **************************************************************************** */
+#define EVAL_MAC_FUNC eval_mac_string
+#define BUILTIN_MAC_FUNC eval_builtin_mac
- macros=curr;
- return 0;
+/* **************************************************************************
+ *
+ * Initialization macro definition
+ *
+ **************************************************************************** */
+
+#define BUILTIN_MACRO(nam, alias) BUILTIN_MAC_TIC(nam, BUILTIN_MAC_FUNC, alias )
+
+static tic_mac_hdr_t macros_tbl[] = {
+ BUILTIN_MACRO( "(.)", "dup abs <# u#s swap sign u#>") ,
+
+
+ BUILTIN_MACRO( "?", "@ .") ,
+ BUILTIN_MACRO( "1+", "1 +") ,
+ BUILTIN_MACRO( "1-", "1 -") ,
+ BUILTIN_MACRO( "2+", "2 +") ,
+ BUILTIN_MACRO( "2-", "2 -") ,
+
+ BUILTIN_MACRO( "accept", "span @ -rot expect span @ swap span !") ,
+ BUILTIN_MACRO( "allot", "0 max 0 ?do 0 c, loop") ,
+ BUILTIN_MACRO( "blank", "bl fill") ,
+ BUILTIN_MACRO( "carret", "h# d") ,
+ BUILTIN_MACRO( ".d", "base @ swap h# a base ! . base !") ,
+ BUILTIN_MACRO( "decode-bytes", ">r over r@ + swap r@ - rot r>") ,
+ BUILTIN_MACRO( "3drop", "drop 2drop") ,
+ BUILTIN_MACRO( "3dup", "2 pick 2 pick 2 pick") ,
+ BUILTIN_MACRO( "erase", "0 fill") ,
+ BUILTIN_MACRO( ".h", "base @ swap h# 10 base ! . base !") ,
+ BUILTIN_MACRO( "linefeed", "h# a") ,
+
+ BUILTIN_MACRO( "s.", "(.) type space") ,
+ BUILTIN_MACRO( "space", "bl emit") ,
+ BUILTIN_MACRO( "spaces", "0 max 0 ?do space loop") ,
+ BUILTIN_MACRO( "(u.)", "<# u#s u#>") ,
+ BUILTIN_MACRO( "?leave", "if leave then"),
+};
+
+static const int number_of_builtin_macros =
+ sizeof(macros_tbl)/sizeof(tic_mac_hdr_t);
+
+/* **************************************************************************
+ *
+ * Function name: init_macros
+ * Synopsis: Initialize the link-pointers in the "Built-In"
+ * portion of the macros vocabulary, dynamically.
+ *
+ * Inputs:
+ * Parameters:
+ * tic_vocab_ptr Pointer to Global Vocab Pointer
+ * Global Variables:
+ * macros_tbl Initial "Built-In" Macros array
+ * number_of_builtin_macros Number of "Built-In" Macro entries
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * The link-fields of the initial "Built-In" Macros array entries
+ * will be filled in.
+ * Supplied Pointers:
+ * *tic_vocab_ptr Updated to "tail" of Macros array
+ *
+ **************************************************************************** */
+
+void init_macros( tic_hdr_t **tic_vocab_ptr )
+{
+ init_tic_vocab( (tic_hdr_t *)macros_tbl,
+ number_of_builtin_macros,
+ tic_vocab_ptr );
}
-void init_macros(void)
+
+/* **************************************************************************
+ *
+ * Function name: print_if_mac_err
+ * Synopsis: Report a user-macro definition error, if so be.
+ *
+ * Inputs:
+ * Parameters:
+ * failure TRUE if error was detected
+ * func_cpy STRDUP() of function name, for error message
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Memory Freed
+ * Contents of func_cpy, error or not.
+ * Printout:
+ * Error message, if failure is TRUE.
+ *
+ **************************************************************************** */
+static void print_if_mac_err( bool failure, char *func_cpy)
{
- add_macro( "eval", "evaluate");
- add_macro( "(.)", "dup abs <# u#s swap sign u#>");
- add_macro( "<<", "lshift");
- add_macro( ">>", "rshift");
- add_macro( "?", "@ .");
- add_macro( "1+", "1 +");
- add_macro( "1-", "1 -");
- add_macro( "2+", "2 +");
- add_macro( "2-", "2 -");
- /* add_macro( "abort\"", "-2 throw"); */
- add_macro( "accept", "span @ -rot expect span @ swap span !");
- add_macro( "allot", "0 max 0 ?do 0 c, loop");
- add_macro( "blank", "bl fill");
- add_macro( "/c*", "chars");
- add_macro( "ca1+", "char+");
- add_macro( "carret", "h# d");
- add_macro( ".d", "base @ swap h# a base ! . base !");
- add_macro( "decode-bytes", ">r over r@ + swap r@ - rot r>");
- add_macro( "3drop", "drop 2drop");
- add_macro( "3dup", "2 pick 2 pick 2 pick");
- add_macro( "erase", "0 fill");
- add_macro( "false", "0");
- add_macro( ".h", "base @ swap h# 10 base ! . base !");
- add_macro( "linefeed", "h# a");
- add_macro( "/n*", "cells");
- add_macro( "na1+", "cell+");
- add_macro( "not", "invert");
- add_macro( "s.", "(.) type space");
- add_macro( "space", "bl emit");
- add_macro( "spaces", "0 max 0 ?do space loop");
- add_macro( "struct", "0");
- add_macro( "true", "-1");
- add_macro( "(u.)", "<# u#s u#>");
+ if ( failure )
+ {
+ tokenization_error( TKERROR,
+ "%s directive expects name and definition on the same line\n",
+ strupr(func_cpy));
+ }
+ free( func_cpy);
+}
- /* H.7 FCode name changes */
- add_macro( "decode-2int", "parse-2int");
- add_macro( "delete-attribute", "delete-property");
- add_macro( "get-inherited-attribute", "get-inherited-property");
- add_macro( "get-my-attribute", "get-my-property");
- add_macro( "get-package-attribute", "get-package-property");
- add_macro( "attribute", "property");
- add_macro( "flip", "wbflip");
- add_macro( "is", "to");
- add_macro( "lflips", "lwflips");
- add_macro( "map-sbus", "map-low");
- add_macro( "u*x", "um*");
- add_macro( "version", "fcode-revision");
- add_macro( "wflips", "wbflips");
- add_macro( "x+", "d+");
- add_macro( "x-", "d-");
- add_macro( "xdr+", "encode+");
- add_macro( "xdrbytes", "encode-bytes");
- add_macro( "xdrint", "encode-int");
- add_macro( "xdrphys", "encode-phys");
- add_macro( "xdrstring", "encode-string");
- add_macro( "xdrtoint", "decode-int");
- add_macro( "xdrtostring", "decode-string");
- add_macro( "xu/mod", "um/mod");
+
+/* **************************************************************************
+ *
+ * Function name: add_user_macro
+ * Synopsis: Parse input and add a user-defined Macro.
+ *
+ * Associated Tokenizer directive: [MACRO]
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * pc Input-source Scanning pointer
+ * statbuf Symbol retrieved from input stream.
+ * in_tokz_esc TRUE if in "Tokenizer-Escape" mode
+ * current_definitions Pointer to Current Vocabulary pointer,
+ * either Global or Current Device-Node
+ * tokz_esc_vocab "Tokenizer Escape" Vocab pointer
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * *current_definitions { One of these will point }
+ * tokz_esc_vocab { to the new entry }
+ * Memory Allocated:
+ * Copy of directive, for error message
+ * Copy of Macro name
+ * Copy of Macro body
+ * Memory for the new entry will be allocated by support routine.
+ * When Freed?
+ * Copy of directive: When error might be reported.
+ * Macro name, body and entry: Upon end of tokenization, or when
+ * RESET-SYMBOLS is issued in the same mode and Scope as when
+ * the Macro was defined.
+ *
+ * Error Detection:
+ * At least two words in the input stream are expected to be on
+ * the same line as the directive. The get_word_in_line()
+ * and get_rest_of_line() routines will check for that;
+ * we will issue the Error Message for either condition.
+ * Check if the Macro name is a duplicate; warn_if_duplicate()
+ * routine will issue message.
+ *
+ * Process Explanation:
+ * We start just after the directive has been recognized.
+ * Get one word in line -- this is the macro name
+ * Get input to end of line. This is the "body" of the macro.
+ * Add the Macro to the Current vocab, using support routine.
+ * Set the definer field to MACRO_DEF and the Function to the
+ * same one that's used for the built-in macros.
+ * User-defined Macros may need to be processed while ignoring
+ * (because they might include conditional-operators, etc.)
+ * We will set the ign_func the same as the active function.
+ *
+ * To be considered:
+ * Do we want to do further filtration?
+ * Remove comments?
+ * Compress whitespace?
+ * Allow backslash at end of line to continue to next line?
+ *
+ * Extraneous Remarks:
+ * The scope of User-Macro definitions will follow the same rules
+ * as all other definition types: if Device-Definitions are
+ * in effect, the scope of the new Macro definition will be
+ * confined to the current Device-Node; if Global-Definitions
+ * are in effect when it is defined, its scope will be Global;
+ * if it was declared when we were in "Tokenizer Escape" mode,
+ * then its scope will be limited to "Tokenizer Escape" mode.
+ *
+ **************************************************************************** */
+
+/* This pointer is exported to this file only */
+extern tic_hdr_t *tokz_esc_vocab ;
+
+void add_user_macro( void)
+{
+ char *macroname;
+ char *macrobody;
+ bool failure = TRUE;
+
+ /* Copy of function name, for error message */
+ char *func_cpy = strdup( statbuf);
+
+ if ( get_word_in_line( NULL ) )
+ {
+ /* This is the Macro name */
+ macroname = strdup( statbuf);
+
+ if ( INVERSE(get_rest_of_line() ) )
+ {
+ /* No body on line */
+ free( macroname);
- /* non standard but often used macros */
- add_macro( "name", "device-name");
- add_macro( "endif", "then");
+ }else{
+ /* We have valid Macro body on line */
+ int mac_body_len = 0;
+
+ tic_hdr_t **target_vocab = current_definitions;
+ if ( in_tokz_esc ) target_vocab = &tokz_esc_vocab ;
+
+ warn_if_duplicate( macroname);
+ trace_creation( MACRO_DEF, macroname);
+
+ /* Tack on a new-line, so that a remark will appear
+ * to be properly terminated. This might trigger
+ * an undeserved multi-line warning if the Macro
+ * is an improperly terminated quote; we will work
+ * around that problem by temporarily suspending
+ * multi-line warnings during macro processing.
+ */
+ strcat( statbuf, "\n");
+ macrobody = strdup( statbuf);
+ mac_body_len = strlen(macrobody);
+
+ add_tic_entry( macroname, EVAL_MAC_FUNC,
+ (TIC_P_DEFLT_TYPE)macrobody,
+ MACRO_DEF, mac_body_len,
+ EVAL_MAC_FUNC, target_vocab );
+ failure = FALSE;
+ }
+ }
+
+ print_if_mac_err( failure, func_cpy);
}
+
+/* **************************************************************************
+ *
+ * Function name: skip_user_macro
+ * Synopsis: Consume the text of a user-defined Macro from the
+ * Input Stream, with no processing. (Called when
+ * a user-Macro definer occurs in a segment that
+ * is being Ignored.)
+ *
+ * Inputs:
+ * Parameters:
+ * pfield "Parameter field" pointer, to satisfy
+ * the calling convention, but not used
+ * Global Variables:
+ * statbuf Word currently being processed.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ *
+ * Error Detection:
+ * At least two words in the input stream are expected to be on
+ * the same line as the user-Macro definer, same as when the
+ * directives occurs in a segment that is not being Ignored.
+ * The get_word_in_line() and get_rest_of_line() routines
+ * will check for condition., we will issue the Error Message.
+ *
+ * Process Explanation:
+ * We need to protect against the case of a macro-definition that
+ * invokes a directive that alters Conditional processing...
+ *
+ **************************************************************************** */
+void skip_user_macro( tic_bool_param_t pfield )
+{
+ bool failure = TRUE;
+ char *func_cpy = strdup( statbuf);
+ if ( get_word_in_line( NULL ) )
+ {
+ if ( get_rest_of_line() )
+ {
+ failure = FALSE;
+ }
+ }
+
+ print_if_mac_err( failure, func_cpy);
+
+}
Added: fcode-utils/toke/macros.h
===================================================================
--- fcode-utils/toke/macros.h (rev 0)
+++ fcode-utils/toke/macros.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,58 @@
+#ifndef _TOKE_MACROS_H
+#define _TOKE_MACROS_H
+
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Prototypes for functions that operate on the MACROS vocabulary,
+ * which is implemented as a String-Substitution-type vocab.
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+
+#include "types.h"
+#include "ticvocab.h"
+
+/* ************************************************************************** *
+ *
+ * Function Prototypes / Functions Exported:
+ *
+ **************************************************************************** */
+
+void init_macros( tic_hdr_t **tic_vocab_ptr );
+void add_user_macro( void);
+void skip_user_macro( tic_bool_param_t pfield );
+#if 0 /* What's this doing here? */
+char *lookup_macro(char *name);
+bool exists_as_macro(char *name);
+bool create_macro_alias( char *new_name, char *old_name );
+void reset_macros_vocab( void );
+#endif /* What's this doing here? */
+
+#endif /* _TOKE_MACROS_H */
Added: fcode-utils/toke/nextfcode.c
===================================================================
--- fcode-utils/toke/nextfcode.c (rev 0)
+++ fcode-utils/toke/nextfcode.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,708 @@
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Functions for Managing FCode Assignment Pointer and for
+ * Detection of Overlapping-FCode Error in Tokenizer
+ *
+ * (C) Copyright 2006 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * The fact that the user is able to specify, at any time, the
+ * next FCode number to be assigned introduces the risk that
+ * a symbol might inadvertently be assigned an FCode that is
+ * still in use by another symbol, which could lead to bizarre
+ * and hard-to-trace failures at run-time.
+ *
+ * This module will support a means whereby to detect and report,
+ * as an Error, overlapping FCode assignments.
+ *
+ * The task is further complicated by the fact that, under some
+ * circumstances, "recycling" a range of FCodes can be done
+ * safely, and the programmer may do so intentionally.
+ *
+ * We will define a way for the programmer to specify that FCode
+ * assignments are being intentionally "recycled", and that
+ * overlaps with previously-assigned FCodes are not to be
+ * treated as Errors. We will not attempt to analyze whether
+ * it is, indeed, safe to do so; the programmer who does this
+ * is presumed to be sufficiently responsible.
+ *
+ **************************************************************************** */
+
+
+/* **************************************************************************
+ *
+ * Functions Exported:
+ * reset_fcode_ranges (Re-)Initialize the range of assignable
+ * FCode numbers and clear the records
+ * of prevously-assigned ranges of FCodes
+ * list_fcode_ranges Display a final report of assigned FCode
+ * ranges at end of tokenization or when
+ * the reset_fcodes() routine is called.
+ * set_next_fcode Set the start of a new Range of FCode
+ * numbers to be assigned.
+ * assigning_fcode The next FCode number is about to be assigned;
+ * test for out-of-bounds, overlap, etc.
+ * errors.
+ * bump_fcode Increment the next FCode number prior to the
+ * next assignment.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Revision History:
+ * 06 Jun 06 -- Need became apparent after verification test
+ * against existing device-drivers.
+ *
+ *
+ **************************************************************************** */
+
+
+/* **************************************************************************
+ *
+ * Still to be done:
+ * Detect and report when the Current Range stops overlapping
+ * one particular Range and starts overlapping another.
+ *
+ * Detect and report when the Current Range overlaps more than
+ * one Range at a time (e.g., if other Ranges themselves
+ * overlap, and the Current Range is stepping through them)
+ * but, again, only display one message per overlapped Range.
+ *
+ **************************************************************************** */
+
+
+
+/* **************************************************************************
+ *
+ * Global Variables Imported
+ * iname Name of current input file
+ * lineno Line Number within current input file
+ *
+ **************************************************************************** */
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "toke.h"
+#include "nextfcode.h"
+#include "errhandler.h"
+#include "stream.h"
+#include "scanner.h"
+
+
+/* **************************************************************************
+ *
+ * Global Variables Exported
+ * nextfcode The next FCode-number to be assigned
+ *
+ **************************************************************************** */
+
+u16 nextfcode; /* The next FCode-number to be assigned */
+
+/* **************************************************************************
+ *
+ * Internal (Static) Structure:
+ * fcode_range_t The record of a Range of assigned FCodes
+ *
+ * Fields:
+ * fcr_start FCode number at the start of a this Range
+ * fcr_end Last FCode number in this Range that has
+ * actually been assigned. 0 if none made yet.
+ * fcr_infile File name of where this Range was started
+ * fcr_linenum Line number where this Range was started
+ * fcr_not_lapped TRUE if an overlap error has not been reported
+ * against this Range. Use this to prevent
+ * issuing an Error message every time an
+ * overlapping FCode is assigned; once per
+ * Range is sufficient.
+ * fcr_next Pointer to following entry in linked-list.
+ *
+ * We will keep the list of assigned FCode Ranges as a forward-linked,
+ * rather than the more usual backward-linked, list for convenience
+ * at listing-time. Otherwise, it doesn't make much difference.
+ *
+ **************************************************************************** */
+
+typedef struct fcode_range
+ {
+ u16 fcr_start;
+ u16 fcr_end ;
+ char *fcr_infile;
+ int fcr_linenum;
+ bool fcr_not_lapped;
+ struct fcode_range *fcr_next;
+ } fcode_range_t ;
+
+
+/* **************************************************************************
+ *
+ * Internal Static Variables
+ * ranges_exist TRUE if FCode Ranges have been created;
+ * Prevents unnecessary overlap checking.
+ * changes_listed TRUE if no changes to any of the Ranges
+ * have taken place since the last time
+ * a Listing was displayed. Prevents
+ * unnecessary repetions (e.g., if a
+ * reset_fcode_ranges() was called
+ * right after an operation that causes
+ * a Listing
+ *
+ * These four apply if no FCode Ranges have been created:
+ *
+ * range_start First FCode in the current first (only) range.
+ * range_end Last FCode in current first (only) range that
+ * has actually been assigned. 0 if none yet.
+ * first_fcr_infile File name of where first (only) range started.
+ * first_fcr_linenum Line number where first (only) range started.
+ *
+ * These two apply after FCode Ranges have been created:
+ *
+ * first_fc_range Pointer to the first entry in the linked
+ * list of FCode Ranges.
+ * current_fc_range Pointer to the entry in the linked list of
+ * Ranges that contains the Current Range.
+ *
+ **************************************************************************** */
+
+static bool ranges_exist = FALSE;
+static bool changes_listed = FALSE;
+
+static u16 range_start = FCODE_START;
+static u16 range_end = 0;
+static char *first_fcr_infile = NULL;
+static int first_fcr_linenum = 0;
+
+static fcode_range_t *first_fc_range = NULL;
+static fcode_range_t *current_fc_range = NULL;
+
+/* **************************************************************************
+ *
+ * Function name: reset_fcode_ranges
+ * Synopsis: (Re-)Initialize the range of assignable FCode numbers
+ * and clear the records of prevously-assigned Ranges
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * iname Name of current input file
+ * lineno Line Number within current input file
+ * Local Static Variables:
+ * ranges_exist TRUE if FCode Ranges have been created
+ * first_fc_range Pointer to First FCode Range
+ * current_fc_range Pointer to the current Range
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * nextfcode Initialized to Standard start value
+ * for user-assigned FCodes
+ * Local Static Variables:
+ * ranges_exist Cleared to FALSE
+ * changes_listed Reset to FALSE
+ * range_start Reset to Standard start value
+ * range_end Reset to 0
+ * first_fcr_infile Copy of iname
+ * first_fcr_linenum Copy of lineno
+ * first_fc_range Reset to NULL
+ * current_fc_range Reset to NULL
+ * Memory Allocated
+ * For first_fcr_infile , which will have a copy of iname
+ * When Freed?
+ * The next time this routine is called.
+ * Memory Freed
+ * Any FCode Ranges that were in effect will be freed, and the
+ * memory for their fcr_infile fields will be freed.
+ * If iname has changed, memory for first_fcr_infile will
+ * be freed before the new copy is made.
+ *
+ * Process Explanation:
+ * This will be called either as part of normal initialization
+ * or in response to a User-issued directive.
+ * In the former case, it may be called twice: once before any
+ * Source is examined, and once again in response to the first
+ * (and only to the first) invocation of an FCode-Starter, at
+ * which time the input file name and line number will be updated.
+ * In the latter case, the calling routine will be responsible for
+ * displaying any Advisory Messages and listings of previously
+ * assigned FCode Ranges.
+ *
+ **************************************************************************** */
+
+void reset_fcode_ranges( void)
+{
+ if ( ranges_exist )
+ {
+ while ( current_fc_range != NULL )
+ {
+ current_fc_range = first_fc_range->fcr_next;
+ free( first_fc_range->fcr_infile);
+ free( first_fc_range);
+ first_fc_range = current_fc_range;
+ }
+ ranges_exist = FALSE;
+ }else{
+ if ( first_fcr_infile != NULL )
+ {
+ if ( strcmp( first_fcr_infile, iname) != 0 )
+ {
+ free( first_fcr_infile);
+ first_fcr_infile = NULL;
+ }
+ }
+ }
+
+ changes_listed = FALSE;
+ range_start = FCODE_START;
+ range_end = 0;
+
+ if ( first_fcr_infile == NULL )
+ {
+ first_fcr_infile = strdup( iname);
+ }
+ first_fcr_linenum = lineno;
+ nextfcode = FCODE_START;
+}
+
+/* **************************************************************************
+ *
+ * Function name: list_fcode_ranges
+ * Synopsis: Display an Advisory of assigned FCode ranges at
+ * end of tokenization or upon reset_fcodes()
+ *
+ * Inputs:
+ * Parameters:
+ * final_tally TRUE if printing a final tally at
+ * end of tokenization.
+ * Global Variables:
+ * verbose Do not print anything if not set.
+ * nextfcode FCode next after last-assigned
+ * Local Static Variables:
+ * changes_listed If TRUE, only print new-line.
+ * ranges_exist TRUE if more than one Range exists.
+ * range_start FCode at start of only range
+ * range_end Last FCode in only range; 0 if none.
+ * first_fc_range Ptr to start of FCode Ranges list
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * changes_listed Set to TRUE.
+ * Printout:
+ * Printed to Standard Out on final tally, or to STDERR otherwise.
+ * One of three formats:
+ * 1 No FCodes assigned.
+ * 2 Last assigned FCode = 0xXXX
+ * 3 FCodes assigned:
+ * [ No FCodes assigned in the range that started ... ]
+ * [ From 0xXXX to 0xYYY ** in the range that started ... ]
+ * (** = Indicator if the Range has an Overlap Error.)
+ *
+ * Process Explanation:
+ * This is called to complete an Advisory or Standard-Out Message
+ * that doesn't end in a new-line.
+ *
+ * Extraneous Remarks:
+ * If we ever decide not to keep entries for Ranges in which no
+ * assignments were made, let's not remove the code that lists
+ * them. It's harmless to keep it around, and we remain ready...
+ *
+ **************************************************************************** */
+
+void list_fcode_ranges( bool final_tally)
+{
+ if ( verbose )
+ {
+ FILE *message_dest = ( final_tally ? stdout : ERRMSG_DESTINATION );
+ if ( changes_listed )
+ {
+ fprintf(message_dest, "\n");
+ }else{
+ changes_listed = TRUE;
+
+ if ( INVERSE(ranges_exist) )
+ { /* List the first and only range */
+ if ( range_end == 0 )
+ {
+ fprintf(message_dest, "No FCodes assigned.\n");
+ }else{
+ if ( range_start == FCODE_START )
+ {
+ fprintf(message_dest,
+ "Last assigned FCode = 0x%x\n", range_end);
+ }else{
+ fprintf(message_dest,
+ "FCodes assigned: 0x%x to 0x%x\n",
+ range_start, range_end);
+ }
+ }
+ /* We are done listing the first and only range */
+ }else{ /* List the collection of Ranges */
+
+ /* Pionter to function returning void */
+ typedef void (*vfunct)();
+
+ /* Function for the started_at() part of the message */
+ vfunct start_at_funct =
+ ( final_tally ? print_started_at : started_at );
+
+
+ fcode_range_t *next_range = first_fc_range;
+
+ fprintf(message_dest, "FCodes assigned:\n");
+
+ while ( next_range != NULL )
+ {
+ if ( next_range->fcr_end == 0 )
+ {
+ fprintf(message_dest, " None assigned");
+ }else{
+ fprintf(message_dest, " From 0x%x to 0x%x",
+ next_range->fcr_start, next_range->fcr_end );
+ if ( INVERSE( next_range->fcr_not_lapped) )
+ {
+ fprintf(message_dest, " ***Overlap***" );
+ }
+ }
+ fprintf(message_dest, " in the range");
+ (*start_at_funct)(
+ next_range->fcr_infile, next_range->fcr_linenum );
+
+ next_range = next_range->fcr_next;
+ }
+ }
+ }
+ }
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: set_next_fcode
+ * Synopsis: Set the start of a new Range of FCode numbers
+ *
+ * Inputs:
+ * Parameters:
+ * new_fcode Start of the new range of FCodes
+ * Global Variables:
+ * nextfcode The next FCode-number to be assigned
+ * iname Name of current input file
+ * lineno Line Number within current input file
+ * Local Static Variables:
+ * ranges_exist TRUE if FCode Ranges have been created
+ * range_start First FCode in the current (first
+ * and only) range
+ * range_end Last FCode in only range; 0 if none.
+ * current_fc_range Pointer to the current Range if there
+ * are more than one.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * nextfcode Set to the start of the new range
+ * Local Static Variables:
+ * ranges_exist May be set to TRUE
+ * first_fc_range May be initialized
+ * current_fc_range May be initialized or moved
+ * first_fcr_infile May be updated, may be made NULL
+ * first_fcr_linenum May be updated, may be made irrelevant
+ * range_start May be set to start of the new range
+ * or rendered irrelevant
+ * range_end Reset to 0 (by reset_fcode_ranges() )
+ * changes_listed Reset to FALSE
+ * Memory Allocated
+ * For new Range data structure; for copy of iname
+ * When Freed?
+ * By reset_fcode_ranges()
+ *
+ * Error Detection:
+ * Not here.
+ * The calling routine will detect and report attempts to set an
+ * illegal new range.
+ * Overlap with earlier Ranges will be detected and reported when
+ * the FCode is actually Assigned.
+ *
+ * Process Explanation:
+ * The calling routine will not call this routine with a new starting
+ * FCode that is not legal per the Standard.
+ * It may call with a new starting FCode that is equal to nextfcode
+ * If no Ranges exist yet, and the new starting FCode is equal to
+ * the current value of nextfcode , this is a continuation of
+ * the first and only range; do not change the file name or line
+ * number; just go away.
+ * If no Ranges exist yet, and no FCode assignments have been made
+ * in the current range, then this is a new start for the first
+ * and only range; detect the latter condition by range_end == 0
+ * Call the reset_fcode_ranges() routine to update the file name
+ * and line number, then update the remaining variables for the
+ * current (first and only) range, and you are done here.
+ * If no Ranges exist yet, and if FCode assignments _have_ been made
+ * in the current (first and only) range, create a data structure
+ * for the first (and now no longer only) Range and point both
+ * the first_fc_range and current_fc_range pointers at it.
+ * Set the ranges_exist flag to TRUE.
+ * If Ranges exist, whether from being newly-created, above, or from
+ * earlier, create a data structure for the new Current Range
+ * and move the current_fc_range pointer to point at it. If
+ * the new starting FCode is equal to nextfcode we still want
+ * to create a new Range that will be listed separately.
+ * If no assignments were made within the Current Range, we will not
+ * overwrite or delete it; it will be listed at the appropriate
+ * time, and will be harmless in the overlap test.
+ *
+ * Extraneous Remarks:
+ * We will trade off the strict rules of structured code here,
+ * in exchange for ease of coding.
+ *
+ **************************************************************************** */
+
+void set_next_fcode( u16 new_fcode)
+{
+ if ( INVERSE( ranges_exist) )
+ { /* The current range is the first and only. */
+
+ if ( new_fcode == nextfcode )
+ {
+ /* Do nothing here */
+ return;
+ }
+
+ if ( range_end == 0 )
+ { /* No FCode assignments have been made in the current range */
+ /* This is still the first and only range. */
+
+ reset_fcode_ranges(); /* Update file name and line number */
+ range_start = new_fcode;
+ nextfcode = new_fcode;
+
+ /* We are done here */
+ return;
+
+ }else{ /* Create the data structure for the first Range */
+ first_fc_range = safe_malloc( sizeof( fcode_range_t),
+ "creating first FCode Range" );
+ first_fc_range->fcr_start = range_start;
+ first_fc_range->fcr_end = range_end;
+ first_fc_range->fcr_infile = first_fcr_infile;
+ first_fc_range->fcr_linenum = first_fcr_linenum;
+ first_fc_range->fcr_not_lapped = TRUE;
+ first_fc_range->fcr_next = NULL;
+
+ first_fcr_infile = NULL;
+ first_fcr_linenum = 0;
+ range_start = FCODE_START;
+ range_end = 0;
+
+ current_fc_range = first_fc_range;
+
+ ranges_exist = TRUE;
+ }
+ }
+
+ /* Previous Ranges exist now for sure! */
+ current_fc_range->fcr_next = safe_malloc( sizeof( fcode_range_t),
+ "creating new FCode Range" );
+ current_fc_range = current_fc_range->fcr_next;
+
+ nextfcode = new_fcode;
+ current_fc_range->fcr_start = nextfcode;
+ current_fc_range->fcr_end = 0;
+ /* Will be filled in by first assignment */
+ current_fc_range->fcr_infile = strdup( iname);
+ current_fc_range->fcr_linenum = lineno;
+ current_fc_range->fcr_not_lapped = TRUE;
+ current_fc_range->fcr_next = NULL;
+
+ changes_listed = FALSE;
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: find_overlap
+ * Synopsis: Compare the FCode under test against existing
+ * FCode Ranges and return a pointer to the
+ * Range against which it overlaps, if any.
+ *
+ * Inputs:
+ * Parameters:
+ * test_fcode FCode to be tested
+ * Global Variables:
+ *
+ * Local Static Variables:
+ * ranges_exist If not TRUE, no need to test
+ * first_fc_range Start of Ranges to test
+ * current_fc_range Do not test Current Range
+ *
+ * Outputs:
+ * Returned Value: Pointer to FCode Range in which an
+ * overlap exists, or NULL if none.
+ *
+ * Error Detection:
+ * The calling routine will treat any findings as it deems appropriate.
+ *
+ * Process Explanation:
+ * A Range within which no assignments were made will never "hit"
+ * the overlap test because its fcr_end field will be zero
+ * and its fcr_start field will be non-zero; there's no
+ * number that will be "between" them!
+ *
+ **************************************************************************** */
+
+static fcode_range_t *find_overlap( u16 test_fcode)
+{
+ fcode_range_t *retval = NULL;
+ if ( ranges_exist )
+ {
+ fcode_range_t *test_range = first_fc_range;
+ while ( test_range != current_fc_range )
+ {
+ if ( ( test_fcode <= test_range->fcr_end ) &&
+ ( test_fcode >= test_range->fcr_start ) )
+ {
+ retval = test_range;
+ break;
+ }
+ test_range = test_range->fcr_next;
+ }
+ }
+
+ return( retval);
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: assigning_fcode
+ * Synopsis: Commit the next FCode number to be assigned;
+ * test for out-of-bounds, overlap, etc. errors.
+ *
+ * Inputs:
+ * Parameters:
+ *
+ * Global Variables:
+ * nextfcode
+ * Local Static Variables:
+ * ranges_exist TRUE if FCode Ranges have been created
+ * first_fc_range First entry in linked list of Ranges.
+ * current_fc_range List entry for Current Range.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * Local Static Variables:
+ * changes_listed Reset to FALSE
+ * One of these two will be set to nextfcode
+ * range_end ... if ranges_exist is FALSE
+ * current_fc_range->fcr_end ... if ranges_exist is TRUE
+ *
+ * Error Detection:
+ * FATAL if the value of nextfcode is larger than the legal
+ * maximum for an FCode
+ * ERROR if the value of nextfcode falls within one of the
+ * existing Ranges (other than the current one, of course)
+ *
+ **************************************************************************** */
+
+void assigning_fcode( void)
+{
+ if ( nextfcode > FCODE_LIMIT )
+ {
+ /* Let's give a last summarization before we crap out */
+ tokenization_error( INFO, "");
+ list_fcode_ranges( FALSE);
+
+ tokenization_error( FATAL,
+ "Too many definitions. "
+ "Assigned FCode exceeds limit "
+ "specified by IEEE-1275.");
+ /*
+ * No need to return() from here.
+ * FATAL error exits program.
+ */
+ }
+
+ changes_listed = FALSE;
+
+ if ( INVERSE(ranges_exist) )
+ { /* No Overlap Error checking needed here. */
+ range_end = nextfcode;
+ }else{
+ current_fc_range->fcr_end = nextfcode;
+
+ /* Detect and report Overlap Error only once per Range */
+ if ( current_fc_range->fcr_not_lapped )
+ {
+ fcode_range_t *found_lap = find_overlap( nextfcode);
+ if ( found_lap != NULL )
+ {
+ tokenization_error( TKERROR,
+ "Assigning FCode of 0x%x, "
+ "which overlaps the range", nextfcode);
+ started_at( found_lap->fcr_infile, found_lap->fcr_linenum);
+
+ current_fc_range->fcr_not_lapped = FALSE;
+ }
+ }
+ }
+
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: bump_fcode
+ * Synopsis: Increment the next assignable FCode number
+ * prior to the next assignment.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * nextfcode The next FCode-number to be assigned
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * nextfcode Incremented
+ *
+ * Extraneous Remarks:
+ * This looks like a no-brainer now, but if we ever need this
+ * function to perform any more sophisticated background
+ * activity, we can limit the scope of our modifications
+ * to this routine.
+ *
+ **************************************************************************** */
+
+void bump_fcode( void)
+{
+ nextfcode++;
+}
Added: fcode-utils/toke/nextfcode.h
===================================================================
--- fcode-utils/toke/nextfcode.h (rev 0)
+++ fcode-utils/toke/nextfcode.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,80 @@
+#ifndef _TOKE_NEXTFCODE_H
+#define _TOKE_NEXTFCODE_H
+
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Function Prototypes for Managing FCode Assignment Pointer
+ * and for Detection of Overlapping-FCode Error in Tokenizer
+ *
+ * (C) Copyright 2006 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+#include "types.h"
+
+
+/* ************************************************************************** *
+ *
+ * Global Variables Exported
+ *
+ **************************************************************************** */
+
+extern u16 nextfcode; /* The next FCode-number to be assigned */
+
+
+/* ************************************************************************** *
+ *
+ * Function Prototypes / Functions Exported:
+ *
+ **************************************************************************** */
+
+void reset_fcode_ranges( void);
+void list_fcode_ranges( bool final_tally);
+void set_next_fcode( u16 new_fcode);
+void assigning_fcode( void);
+void bump_fcode( void);
+
+/* **************************************************************************
+ *
+ * Macros:
+ *
+ * FCODE_START Standard-specified starting number for
+ * user-generated FCodes.
+ *
+ * FCODE_LIMIT Standard-specified maximum number for
+ * FCodes of any origin.
+ *
+ * I know these are not likely to change, but I still feel better
+ * making them named symbols, just on General Principles...
+ *
+ **************************************************************************** */
+
+#define FCODE_START 0x0800
+#define FCODE_LIMIT 0x0fff
+
+#endif /* _TOKE_NEXTFCODE_H */
Added: fcode-utils/toke/parselocals.c
===================================================================
--- fcode-utils/toke/parselocals.c (rev 0)
+++ fcode-utils/toke/parselocals.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,944 @@
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Parsing functions for IBM-style Local Values
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Functions Exported:
+ * declare_locals Pick up the Locals' names after the {
+ * handle_local Insert the code to access a Local
+ * exists_as_local Confirm whether a name is in the Locals vocab
+ * assign_local Process the "Assign to a Local" operator ( -> )
+ * finish_locals Insert the code for exiting a routine
+ * that uses locals
+ * forget_locals Remove the locals' names from the search
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * These are the names of the three routines that will be invoked
+ * when Locals are used. Their definitions exist in a separate
+ * Local Values Support FCode source-file that must be FLOADed
+ * into the user's tokenization source.
+ *
+ **************************************************************************** */
+
+/* Note that the enclosing curly-braces are part of the name */
+static const char* push_locals = "{push-locals}"; /* ( #ilocals #ulocals -- ) */
+static const char* pop_locals = "{pop-locals}"; /* ( #locals -- ) */
+static const char* local_addr = "_{local}"; /* ( local# -- addr ) */
+
+/* Switchable Fetch or Store operator to apply to local_addr. */
+static const char* local_op = "@"; /* Initially Fetch */
+
+
+/* **************************************************************************
+ *
+ * Revision History:
+ * Updated Wed, 13 Jul 2005 by David L. Paktor
+ * Command-line control for:
+ * Support for Locals in general
+ * Whether to accept the "legacy" separator (semicolon)
+ * Whether to issue a message for the "legacy" separator
+ * Updated Tue, 10 Jan 2006 by David L. Paktor
+ * Convert to tic_hdr_t type vocabulary.
+ *
+ **************************************************************************** */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "ticvocab.h"
+#include "dictionary.h"
+#include "scanner.h"
+#include "parselocals.h"
+#include "errhandler.h"
+#include "clflags.h"
+#include "stream.h"
+#include "devnode.h"
+#include "flowcontrol.h"
+
+/* **************************************************************************
+ *
+ * Global Variables Imported
+ * statbuf
+ * pc
+ * opc
+ * incolon
+ * lastcolon
+ * ibm_locals_legacy_separator Accept ; as the "legacy" separator
+ * ibm_legacy_separator_message Issue a message for "legacy" sep'r
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Internal Static Variables
+ * local_names Vocabulary for new local-names
+ * num_ilocals Number of initialized local variables
+ * num_ulocals Number of uninitialized local variables
+ * localno Running Local-Number to be assigned
+ * eval_buf Internally-generated string to be parsed
+ * l_d_lineno Locals Declaration Line Number
+ *
+ **************************************************************************** */
+
+static tic_hdr_t *local_names = NULL;
+static int num_ilocals = 0;
+static int num_ulocals = 0;
+static int localno = 0;
+static char eval_buf[64];
+static unsigned int l_d_lineno; /* For Error Messages */
+
+/* **************************************************************************
+ *
+ * The local_names vocabulary follows the same tic_hdr_t structure
+ * as the dictionaries of tokens, special-functions, etcetera. Its
+ * "parameter field" is an integer, used to store the Local's number,
+ * an its "function" is invoke_local(), defined further below.
+ *
+ * The vocabulary is initially empty, so there's no need for an "init"
+ * or a "reset" routine.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Function name: int_to_str
+ * Synopsis: Convert an integer into a compilable string.
+ * Suport routine for invoke_local().
+ *
+ * Inputs:
+ * Parameters:
+ * num The number to convert
+ * bufr The buffer into which to place it.
+ * Needn't be very long:
+ * five at least, ten is enough
+ *
+ * Outputs:
+ * Returned Value: Pointer to bufr
+ * bufr Contents are changed.
+ *
+ * Process Explanation:
+ * Convert into decimal. If the number is greater than 8,
+ * prepend a d# in front of it. If less, don't.
+ * We specifically want to avoid a d# in front of
+ * the numbers 0 1 2 and 3, which are also named constants;
+ * there's no need to treat 'em as literals.
+ * The calling routine will be responsible for allocating
+ * and freeing the buffer.
+ *
+ * Extraneous Remarks:
+ * Too bad atoi() isn't a Standard C function; I could convert
+ * using the current base, and be guaranteed that it would be
+ * interpreted in the same base.
+ * Instead, I have to fiddle-faddle around with d# ...
+ *
+ **************************************************************************** */
+
+static char *int_to_str( int num, char *bufr)
+{
+ char* prefix = "d# ";
+ if ( num < 8 ) prefix = "";
+ sprintf(bufr,"%s%d",prefix, num);
+ return (bufr);
+}
+
+
+
+/* **************************************************************************
+ *
+ * Function name: invoke_local
+ * Synopsis: Compile-in the code to access the Local whose
+ * assigned Number is given. This function is
+ * entered into the Local-Names Vocabulary entry.
+ *
+ * Inputs:
+ * Parameters:
+ * pfield The Vocabulary entry's Param field, taken
+ * from the Assigned Number of the Local.
+ * Local Static Variables:
+ * local_addr Name of _{local} routine, invoked
+ * when a Local is used
+ * local_op Fetch or Store operator to apply.
+ *
+ * Outputs:
+ * Returned Value: None
+ * Local Static Variables:
+ * eval_buf Phrase constructed here; will become new
+ * Source Input Buffer, temporarily
+ *
+ * Error Detection:
+ * If the Local Values Support FCode source-file was not
+ * FLOADed into the user's tokenization source, then
+ * the function _{local} will be an "unknown name".
+ *
+ * Process Explanation:
+ * We are going to generate a string of the form:
+ * " #local _{local} OP"
+ * and pass it to the Parser for evaluation.
+ * The call to _{local} is preceded by its parameter, which is
+ * its Assigned Local-Number, and followed by the appropriate
+ * OPerator, which will be "Fetch" if the Local's name was
+ * invoked by itself, or "Store" if its invocation was made
+ * in conjuction with the -> operator.
+ * The string-buffer may be local, but it must be stable.
+ *
+ * Revision History:
+ * Updated Thu, 24 Mar 2005 by David L. Paktor
+ * Factored-out to permit lookup_local() to be a "pure"
+ * function that can be used for duplicate-name detection.
+ * Updated Tue, 10 Jan 2006 by David L. Paktor
+ * Accommodate conversion to tic_hdr_t type vocabulary.
+ *
+ **************************************************************************** */
+
+static void invoke_local( tic_param_t pfield )
+{
+ char local_num_buf[10];
+ int loc_num = (int)pfield.deflt_elem;
+
+ int_to_str(loc_num, local_num_buf);
+ sprintf( eval_buf, "%s %s %s", local_num_buf, local_addr, local_op );
+ eval_string( eval_buf);
+
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: locals_separator
+ * Synopsis: Test whether the given character is the separator
+ * between initted and uninitted Local Names.
+ * Optionally, allow Semi-Colon as a separator and issue
+ * an optional Advisory.
+ *
+ * Inputs:
+ * Parameters:
+ * subj One-character "subject" of the test
+ * Global Variables:
+ * ibm_locals_legacy_separator Allow Semi-Colon as a separator?
+ * ibm_legacy_separator_message Issue an Advisory message?
+ *
+ * Outputs:
+ * Returned Value: TRUE if the character is the separator
+ *
+ * Error Detection:
+ * If the separator is Semi-Colon, and ibm_locals_legacy_separator
+ * is TRUE, then if ibm_legacy_separator_message is TRUE,
+ * issue an Advisory message.
+ * If the flag to allow Semi-Colon is FALSE, then simply do not
+ * acknowledge a valid separator. Other routines will report
+ * an erroneous attempt to use an already-defined symbol.
+ *
+ * Revision History:
+ * Updated Wed, 13 Jul 2005 by David L. Paktor
+ * Bring the questions of whether to accept semicolon as a separator
+ * -- and whether to issue a message for it -- under the control
+ * of external flags (eventually set by command-line switches),
+ * rather than being hard-compiled.
+ *
+ * Extraneous Remarks:
+ * In the interest of avoiding too deeply nested "IF"s, I will
+ * not be adhering strictly to the rules of structure.
+ *
+ **************************************************************************** */
+
+static bool locals_separator( char subj )
+{
+ bool retval = FALSE;
+ /* Is it the preferred (i.e., non-legacy) separator? */
+ if ( subj == '|' )
+ {
+ retval = TRUE;
+ return ( retval );
+ }
+
+ if ( ibm_locals_legacy_separator )
+ {
+ if ( subj == ';' )
+ {
+ retval = TRUE;
+ if ( ibm_legacy_separator_message )
+ {
+ tokenization_error ( WARNING , "Semicolon as separator in "
+ "Locals declaration is deprecated in favor of '|'\n");
+ }
+ }
+ }
+ return ( retval );
+}
+
+/* **************************************************************************
+ *
+ * Function name: add_local
+ * Synopsis: Given a pointer to a name and a number, enter
+ * them into the vocabulary for new Local names.
+ *
+ * Inputs:
+ * Parameters:
+ * lnum The assigned number
+ * lname Pointer to the name
+ * Local Static Variables:
+ * local_names The vocabulary for new Local names
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * local_names Enter the new Local's name and number.
+ * Memory Allocated:
+ * A place into which the name will be copied
+ * When Freed?
+ * When forget_locals() routine frees up all memory
+ * allocations in the "Local Names" Vocabulary.
+ *
+ * Process Explanation:
+ * Allocate a stable place in memory for the name, via strdup().
+ * The entry's "action" will be the invoke_local() function,
+ * defined above. The "parameter field" size is zero.
+ *
+ **************************************************************************** */
+
+static void add_local( TIC_P_DEFLT_TYPE lnum, char *lname)
+{
+ char *lnamecopy ;
+
+ lnamecopy = strdup( lname);
+ add_tic_entry( lnamecopy, invoke_local, lnum,
+ LOCAL_VAL, 0, NULL, &local_names );
+ trace_creation( LOCAL_VAL, lname);
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: gather_locals
+ * Synopsis: Collect Local names, for both initted and uninitted
+ * Return an indication as to whether to continue
+ * gathering Locals' names
+ *
+ * Inputs:
+ * Parameters:
+ * initted TRUE if we are gathering initted Local names.
+ * counter Pointer to variable that's counting names.
+ * Global Variables:
+ * statbuf The symbol just retrieved from the input stream.
+ * Local Static Variables:
+ * localno Running Local-Number to be assigned
+ * l_d_lineno Line # of Locals Declar'n start (for err mssg)
+ *
+ * Outputs:
+ * Returned Value: TRUE = Ended with initted/uninitted separator
+ * Local Static Variables:
+ * localno Incremented for each Local name declared
+ * local_names Enter the new locals' names into the Vocabulary.
+ * Numeric field is assigned local number.
+ *
+ * Error Detection:
+ * A Local-name that duplicates an existing name is an ERROR.
+ * Especially if that name is <Semicolon> and the flag
+ * called ibm_locals_legacy_separator was not set.
+ * Issue an Error if close-curly-brace terminator is not found,
+ * or if imbedded comment is not terminated, before end of file.
+ * If the Separator is found a second-or-more time, issue an Error
+ * and continue collecting uninitted Local names.
+ *
+ * Revision History:
+ * Updated Thu, 24 Mar 2005 by David L. Paktor
+ * Allow comments to be interspersed among the declarations.
+ * Error-check duplicate Local-name.
+ * Updated Wed, 30 Mar 2005 by David L. Paktor
+ * Warning when name length exceeds ANSI-specified max (31 chars).
+ * Updated Thu, 07 Jul 2005 by David L. Paktor
+ * Protect against PC pointer-overrun due to unterminated
+ * comment or declaration.
+ * Error-check for numbers.
+ * No name-length check; doesn't go into FCode anyway.
+ *
+ **************************************************************************** */
+
+static bool gather_locals( bool initted, int *counter )
+{
+ signed long wlen;
+ bool retval = FALSE;
+
+ while ( TRUE )
+ {
+ wlen = get_word();
+
+ if ( wlen <= 0 )
+ {
+ warn_unterm( TKERROR, "Local-Values Declaration", l_d_lineno);
+ break;
+ }
+
+ /* Allow comments to be interspersed among the declarations. */
+ if ( filter_comments( statbuf) )
+ {
+ /* Unterminated and Multi-line checking already handled */
+ continue;
+ }
+ /* Is this the terminator or the separator? */
+ if ( wlen == 1 ) /* Maybe */
+ {
+ /* Check for separator */
+ if (locals_separator( statbuf[0] ) )
+ {
+ /* If gathering initted Local names, separator is legit */
+ if ( initted )
+ {
+ retval = TRUE;
+ break;
+ }else{
+ tokenization_error ( TKERROR,
+ "Excess separator -- %s -- found "
+ "in Local-Values declaration", statbuf);
+ in_last_colon();
+ continue;
+ }
+ }
+ /* Haven't found the separator. Check for the terminator */
+ if ( statbuf[0] == '}' )
+ {
+ break;
+ }
+ }
+ /* It was not the terminator or the separator */
+ {
+ long tmp;
+ char *where_pt1; char *where_pt2;
+ /* Error-check for duplicated names */
+ if ( word_exists ( statbuf, &where_pt1, &where_pt2 ) )
+ {
+ tokenization_error ( TKERROR, "Cannot declare %s "
+ "as a Local-Name; it's already defined %s%s",
+ statbuf, where_pt1, where_pt2 );
+ show_node_start();
+ continue;
+ }
+ /* Error-check for numbers. */
+ if ( get_number(&tmp) )
+ {
+ tokenization_error ( TKERROR, "Cannot declare %s "
+ "as a Local-Name; it's a number.\n", statbuf );
+ continue;
+ }
+
+ /* We've got a valid new local-name */
+ /* Don't need to check name length; it won't go into the FCode */
+
+ /* Increment our counting-v'ble */
+ *counter += 1;
+
+ /* Define our new local-name in the Locals' vocabulary */
+ add_local( localno, statbuf );
+
+ /* Bump the running Local-Number */
+ localno++;
+
+ }
+ }
+ return ( retval );
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: activate_locals
+ * Synopsis: Compile-in the call to {push-locals} that
+ * the new definition under construction will need,
+ * now that the Locals have been declared.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * num_ilocals First argument to {push-locals}
+ * num_ulocals Second argument to {push-locals}
+ * push_locals Name of {push-locals} routine.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * eval_buf Phrase constructed here; will become
+ * new Source Input Buffer, temporarily
+ *
+ * Error Detection:
+ * If the Local Values Support FCode source-file was not
+ * FLOADed into the user's tokenization source, then
+ * the function {push-locals} will be an "unknown name".
+ *
+ * Process Explanation:
+ * We are going to generate a string of the form:
+ * " #ilocals #ulocals {push-locals}"
+ * and pass it to the Parser for evaluation.
+ * The string-buffer may be local, but it must be stable.
+ *
+ * Question under consideration.:
+ * Do we want to check if {push-locals} is an unknown name,
+ * and give the user a hint of what's needed? And, if so,
+ * do we do it only once, or every time?
+ *
+ **************************************************************************** */
+
+static void activate_locals( void )
+{
+ char ilocals_buf[10];
+ char ulocals_buf[10];
+
+ int_to_str(num_ilocals, ilocals_buf );
+ int_to_str(num_ulocals, ulocals_buf );
+ sprintf( eval_buf,"%s %s %s",ilocals_buf, ulocals_buf, push_locals);
+ eval_string( eval_buf);
+}
+
+/* **************************************************************************
+ *
+ * Function name: error_check_locals
+ * Synopsis: Indicate whether Locals declaration is erronious
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * incolon TRUE if colon def'n is in effect.
+ * opc FCode Output buffer Position Counter
+ * lastcolon Value of opc when Colon def'n was started
+ *
+ * Outputs:
+ * Returned Value: TRUE if found errors severe enough to
+ * preclude further processing of Decl'n
+ *
+ * Errors Detected:
+ * Colon definition not in effect. ERROR and return TRUE.
+ * Locals declaration inside body of colon-definition (i.e., after
+ * something has been compiled-in to it) is potentially risky,
+ * but may be valid, and is a part of legacy practice. It
+ * will not be treated as an outright ERROR, but it will
+ * generate a WARNING...
+ * Multiple locals declarations inside a single colon-definition
+ * are completely disallowed. ERROR and return TRUE.
+ * Locals declaration inside a control-structure is prohibited.
+ * Generate an ERROR, but return FALSE to allow processing
+ * of the declaration to continue.
+ *
+ **************************************************************************** */
+
+/* The value of lastcolon when Locals Declaration is made.
+ * If it's the same, that detects multiple locals declaration attempt.
+ */
+static int last_local_colon = 0;
+
+static bool error_check_locals ( void )
+{
+ bool retval = FALSE;
+
+ if ( ! incolon )
+ {
+ tokenization_error ( TKERROR,
+ "Can only declare Locals inside of a Colon-definition.\n");
+ retval = TRUE;
+ } else {
+ if ( last_local_colon == lastcolon )
+ {
+ tokenization_error ( TKERROR, "Excess Locals Declaration");
+ in_last_colon();
+ retval = TRUE;
+ }else{
+ last_local_colon = lastcolon;
+ if ( opc > lastcolon )
+ {
+ tokenization_error ( WARNING,
+ "Declaring Locals after the body of a Colon-definition "
+ "has begun is not recommended.\n");
+ }
+ announce_control_structs( TKERROR,
+ "Local-Values Declaration encountered",
+ last_colon_abs_token_no);
+ }
+ }
+ return ( retval );
+}
+
+/* **************************************************************************
+ *
+ * Function name: declare_locals
+ * Synopsis: Process (or Ignore) the Declaration of Locals,
+ * upon encountering Curly-brace ( { )
+ *
+ * Inputs:
+ * Parameters:
+ * ignoring TRUE if "Ignoring"
+ * Global Variables:
+ * statbuf Next symbol to process.
+ * lineno Current Line Number in Input File
+ * report_multiline FALSE to suspend multiline warning
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * statbuf Advanced to end of Locals Declaration.
+ * pc Bumped past the close-curly-brace
+ * Local Static Variables:
+ * localno Init'd, then updated by gather_locals()
+ * l_d_lineno Line Number of start of Locals Declaration
+ *
+ * Error Detection:
+ * See error_check_locals()
+ * After Error messages, will bypass further processing until the
+ * terminating close-curly-brace of a Locals Declaration.
+ * If the terminating close-curly-brace missing under those
+ * circumstances, issue an Error
+ * If terminating close-curly-brace is missing when the Locals
+ * Declaration is otherwise valid, gather_locals() will
+ * detect and report the Error.
+ * Warning if multiline declaration. Because embedded comments
+ * may also supppress the multiline warning, we need to save
+ * and restore the state of the report_multiline switch...
+ *
+ **************************************************************************** */
+
+void declare_locals ( bool ignoring)
+{
+ num_ilocals = 0;
+ num_ulocals = 0;
+ localno = 0;
+
+ l_d_lineno = lineno;
+ bool sav_rep_mul_lin = report_multiline;
+ report_multiline = TRUE;
+
+ if ( ignoring || error_check_locals() )
+ {
+ if ( skip_until ( '}' ) )
+ {
+ warn_unterm(TKERROR,
+ "misplaced Local-Values Declaration", l_d_lineno);
+ }else{
+ pc++ ; /* Get past the close-curly-brace */
+ }
+ }else{
+ if (gather_locals( TRUE, &num_ilocals ) )
+ {
+ gather_locals( FALSE, &num_ulocals );
+ }
+ }
+
+ /* If PC has reached the END, gather_locals() will
+ * have already issued an "unterminated" Error;
+ * a "multiline" warning would be redundant
+ * repetitive, unnecessary, excessive, unaesthetic
+ * and -- did I already mention? -- redundant.
+ */
+ if ( pc < end )
+ {
+ report_multiline = sav_rep_mul_lin;
+ warn_if_multiline( "Local-Values declaration", l_d_lineno);
+ }
+
+ /* Don't do anything if no Locals were declared */
+ /* This could happen if the { } field is empty */
+ if ( localno != 0 )
+ {
+ activate_locals();
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: handle_local
+ * Synopsis: Process the given name as a Local Name;
+ * indicate if it was a valid Local Name.
+ *
+ * Inputs:
+ * Parameters:
+ * lname The "Local" name for which to look
+ * Local Static Variables:
+ * local_names The vocabulary for Local names
+ *
+ * Outputs:
+ * Returned Value: TRUE if the name is a valid "Local Name"
+ *
+ **************************************************************************** */
+
+static bool handle_local( char *lname)
+{
+ bool retval = handle_tic_vocab( lname, local_names );
+ return ( retval ) ;
+}
+
+/* **************************************************************************
+ *
+ * Function name: lookup_local
+ * Synopsis: Return a pointer to the data-structure of the named
+ * word, only if it was a valid Local Name.
+ *
+ * Inputs:
+ * Parameters:
+ * lname The "Local" name for which to look
+ * Local Static Variables:
+ * local_names The vocabulary for Local names
+ *
+ * Outputs:
+ * Returned Value: Pointer to the data-structure, or
+ * NULL if not found.
+ *
+ **************************************************************************** */
+
+tic_hdr_t *lookup_local( char *lname)
+{
+ tic_hdr_t *retval = lookup_tic_entry( lname, local_names );
+ return ( retval ) ;
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: create_local_alias
+ * Synopsis: Create an alias in the "Local Names" Vocabulary
+ *
+ * Associated FORTH word: ALIAS
+ *
+ * Inputs:
+ * Parameters:
+ * old_name Name of existing entry
+ * new_name New name for which to create an entry
+ *
+ * Outputs:
+ * Returned Value: TRUE if old_name found in "Locals" vocab
+ * Global Variables:
+ * local_names Will point to the new entry
+ * Memory Allocated:
+ * Memory for the new entry, by the support routine
+ * When Freed?
+ * When forget_locals() routine frees up all memory
+ * allocations in the "Local Names" Vocabulary.
+ *
+ **************************************************************************** */
+
+bool create_local_alias(char *new_name, char *old_name)
+{
+ bool retval = create_tic_alias( new_name, old_name, &local_names );
+ return ( retval );
+}
+
+/* **************************************************************************
+ *
+ * Function name: exists_as_local
+ * Synopsis: Simply confirm whether a given name exists
+ * within the Locals vocabulary.
+ *
+ * Inputs:
+ * Parameters:
+ * stat_name Name to look up
+ *
+ * Outputs:
+ * Returned Value: TRUE if stat_name was a Local
+ *
+ **************************************************************************** */
+
+bool exists_as_local( char *stat_name )
+{
+ bool retval = exists_in_tic_vocab(stat_name, local_names );
+ return ( retval );
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: assign_local
+ * Synopsis: Process the "Assign to a Local" operator ( -> )
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * statbuf Next symbol to process
+ * pc Input-source Scanning pointer
+ * lineno Input-source Line Number. Used for Err Mssg.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * statbuf Advanced to next symbol
+ * pc Advanced; may be unchanged if error.
+ * lineno Advanced; may be unchanged if error
+ * local_op Will be set to Store and then reset to Fetch.
+ * Global Behavior:
+ * Construct a phrase and pass it to the Tokenizer.
+ *
+ * Error Detection:
+ * If next symbol is not a Local name, print ERROR message
+ * and restore pc so that the next symbol will be
+ * processed by ordinary means.
+ * In the extremely unlikely case that -> is last symbol in
+ * the source-file, report an ERROR.
+ *
+ * Process Explanation:
+ * Save the PC.
+ * Get the next symbol; check for end-of-file.
+ * Set Local Operator ( local_op ) to "Store", to prepare to apply it.
+ * Pass the next symbol to handle_local() .
+ * If handle_local() failed to find the name, you have
+ * detected an error; restore pc .
+ * Otherwise, you have invoked the local and applied "Store" to it.
+ * At the end, reset local_op to "Fetch".
+ *
+ **************************************************************************** */
+
+void assign_local ( void )
+{
+ signed long wlen;
+ bool is_okay;
+ u8 *savd_pc = pc;
+ unsigned int savd_lineno = lineno;
+
+ wlen = get_word();
+
+ if ( wlen <= 0 )
+ {
+ warn_unterm(TKERROR, "Locals Assignment", lineno);
+ return;
+ }
+
+ local_op = "!"; /* Set to Store */
+
+ is_okay = handle_local( statbuf);
+ if( INVERSE(is_okay) )
+ {
+ tokenization_error ( TKERROR,
+ "Cannot apply -> to %s, only to a declared Local.\n", statbuf );
+ pc = savd_pc;
+ lineno = savd_lineno;
+ }
+ local_op = "@"; /* Reset to Fetch */
+}
+
+/* **************************************************************************
+ *
+ * Function name: finish_locals
+ * Synopsis: Compile-in the call to {pop-locals} that the
+ * new definition under construction will need
+ * when it's about to complete execution, i.e.,
+ * before an EXIT or a SemiColon. But only if the
+ * current definition under construction is using Locals.
+ *
+ * Inputs:
+ * Parameters: NONE
+ *
+ * Local Static Variables:
+ * localno Total # of Locals.
+ * Both a param to {pop-locals}
+ * and an indicator that Locals are in use.
+ * pop_locals Name of {pop-locals} routine.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * eval_buf Phrase constructed here; will become new
+ * Source Input Buffer, temporarily
+ *
+ * Error Detection:
+ * If the Local Values Support FCode source-file was not
+ * FLOADed into the user's tokenization source, then
+ * the function {pop-locals} will be an "unknown name".
+ *
+ * Revision History:
+ * Updated Fri, 24 Feb 2006 by David L. Paktor
+ * The eval_string() routine no longer calls its own
+ * instance of tokenize() . In order to make a
+ * smooth transition between the processing the
+ * internally-generated string and the resumption
+ * of processing the source file, it simply sets
+ * up the string to be processed next.
+ * In this case, however, we need to have the string
+ * processed right away, as the calling routine
+ * emits a token that must follow those generated
+ * by this.
+ * Fortunately, we know the exact contents of the string.
+ * Two calls to tokenize_one_word() will satisfy the
+ * requirement.
+ *
+ **************************************************************************** */
+
+void finish_locals ( void )
+{
+ /* Don't do anything if Locals are not in use */
+ if ( localno > 0 )
+ {
+ char nlocals_buf[10];
+
+ int_to_str(localno, nlocals_buf );
+ sprintf( eval_buf,"%s %s",nlocals_buf, pop_locals);
+ eval_string( eval_buf);
+ tokenize_one_word( get_word() );
+ tokenize_one_word( get_word() );
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: forget_locals
+ * Synopsis: Remove the Locals' names from the special Vocabulary
+ * free-up their allocated memory, and reset the Locals'
+ * counters (which are also the indication that Locals
+ * are in use). This is done at the time a SemiColon
+ * is processed. But only if the current definition
+ * under construction is using Locals.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Local Static Variables:
+ * local_names The vocabulary for new Local names
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * local_names Emptied and pointing at NULL.
+ * num_ilocals Reset to zero
+ * num_ulocals ditto
+ * localno ditto
+ * Memory Freed
+ * All memory allocations in the "Local Names" Vocabulary.
+ *
+ **************************************************************************** */
+
+void forget_locals ( void )
+{
+ /* Don't do anything if Locals are not in use */
+ if ( localno != 0 )
+ {
+ reset_tic_vocab( &local_names, NULL ) ;
+
+ num_ilocals = 0;
+ num_ulocals = 0;
+ localno = 0;
+ }
+}
Added: fcode-utils/toke/parselocals.h
===================================================================
--- fcode-utils/toke/parselocals.h (rev 0)
+++ fcode-utils/toke/parselocals.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,48 @@
+#ifndef _TOKE_LOCALX_H
+#define _TOKE_LOCALX_H
+
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Function Prototypes / External definitions for Parsing
+ * functions for IBM-style Local Values in Tokenizer
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+#include "ticvocab.h"
+
+void declare_locals ( bool ignoring);
+tic_hdr_t *lookup_local( char *lname);
+bool exists_as_local( char *stat_name );
+bool create_local_alias(char *new_name, char *old_name);
+void assign_local ( void );
+void finish_locals ( void );
+void forget_locals ( void );
+
+#endif /* _TOKE_LOCALX_H */
Modified: fcode-utils/toke/scanner.c
===================================================================
--- fcode-utils/toke/scanner.c 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/toke/scanner.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -24,6 +24,12 @@
*
*/
+/* **************************************************************************
+ * Modifications made in 2005 by IBM Corporation
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Modifications Author: David L. Paktor dlpaktor(a)us.ibm.com
+ **************************************************************************** */
+
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -34,74 +40,596 @@
#include <time.h>
#include <ctype.h>
-#include "toke.h"
+#include "macros.h"
#include "stack.h"
#include "stream.h"
#include "emit.h"
+#include "toke.h"
#include "dictionary.h"
+#include "vocabfuncts.h"
+#include "scanner.h"
+#include "errhandler.h"
+#include "tokzesc.h"
+#include "conditl.h"
+#include "flowcontrol.h"
+#include "usersymbols.h"
+#include "clflags.h"
+#include "devnode.h"
+#include "tracesyms.h"
+#include "nextfcode.h"
-#define ERROR do { if (!noerrors) exit(-1); } while (0)
+#include "parselocals.h"
-extern u8 *start, *pc, *end, *opc, *ostart;
-extern int verbose, noerrors;
+/* **************************************************************************
+ *
+ * Some VERY IMPORTANT global variables follow
+ *
+ **************************************************************************** */
-u8 *statbuf=NULL;
-u16 nextfcode;
-u8 base=0x0a;
+u8 *statbuf=NULL; /* The word just read from the input stream */
+u8 base=0x0a; /* The numeric-interpretation base */
-/* header pointers */
-u8 *fcode_hdr=NULL;
-u8 *pci_hdr=NULL;
-
/* pci data */
bool pci_is_last_image=TRUE;
-bool pci_want_header=FALSE;
-u16 pci_revision=0x0001;
+u16 pci_image_rev=0x0001; /* Vendor's Image, NOT PCI Data Structure Rev */
u16 pci_vpd=0x0000;
-bool offs16=TRUE;
-static bool intok=FALSE, incolon=FALSE;
-bool haveend=FALSE;
-static u8 *skipws(u8 *str)
+/* Having to do with the state of the tokenization */
+bool offs16 = TRUE; /* We are using 16-bit branch- (etc) -offsets */
+bool in_tokz_esc = FALSE; /* TRUE if in "Tokenizer Escape" mode */
+bool incolon = FALSE; /* TRUE if inside a colon definition */
+bool haveend = FALSE; /* TRUE if the "end" code was read. */
+int do_loop_depth = 0; /* How deep we are inside DO ... LOOP variants */
+
+/* Used for error-checking of IBM-style Locals */
+int lastcolon; /* Location in output stream of latest colon-definition. */
+
+/* Used for error reporting */
+char *last_colon_defname = NULL; /* Name of last colon-definition */
+char *last_colon_filename = NULL; /* File where last colon-def'n made */
+unsigned int last_colon_lineno; /* Line number of last colon-def'n */
+bool report_multiline = TRUE; /* False to suspend multiline warning */
+unsigned int last_colon_abs_token_no;
+
+/* **************************************************************************
+ * Local variables
+ **************************************************************************** */
+static u16 last_colon_fcode; /* FCode-number assigned to last colon-def'n */
+ /* Used for RECURSE */
+
+static bool do_not_overload = TRUE ; /* False to suspend dup-name-test */
+static bool got_until_eof = FALSE ; /* TRUE to signal "unterminated" */
+
+static unsigned int last_colon_do_depth = 0;
+
+/* State of headered-ness for name-creation */
+typedef enum headeredness_t {
+ FLAG_HEADERLESS ,
+ FLAG_EXTERNAL ,
+ FLAG_HEADERS } headeredness ;
+static headeredness hdr_flag = FLAG_HEADERLESS ; /* Init'l default state */
+
+/* Local variables having to do with: */
+/* ... the state of the tokenization */
+static bool is_instance = FALSE; /* Is "instance" is in effect? */
+static char *instance_filename = NULL; /* File where "instance" invoked */
+static unsigned int instance_lineno; /* Line number of "instance" */
+static bool fcode_started = FALSE ; /* Only 1 fcode_starter per block. */
+static bool first_fc_starter = TRUE; /* Only once per tokenization... */
+
+/* ... with the state of the input stream, */
+static bool need_to_pop_source;
+
+/* ... with the use of the return stack, */
+static int ret_stk_depth = 0; /* Return-Stack-Usage-Depth counter */
+
+/* ... and with control of error-messaging. */
+ /* Should a warning about a dangling "instance"
+ * be issued at the next device-node change?
+ */
+static bool dev_change_instance_warning = TRUE;
+
+ /* Has a gap developed between "instance" and its application? */
+static bool instance_definer_gap = FALSE;
+
+ /* Shared phrases */
+static char *in_tkz_esc_mode = "in Tokenizer-Escape mode.\n";
+
+
+/* **************************************************************************
+ *
+ * Function name: skip_ws
+ * Synopsis: Advance the PC past all whitespace.
+ * Protect against pointer over-runs
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * pc Input-source Scanning pointer
+ * end End of input-source buffer
+ *
+ * Outputs:
+ * Returned Value: TRUE if PC reached END before non-blank char
+ * Global Variables:
+ * pc Advanced to first non-blank char, or to END
+ * lineno Incremented if encountered new-line along the way
+ *
+ * Error Detection:
+ * Return a TRUE if End of input-source buffer reached before
+ * non-blank character. Not necessarily an error; allow
+ * calling routine to decide...
+ *
+ **************************************************************************** */
+
+static bool skip_ws(void)
{
- while (str && (*str=='\t' || *str==' ' || *str=='\n' )) {
- if (*str=='\n')
- lineno++;
- str++;
+ bool retval = TRUE;
+ char ch_tmp;
+
+ for ( ; pc < end; pc++ )
+{
+ ch_tmp = *pc;
+ if ( (ch_tmp != '\t') && (ch_tmp != ' ') && (ch_tmp != '\n' ) )
+ {
+ retval = FALSE;
+ break;
}
+ if ( ch_tmp == '\n') lineno++;
+ }
+ return ( retval );
+}
+
+/* **************************************************************************
+ *
+ * Function name: skip_until
+ * Synopsis: Advance the PC to the given character.
+ * Do not copy anything into statbuf.
+ * Protect against pointer over-runs
+ *
+ * Inputs:
+ * Parameters:
+ * lim_ch Limiting Character
+ * Global Variables:
+ * pc Input-source Scanning pointer
+ * end End of input-source buffer
+ *
+ * Outputs:
+ * Returned Value: TRUE if PC reached END before finding LIM_CH
+ * Global Variables:
+ * pc Advanced to first occurrence of LIM_CH, or to END
+ * lineno Incremented if encountered new-line along the way
+ *
+ * Error Detection:
+ * Return a TRUE if End of input-source buffer reached before
+ * desired character. Not necessarily an error; allow calling
+ * routine to decide...
+ *
+ **************************************************************************** */
+
+bool skip_until( char lim_ch)
+{
+ bool retval = TRUE;
+ char ch_tmp;
+
+ for ( ; pc < end; pc++ )
+ {
+ ch_tmp = *pc;
+ if ( ch_tmp == lim_ch )
+ {
+ retval = FALSE;
+ break;
+ }
+ if ( ch_tmp == '\n') lineno++;
+ }
+ return ( retval );
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: get_until
+ * Synopsis: Return, in statbuf, the string from PC to the first
+ * occurrence of the given delimiter-character..
+ *
+ * Inputs:
+ * Parameters:
+ * needle The given delimiter-character
+ * Global Variables:
+ * pc Input-source Scanning Pointer
+ *
+ * Outputs:
+ * Returned Value: Length of the string obtained
+ * Global Variables:
+ * statbuf The string obtained from the input stream;
+ * does not include the delimiter-character.
+ * pc Bumped past the delimiter-character, unless
+ * it's a new-line, in which case leave it
+ * to be handled by get_word()
+ * Local Static Variables:
+ * got_until_eof Pass this as a signal that the end of the
+ * buffer was reached before the delimiter;
+ * Testing whether PC has reached END is
+ * not a sufficient indication.
+ *
+ * Error Detection:
+ * If string overflows statbuf allocation, ERROR, and
+ * return "no string" (i.e., length = 0).
+ * Otherwise, if delimiter not found before eof, keep string.
+ * Protection against PC pointer-over-run past END is
+ * provided by skip_until() . Reaching END will be
+ * handled by calling routine; pass indication along
+ * via Local Static Variable.
+ *
+ * Process Explanation:
+ * Skip the delimiter-character from further input, unless it's a
+ * new-line which will be skipped anyway. Let skip_until()
+ * and get_word() handle incrementing line-number counters.
+ * If skip_until() indicated reaching end-of-file, don't bump PC
+ *
+ * Revision History:
+ * Updated Thu, 14 Jul 2005 by David L. Paktor
+ * More robust testing for when PC exceeds END
+ * Involved replacing firstchar()
+ *
+ **************************************************************************** */
- return str;
+static signed long get_until(char needle)
+{
+ u8 *safe;
+ unsigned long len = 0;
+
+ safe=pc;
+
+ got_until_eof = skip_until(needle);
+
+ len = pc - safe;
+ if (len >= GET_BUF_MAX )
+ {
+ tokenization_error( TKERROR,
+ "get_until buffer overflow. Max is %d.\n", GET_BUF_MAX-1 );
+ len = GET_BUF_MAX-1;
}
-static u8 *firstchar(u8 needle, u8 *str)
+ memcpy(statbuf, safe, len);
+ statbuf[len]=0;
+
+ if ( INVERSE(got_until_eof) )
{
- while (str && *str!=needle) {
- if (*str=='\n')
- lineno++;
- str++;
+ if ( needle != '\n' ) pc++;
}
+ return len;
+}
- return str;
+
+/* **************************************************************************
+ *
+ * We are going to use a fairly sophisticated mechanism to
+ * make a smooth transition between processing the body
+ * of a Macro, a User-defined Symbol or an FLOADed file
+ * and the resumption of processing the source file, so
+ * that the end-of-file will only be seen at the end of
+ * the primary input file (the one from the command-line).
+ * This mechanism will be tied in with the get_word() routine
+ *
+ * We are going to define a private data-structure in which
+ * we will save the state of the current source file,
+ * and from which, of course, we will recover it. Its
+ * fields will be:
+ * A pointer to the next structure in the list.
+ * The saved values of START END and PC
+ * The saved values of INAME and LINENO
+ * A flag indicating that get-word should "pause"
+ * before popping the source-stream because
+ * the input file will be changing.
+ * A place from which to save and recover the state of
+ * whether we're testing for "Multi-line" strings;
+ * to prevent undeserved "Multi-line" warnings
+ * during Macro processing.
+ * A pointer to a "resumption" routine, to call
+ * when resuming processing the source file;
+ * the routine takes a pointer parameter
+ * and has no return value. The pointer
+ * may be NULL if no routine is needed.
+ * The pointer to pass as the parameter to the
+ * resumption routine.
+ *
+ **************************************************************************** */
+
+typedef struct source_state
+ {
+ struct source_state *next;
+ u8 *old_start;
+ u8 *old_pc;
+ u8 *old_end;
+ char *old_iname;
+ unsigned int old_lineno;
+ bool pause_before_pop;
+ bool sav_rep_multlin;
+ void (*resump_func)();
+ _PTR resump_param;
+ } source_state_t ;
+
+static source_state_t *saved_source = NULL;
+
+
+/* **************************************************************************
+ *
+ * Function name: push_source
+ * Synopsis: Save the state of the current source file, in the
+ * source_state data-structure LIFO linked-list.
+ *
+ * Inputs:
+ * Parameters:
+ * res_func Pointer to routine to call when resuming
+ * processing the saved source file.
+ * res_param Parameter to pass to res_func.
+ * Either or both pointers may be NULL.
+ * file_chg TRUE if input file is going to change.
+ * Global Variables:
+ * start Points to current input buffer
+ * end Points to end of current input buffer
+ * pc Input point in current buffer
+ * iname Name of current source file
+ * lineno Line number in current source file
+ * report_multiline Whether we're testing for "Multi-line"
+ * Local Static Variables:
+ * saved_source Pointer to the source_state data-structure
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * saved_source Points to new source_state entry
+ * Memory Allocated
+ * for the new source_state entry
+ * When Freed?
+ * When resuming processing the source file, by drop_source().
+ *
+ * Process Explanation:
+ * The calling routine will establish the new input buffer via
+ * a call to init_inbuf() or the like.
+ *
+ **************************************************************************** */
+
+void push_source( void (*res_func)(), _PTR res_parm, bool file_chg )
+{
+ source_state_t *new_sav_src;
+
+ new_sav_src = safe_malloc( sizeof(source_state_t), "pushing Source state");
+
+ new_sav_src->next = saved_source;
+ new_sav_src->old_start = start;
+ new_sav_src->old_pc = pc;
+ new_sav_src->old_end = end;
+ new_sav_src->old_iname = iname;
+ new_sav_src->old_lineno = lineno;
+ new_sav_src->pause_before_pop = file_chg;
+ new_sav_src->sav_rep_multlin = report_multiline;
+ new_sav_src->resump_func = res_func;
+ new_sav_src->resump_param = res_parm;
+
+ saved_source = new_sav_src;
}
-static unsigned long get_word(void)
+/* **************************************************************************
+ *
+ * Function name: drop_source
+ * Synopsis: Remove last saved state of source processing
+ * from the source_state LIFO linked-list,
+ * without (or after) restoring.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Local Static Variables:
+ * saved_source Pointer to the source_state data-structure
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * saved_source Points to previous source_state entry
+ * Memory Freed
+ * Saved source_state entry that was just "dropped"
+ *
+ * Error Detection:
+ * None. Called only when linked-list is known not to be at end.
+ *
+ **************************************************************************** */
+
+static void drop_source( void)
{
+ source_state_t *former_sav_src = saved_source;
+
+ saved_source = saved_source->next ;
+ free( former_sav_src);
+}
+
+/* **************************************************************************
+ *
+ * Function name: pop_source
+ * Synopsis: Restore the state of source processing as it was
+ * last saved in the source_state linked-list.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Local Static Variables:
+ * saved_source Pointer to the source_state data-structure
+ * need_to_pop_source If TRUE, don't check before popping.
+ *
+ * Outputs:
+ * Returned Value: TRUE if reached end of linked-list
+ * Global Variables:
+ * start Points to restored input buffer
+ * end Points to end of restored input buffer
+ * pc Input point in restored buffer
+ * iname Name of restored source file
+ * lineno Line number in restored source file
+ * report_multiline Restored to saved value.
+ * Local Static Variables:
+ * saved_source Points to previous source_state entry
+ * need_to_pop_source TRUE if postponed popping till next time
+ * Memory Freed
+ * Saved source-state entry that was just "popped"
+ *
+ * Process Explanation:
+ * First check the need_to_pop_source flag.
+ * If it is set, we will clear it and go ahead and pop.
+ * If it is not set, we will check the pause_before_pop field
+ * of the top entry in the source_state linked-list.
+ * If the pause_before_pop field is set, we will set the
+ * need_to_pop_source flag and return.
+ * If it is not, we will go ahead and pop.
+ * If we are going to go ahead and pop, we will call the
+ * "Resume-Processing" routine (if it's not NULL) before
+ * we restore the saved source state.
+ *
+ **************************************************************************** */
+
+static bool pop_source( void )
+{
+ bool retval = TRUE;
+
+ if ( saved_source != NULL )
+ {
+ retval = FALSE;
+ if ( need_to_pop_source )
+ {
+ need_to_pop_source = FALSE;
+ }else{
+ if ( saved_source->pause_before_pop )
+ {
+ need_to_pop_source = TRUE;
+ return( retval);
+ }
+ }
+
+ if ( saved_source->resump_func != NULL )
+ {
+ saved_source->resump_func( saved_source->resump_param);
+ }
+ report_multiline = saved_source->sav_rep_multlin;
+ lineno = saved_source->old_lineno ;
+ iname = saved_source->old_iname ;
+ end = saved_source->old_end ;
+ pc = saved_source->old_pc ;
+ start = saved_source->old_start ;
+
+ drop_source();
+ }
+ return( retval);
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: get_word
+ * Synopsis: Gather the next "word" (aka Forth Token) from the
+ * input stream.
+ * A Forth Token is, of course, a string of characters
+ * delimited by white-space (blank, tab or new-line).
+ * Do not increment line-number counters here; leave
+ * the delimiter after the word unconsumed.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * pc Input-stream Scanning Pointer
+ * Local Static Variables:
+ * need_to_pop_source If TRUE, pop_source() as first step
+ *
+ * Outputs:
+ * Returned Value: Length of "word" gotten;
+ * 0 if reached end of file.
+ * -1 if reached end of primary input
+ * (I.e., end of all source)
+ * Global Variables:
+ * statbuf Copy of "gotten" word
+ * pc Advanced to end of "gotten" word,
+ * (i.e., the next word is "consumed")
+ * unless returning zero.
+ * abs_token_no Incremented, if valid "word" (token)
+ * was gotten.
+ *
+ * Process Explanation:
+ * Skip whitespace to the start of the token,
+ * then skip printable characters to the end of the token.
+ * That part's easy, but what about when skipping whitespace
+ * brings you to the end of the input stream?
+ * First, look at the need_to_pop_source flag. If it's set,
+ * we came to the end of the input stream the last time
+ * through. Now we need to pop_source() first.
+ * Next, we start skipping whitespace; this detects when we've
+ * reached the end of the input stream. If we have,
+ * then we need to pop_source() again.
+ * If pop_source() returned a TRUE, we've reached the end
+ * of the primary input file. Return -1.
+ * If pop_source() turned the need_to_pop_source flag
+ * to TRUE again, then we need to "pause" until the
+ * next time through; return zero.
+ * Otherwise, we proceed with collecting the token as described.
+ *
+ * Revision History:
+ * Updated Thu, 23 Feb 2006 by David L. Paktor
+ * Tied this routine in with a more sophisticated mechanism that
+ * makes a smooth transition between processing the body of
+ * a Macro, a User-defined Symbol or an FLOADed file, and
+ * the resumption of processing the source file, so that the
+ * end-of-file will only be seen at the end of the primary
+ * input file (the one that came from the command-line)
+ * Updated Fri, 24 Feb 2006 by David L. Paktor
+ * This is trickier than I thought. Added a global indicator
+ * of whether a file-boundary was crossed while getting
+ * the word; previously, that was indicated by a return
+ * value of zero, which now means something else...
+ * The flag, closed_stream , will be cleared every time this
+ * routine is entered, and set whenever close_stream() is
+ * entered.
+ * Updated Tue, 28 Feb 2006 at 10:13 PST by David L. Paktor
+ * Trickier still. On crossing a file-boundary, must not
+ * consume the first word in the resumed file, for one
+ * call; instead, return zero. Consume it on the next
+ * call. The closed_stream flag is now irrelevant and
+ * has gone away.
+ *
+ **************************************************************************** */
+
+signed long get_word( void)
+{
size_t len;
u8 *str;
+ bool keep_skipping;
+ bool pop_result;
- pc=skipws(pc);
- if (pc>=end)
+ if ( need_to_pop_source )
+ {
+ pop_result = pop_source();
+ }
+
+ do {
+ keep_skipping = skip_ws();
+ if ( keep_skipping )
+ {
+ pop_result = pop_source();
+ if ( pop_result || need_to_pop_source )
+ {
+ statbuf[0] = 0;
+ if ( pop_result )
+ {
+ return -1;
+ }
return 0;
+ }
+ }
+ } while ( keep_skipping );
str=pc;
- while (str && *str && *str!='\n' && *str!='\t' && *str!=' ')
+ while ( (str < end) && *str && *str!='\n' && *str!='\t' && *str!=' ')
str++;
len=(size_t)(str-pc);
- if (len>1023) {
- printf("%s:%d: error: buffer overflow.\n", iname, lineno);
- ERROR;
+ if (len >= GET_BUF_MAX )
+ {
+ tokenization_error ( FATAL,
+ "get_word buffer overflow. Max is %d.", GET_BUF_MAX-1 );
}
memcpy(statbuf, pc, len);
@@ -112,39 +640,297 @@
iname, lineno, statbuf, len);
#endif
pc+=len;
+ abs_token_no++;
return len;
}
-static unsigned long get_until(char needle)
+
+/* **************************************************************************
+ *
+ * Function name: get_word_in_line
+ * Synopsis: Get the next word on the same line as the current
+ * line of input. If the end of line was reached
+ * before a word was found, print an error message
+ * and return an indication.
+ *
+ * Inputs:
+ * Parameters:
+ * func_nam Name of the function expecting the same-line
+ * input; for use in the Error Message.
+ * If NULL, do not issue Error Message
+ * Global Variables:
+ * pc Input character pointer. Saved for comparison
+ * lineno Current input line number. Saved for comparison
+ *
+ * Outputs:
+ * Returned Value: TRUE = success. Word was acquired on same line.
+ * Global Variables:
+ * statbuf Advanced to the next word in the input stream.
+ * pc Advanced if no error; restored otherwise.
+ *
+ * Error Detection:
+ * If no next word is gotten (i.e., we're at end-of-file), or if
+ * one is gotten but not on the same line, the routine will
+ * return FALSE; if func_nam is not NULL, an ERROR Message
+ * will be issued.
+ * Also, the values of PC LINENO and ABS_TOKEN_NO will be reset
+ * to the positions they had when this routine was entered.
+ *
+ **************************************************************************** */
+
+bool get_word_in_line( char *func_nam)
{
- u8 *safe;
- unsigned long len;
+ signed long wlen;
+ bool retval = TRUE;
+ u8 *save_pc = pc;
+ unsigned int save_lineno = lineno;
+ unsigned int save_abs_token_no = abs_token_no;
- safe=pc;
- pc=firstchar(needle,safe);
- if (pc>=end)
- return 0;
+ /* Copy of function name, for error message */
+ char func_cpy[FUNC_CPY_BUF_SIZE+1];
- len=(unsigned long)pc-(unsigned long)safe;
- if (len>1023) {
- printf("%s:%d: error: buffer overflow\n", iname, lineno);
- ERROR;
+ /* Do this first, in the likely event that func_nam was statbuf */
+ if ( func_nam != NULL )
+ {
+ strncpy( func_cpy, func_nam, FUNC_CPY_BUF_SIZE);
+ func_cpy[FUNC_CPY_BUF_SIZE] = 0; /* Guarantee a null terminator */
+ }
+
+ wlen = get_word();
+ if ( ( lineno != save_lineno ) || ( wlen <= 0 ) )
+ {
+ abs_token_no = save_abs_token_no;
+ lineno = save_lineno;
+ pc = save_pc;
+ retval = FALSE;
+ if ( func_nam != NULL )
+ {
+ tokenization_error ( TKERROR,
+ "Operator %s expects its target on the same line\n",
+ strupr(func_cpy));
}
+ }
+ return ( retval );
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: get_rest_of_line
+ * Synopsis: Get all the remaining text on the same line as
+ * the current line of input. If there is no text
+ * (not counting whitespace) before the end of line,
+ * return an indication.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * pc Input character pointer. Saved for restoration
+ * lineno Current input line number. Saved for comparison
+ *
+ * Outputs:
+ * Returned Value: TRUE = success. Text was acquired on same line.
+ * Global Variables:
+ * statbuf Contains the text found in the input stream.
+ * pc Advanced to end of line or of whitespace, if
+ * no error; restored otherwise.
+ * lineno Preserved if no error; otherwise, restored.
+ * abs_token_no Restored if error; otherwise, advanced as normal.
+ *
+ * Error Detection:
+ * Routine will return FALSE if no text is gotten on the same line.
+ *
+ **************************************************************************** */
+
+bool get_rest_of_line( void)
+{
+ bool retval = FALSE;
+ u8 *save_pc = pc;
+ unsigned int save_lineno = lineno;
+ unsigned int save_abs_token_no = abs_token_no;
+
+ if ( INVERSE( skip_ws() ) )
+ {
+ if ( lineno == save_lineno )
+ {
+ signed long wlen = get_until('\n');
+ if ( wlen > 0 ) retval = TRUE;
+ }else{
+ abs_token_no = save_abs_token_no;
+ lineno = save_lineno;
+ pc = save_pc;
+ }
+ }
+ return( retval);
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: warn_unterm
+ * Synopsis: Message for "Unterminated ..." something
+ * Show saved line-number, where the "something" started,
+ * and the definition, if any, in which it occurred.
+ *
+ * Inputs:
+ * Parameters:
+ * severity Type of error/warning message to display
+ * usually either WARNING or TKERROR
+ * something String to print after "Unterminated"
+ * saved_lineno Line-Number where the "something" started
+ * Global Variables:
+ * lineno Saved, then restored.
+ * last_colon_defname Used only if unterm_is_colon is TRUE;
+ * Local Static Variables:
+ * unterm_is_colon See 07 Mar 2006 entry under Rev'n History
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * lineno Saved, then restored.
+ * Local Static Variables:
+ * unterm_is_colon Reset to FALSE
+ * Printout:
+ * Warning or Error message
+ *
+ * Revision History:
+ * Updated Mon, 06 Mar 2006 by David L. Paktor
+ * Added call to in_last_colon()
+ * Updated Tue, 07 Mar 2006 by David L. Paktor
+ * Call to in_last_colon() works okay in most cases except for
+ * when the "something" is a Colon Definition; there, it
+ * results in the phrase: ... Definition in definition of ...
+ * which is awkward. To eliminate that, I am introducing
+ * a Local Static Variable flag called unterm_is_colon
+ * which will be set only in the appropriate place and
+ * re-cleared here. It's a retro-fit, of course; it could
+ * have been a parameter had the need for it occurred when
+ * this routine was first constructed...
+ *
+ **************************************************************************** */
+
+static bool unterm_is_colon = FALSE;
+void warn_unterm( int severity, char *something, unsigned int saved_lineno)
+{
+ unsigned int tmp = lineno;
+ lineno = saved_lineno;
+ if ( unterm_is_colon )
+ {
+ tokenization_error( severity, "Unterminated %s of %s\n",
+ something, strupr( last_colon_defname) );
+ unterm_is_colon = FALSE;
+ }else{
+ tokenization_error( severity, "Unterminated %s", something);
+ in_last_colon();
+ }
+ lineno = tmp;
+}
+
+/* **************************************************************************
+ *
+ * Function name: warn_if_multiline
+ * Synopsis: Test for "Multi-line ..." something and issue WARNING
+ * Show saved line-number, where the "something" started
+ *
+ * Inputs:
+ * Parameters:
+ * something String to print after "Unterminated"
+ * start_lineno Line-Number where the "something" started
+ * Global Variables:
+ * lineno Line-Number where we are now
+ * iname Input file name, to satisfy ...where_started()
+ * (Not crossing any actual file boundary.)
+ * report_multiline TRUE = go ahead with the message
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * report_multiline Restored to TRUE.
+ *
+ * Error Detection:
+ * Only issue message if the current lineno doesn't equal
+ * the start_lineno
+ *
+ * Process Explanation:
+ * The directive "multi-line" allows the user to specify that
+ * the next "Multi-line ..." something is intentional, and
+ * will cause its warning to be suppressed. It remains in
+ * effect until it's "used"; afterwards, it's reset.
+ *
+ **************************************************************************** */
+
+void warn_if_multiline( char *something, unsigned int start_lineno )
+{
+ if ( report_multiline && ( start_lineno != lineno ) )
+ {
+ tokenization_error( WARNING, "Multi-line %s, started", something);
+ where_started( iname, start_lineno);
+ }
+ report_multiline = TRUE;
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: string_remark
+ * Synopsis: Suspend string parsing past end of line and
+ * whitespace at start of the new line.
+ *
+ * Inputs:
+ * Parameters:
+ * errmsg_txt Text to be used for error-message.
+ * Global Variables:
+ * pc Input-source Scanning pointer
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * pc Will point to first non-blank in new line
+ *
+ * Error Detection:
+ * The return value of the skip_until() or skip_ws() routine
+ * will indicate if PC goes past END. Issue a WARNING.
+ * The calling routine will handle things from there.
+ *
+ **************************************************************************** */
+
+static void string_remark(char *errmsg_txt)
+{
+ unsigned int sav_lineno = lineno;
+ bool eof = skip_until('\n');
+ if ( ! eof )
+ {
+ eof = skip_ws();
+ }
+ if ( eof )
+ {
+ warn_unterm(WARNING, errmsg_txt, sav_lineno);
+ }
- memcpy(statbuf, safe, len);
- statbuf[len]=0;
- return len;
}
+
+/* Convert the given string to a number in the supplied base */
+/* Allow -- and ignore -- embedded periods. */
+/* The endptr param represents a pointer that will be updated
+ * with the address of the first non-numeric character encountered,
+ * (unless it is a NULL, in which case it is ignored).
+ */
+/* There is no test for a completely invalid string;
+ * the calling routine is responsible for ascertaining
+ * the validity of the string being passed.
+ */
static long parse_number(u8 *start, u8 **endptr, int lbase)
{
long val = 0;
- int negative = 0, curr;
+ bool negative = FALSE ;
+ int curr;
u8 *nptr=start;
curr = *nptr;
- if (curr == '-') {
- negative=1;
+ if (curr == '-')
+ {
+ negative = TRUE ;
nptr++;
}
@@ -177,265 +963,3486 @@
*endptr=nptr;
if (negative)
- return -val;
+ {
+ val = -val;
+ }
return val;
}
-static u8 *get_sequence(u8 *walk)
+/* **************************************************************************
+ *
+ * Function name: add_byte_to_string
+ * Synopsis: Add the given byte (or character) to the string
+ * being accumulated in statbuf, but protect
+ * against a buffer overflow.
+ *
+ * Inputs:
+ * Parameters:
+ * nu_byte The given character to be added
+ * walk Pointer to pointer to the position
+ * in statbuf where the character
+ * is to be placed
+ * Global Variables:
+ * statbuf Buffer where the string is accumulated
+ * Macros:
+ * GET_BUF_MAX Size of the buffer
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Supplied Pointers:
+ * **walk Given character is placed here
+ * *walk Incremented in any case
+ *
+ * Error Detection:
+ * If walk has reached end of string buffer, do not place
+ * the character, but continue to increment walk .
+ * Calling routine will detect overflow.
+ *
+ **************************************************************************** */
+
+static void add_byte_to_string( u8 nu_byte, u8 **walk )
{
- u8 val, pval[3];
+ if ( *walk - statbuf < GET_BUF_MAX )
+ {
+ **walk = nu_byte;
+ }
+ (*walk)++;
+}
+
+/* **************************************************************************
+ *
+ * Function name: c_string_escape
+ * Synopsis: Process C-style escape syntax in strings
+ *
+ * Inputs:
+ * Parameters:
+ * walk Pointer to pointer to area into
+ * which to put acquired values
+ * Global Variables:
+ * pc Input-source Scanning pointer
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * pc Point to last character processed.
+ * Supplied Pointers:
+ * *walk Advanced by number of bytes acquired
+ *
+ * Error Detection:
+ * WARNING conditions. See under "Process Explanation" below.
+ *
+ * Process Explanation:
+ * Start with PC pointing to the first character to process
+ * i.e., after the backslash.
+ * We recognize newline, tab and numbers
+ * A digit-string in the current base can be converted to a number.
+ * The first non-numeric character ends the numeric sequence
+ * and gets swallowed up.
+ * If the number exceeds the size of a byte, use the truncated
+ * value and issue a WARNING.
+ * If the first character in the "digit"-string was non-numeric,
+ * use the character literally and issue a WARNING.
+ * If the character that ended the numeric sequence is a quote,
+ * it might be the end of the string, or the start of a
+ * special-character or even of an "( ... ) hex-sequence,
+ * so don't swallow it up.
+ *
+ * Still to be done:
+ * Better protection against PC pointer-over-run past END.
+ * Currently, this works, but it's held together by threads:
+ * Because init_stream forces a null-byte at the end of
+ * the input buffer, parse_number() exits immediately upon
+ * encountering it. This situation could be covered more
+ * robustly...
+ *
+ **************************************************************************** */
+
+static void c_string_escape( u8 **walk)
+{
+ char c = *pc;
+ u8 val;
+ /* We will come out of this "switch" statement
+ * with a value for val and a decision
+ * as to whether to write it.
+ */
+ bool write_val = TRUE;
- pc++; /* skip the ( */
+ switch (c)
+ {
+ case 'n':
+ /* newline */
+ val = '\n';
+ break;
+ case 't':
+ /* tab */
+ val = '\t';
+ break;
+ default:
+
+ /* Digit-string? Convert it to a number, using the current base.
+ * The first non-numeric character ends the numeric sequence
+ * and gets swallowed up.
+ * If the number exceeds the size of a byte, use the truncated
+ * value and issue a WARNING.
+ * If the first character in the "digit"-string was non-numeric,
+ * use the character literally and issue a WARNING.
+ */
+
+ /*
+ * If the sequence ender is a quote, it might be the end of
+ * the string, or the start of a special-character or even
+ * of an "( ... ) hex-sequence, so don't swallow it up.
+ */
+ {
+ long lval;
+ u8 *sav_pc = pc;
+ lval=parse_number(pc, &pc, base);
+ val = (u8)lval;
#ifdef DEBUG_SCANNER
- printf("%s:%d: debug: hex field:", iname, lineno);
+ if (verbose)
+ printf( "%s:%d: debug: escape code "
+ "0x%x\n",iname, lineno, val);
#endif
- pval[1]=0; pval[2]=0;
+ if ( lval > 0x0ff )
+ {
+ tokenization_error ( WARNING,
+ "Numeric String after \\ overflows byte. "
+ "Using 0x%02x.\n", val);
+ }
- for(;;) {
- while (!isxdigit(*pc) && (*pc) != ')')
- pc++;
+ if ( pc == sav_pc )
+ {
+ /* NOTE: Here, PC hasn't been advanced past its
+ * saved value, so we can count on C remaining
+ * unchanged since the start of the routine.
+ */
+ /* Don't use the null-byte at the end of the buffer */
+ if ( ( pc >= end )
+ /* or a sequence-ending quote. */
+ || ( c == '"' ) )
+ {
+ write_val = FALSE;
+ }else{
+ /* In the WARNING message, print the character
+ * if it's printable or show it in hex
+ * if it's not.
+ */
+ if ( (c > 0x20 ) && ( c <= 0x7e) )
+ {
+ tokenization_error ( WARNING,
+ "Unrecognized character, %c, "
+ "after \\ in string. "
+ "Using it literally.\n", c);
+ }else{
+ tokenization_error ( WARNING,
+ "Unrecognized character, 0x%02x, "
+ "after \\ in string. "
+ "Using it literally.\n", c);
+ }
+ val = c;
+ }
+ }
+ /* NOTE: Here, however, PC may have been advanced... */
+ /* Don't swallow the sequence-ender if it's a quote. */
+ if ( *pc == '"' )
+ {
+ pc--;
+ }
- pval[0]=*pc;
- if (pval[0]==')')
- break;
+ } /* End of the "default" clause */
+ } /* End of the "switch" statement */
- pc++; /* this cannot be a \n */
+ if ( write_val ) add_byte_to_string( val, walk );
- pval[1]=*pc;
- if ( *pc!=')' && *pc++=='\n' )
- lineno++;
-
- val=parse_number(pval, NULL, 16);
- *(walk++)=val;
+}
+
+/* **************************************************************************
+ *
+ * Function name: get_sequence
+ * Synopsis: Process the Hex-Number option in strings
+ * Protect against PC pointer-over-run past END.
+ *
+ * Inputs:
+ * Parameters:
+ * **walk Pointer to pointer to area into which
+ * to put acquired values
+ * Global Variables:
+ * pc Input-source Scanning pointer
+ * end End of input-source buffer
+ *
+ * Outputs:
+ * Returned Value: TRUE = "Normal Completion" (I.e., not EOF)
+ * Global Variables:
+ * pc Points at terminating close-paren, or END
+ * lineno Input File Line-Number Counter, may be incr'd
+ * Supplied Pointers:
+ * *walk Advanced by number of values acquired
+ *
+ * Error Detection:
+ * End-of-file encountered before end of hex-sequence:
+ * Issue a Warning, conclude processing, return FALSE.
+ *
+ * Process Explanation:
+ * SETUP and RULES:
+ * Start with PC pointing to the first character
+ * after the '(' (Open-Paren)
+ * Bytes are gathered from digits in pairs, except
+ * when separated they are treated singly.
+ * Allow a backslash in the middle of the sequence
+ * to skip to the end of the line and past the
+ * whitespace at the start of the next line,
+ * i.e., it acts as a comment-escape.
+ *
+ * INITIALIZE:
+ * PV_indx = 0
+ * Set return-indicator to "Abnormal Completion"
+ * Ready_to_Parse = FALSE
+ * Stuff NULL into PVAL[2]
+ * WHILE PC is less than END
+ * Pick up character at PC into Next_Ch
+ * IF Next_Ch is close-paren :
+ * Set return-indicator to "Normal Completion".
+ * Done! Break out of loop.
+ * ENDIF
+ * IF comment-escape behavior (controlled by means of a
+ * command-line switch) is allowed
+ * IF Next_Ch is backslash :
+ * Skip to end-of line, skip whitespace.
+ * If that makes PC reach END : WARNING message.
+ * (Don't need to break out of loop;
+ * normal test will terminate.)
+ * CONTINUE Loop.
+ * (Don't increment PC; PC is already at right place).
+ * ENDIF
+ * ENDIF
+ * IF Next_Ch is a valid Hex-Digit character :
+ * Stuff it into PVAL[PV_indx]
+ * IF (PV_indx is 0) :
+ * Increment PV_indx
+ * ELSE
+ * Set Ready_to_Parse to TRUE
+ * ENDIF
+ * ELSE
+ * IF Next_Ch is a New-Line, increment Line Number counter
+ * IF (PV_indx is 1) :
+ * Stuff NULL into PVAL[1]
+ * Set Ready_to_Parse to TRUE
+ * ENDIF
+ * ENDIF
+ * IF Ready_to_Parse
+ * Parse PVAL
+ * Stuff into WALK
+ * Reset PV_indx to zero
+ * Reset Ready_to_Parse to FALSE
+ * ENDIF
+ * Increment PC
+ * REPEAT
+ * Return with Normal/Abnormal completion indicator
+ *
+ **************************************************************************** */
+
+static bool get_sequence(u8 **walk)
+{
+ int pv_indx = 0;
+ bool retval = FALSE; /* "Abnormal Completion" indicator */
+ bool ready_to_parse = FALSE;
+ char next_ch;
+ char pval[3];
+
#ifdef DEBUG_SCANNER
+ printf("%s:%d: debug: hex field:", iname, lineno);
+#endif
+ pval[2]=0;
+
+ while ( pc < end )
+ {
+ next_ch = *pc;
+ if ( next_ch == ')' )
+ {
+ retval = TRUE;
+ break;
+ }
+ if ( hex_remark_escape )
+ {
+ if ( next_ch == '\\' )
+ {
+ string_remark("string hex-sequence remark");
+ continue;
+ }
+ }
+ if ( isxdigit(next_ch) )
+ {
+ pval[pv_indx] = next_ch;
+ if ( pv_indx == 0 )
+ {
+ pv_indx++;
+ }else{
+ ready_to_parse = TRUE;
+ }
+ }else{
+ if ( next_ch == '\n' ) lineno++ ;
+ if ( pv_indx != 0 )
+ {
+ pval[1] = 0;
+ ready_to_parse = TRUE;
+ }
+ }
+ if ( ready_to_parse )
+ {
+ u8 val = parse_number(pval, NULL, 16);
+ *((*walk)++)=val;
+#ifdef DEBUG_SCANNER
printf(" %02x",val);
#endif
+ pv_indx = 0;
+ ready_to_parse = FALSE;
}
+ pc++;
+ }
#ifdef DEBUG_SCANNER
printf("\n");
#endif
-
- return walk;
+ return ( retval );
}
-static unsigned long get_string(void)
+/* **************************************************************************
+ *
+ * Return the length of the string.
+ * Pack the string, without the terminating '"' (Quote), into statbuf
+ * Protect against PC pointer-over-run past END.
+ * Enable Quote-Backslash as a String-Remark Escape.
+ * Allowability of Quote-Backslash as a String-Remark is under control
+ * of a command-line switch (string_remark_escape ).
+ * Allowability of C-style escape characters is under control
+ * of a command-line switch ( c_style_string_escape ).
+ *
+ * Truncate string to size of Forth Packed-String (i.e., uses leading
+ * count-byte, so limited to 255, number that one byte can express)
+ * unless the string is being gathered for a Message or is being
+ * consumed for purposes of ignoring it, in either of which case
+ * that limit need not be enforced. Parameter "pack_str" controls
+ * this: TRUE if limit needs to be enforced.
+ *
+ * Issue WARNING if string length gets truncated.
+ * Issue WARNING if string crosses line.
+ * The issuance of the Multi-line WARNING is under control of a
+ * one-shot directive similar to OVERLOAD , called MULTI-LINE
+ *
+ * Still to be decided:
+ * Do we want to bring the allowability of strings crossing
+ * lines under control of a command-line switch?
+ *
+ ************************************************************************** */
+
+static signed long get_string( bool pack_str)
{
u8 *walk;
unsigned long len;
- bool run=1;
- u8 c, val;
+ char c;
+ bool run = TRUE;
+ unsigned long start_lineno = lineno; /* For warning message */
+ /*
+ * Bump past the single whitespace character that delimits
+ * the command -- e.g., ." or " or suchlike -- that
+ * starts the string. Allow new-line to be a command-
+ * -delimiting whitespace character. Regard any sub-
+ * sequent whitespace characters as part of the string
+ */
+ if (*pc++=='\n') lineno++;
+
+ got_until_eof = TRUE ;
+
walk=statbuf;
while (run) {
- switch ((c=*pc)) {
- case '\\':
- switch ((c=*(++pc))) {
- case 'n':
- /* newline */
- *(walk++)='\n';
+ switch ((c=*pc))
+ {
+ /* Standard use of '"' (Quote) for special-char escape */
+ case '\"':
+ /* Skip the '"' (Quote) */
+ pc++;
+ /* End of the buffer also ends the string cleanly */
+ if ( pc >= end )
+ {
+ run = FALSE;
+ got_until_eof = FALSE ;
break;
- case 't':
- /* tab */
- *(walk++)='\t';
+ }
+ /* Pick up the next char after the '"' (Quote) */
+ c=*pc;
+ switch (c)
+ {
+ case '(':
+ pc++; /* skip the '(' */
+ run = get_sequence(&walk);
break;
- default:
- val=parse_number(pc, &pc, base);
-#ifdef DEBUG_SCANNER
- if (verbose)
- printf( "%s:%d: debug: escape code "
- "0x%x\n",iname, lineno, val);
-#endif
- *(walk++)=val;
- }
- break;
- case '\"':
- pc++; /* skip the " */
- /* printf("switching: %c\n",*pc); */
- switch(*pc) {
- case '(':
- walk=get_sequence(walk);
- break;
- case '"':
- *(walk++)='"';
- pc++;
- break;
case 'n':
- *(walk++)='\n';
- pc++;
+ add_byte_to_string( '\n', &walk);
break;
case 'r':
- *(walk++)='\r';
- pc++;
+ add_byte_to_string( '\r', &walk);
break;
case 't':
- *(walk++)='\t';
- pc++;
+ add_byte_to_string( '\t', &walk);
break;
case 'f':
- *(walk++)='\f';
- pc++;
+ add_byte_to_string( '\f', &walk);
break;
case 'l':
- *(walk++)='\n';
- pc++;
+ add_byte_to_string( '\n', &walk);
break;
case 'b':
- *(walk++)=0x08;
- pc++;
+ add_byte_to_string( 0x08, &walk);
break;
case '!':
- *(walk++)=0x07;
- pc++;
+ add_byte_to_string( 0x07, &walk);
break;
case '^':
- pc++;
- c=toupper(*(pc++));
- *(walk++)=c-'A';
+ pc++; /* Skip the up-arrow (Caret) */
+ add_byte_to_string( *pc & 0x1f , &walk);
break;
- case '\n':
- lineno++;
+ /* We're done after any of the whitespace
+ * characters follows a quote.
+ */
case ' ':
case '\t':
- run=0;
+ /* Advance past the terminating whitespace
+ * character, except newline.
+ * Let get_word() handle that.
+ */
+ pc++;
+ case '\n':
+ run=FALSE;
+ got_until_eof = FALSE ;
break;
default:
- *(walk++)=*(pc++);
+ /* Control allowability of Quote-Backslash
+ * as a String-Remark by means of a
+ * command-line switch.
+ */
+ if ( string_remark_escape )
+ {
+ if ( c == '\\' )
+ {
+ string_remark("string-escape remark");
+ /* The first non-blank in the new line
+ * has not been processed yet.
+ * Back up to allow it to be.
+ */
+ pc--;
break;
}
+ }
+ add_byte_to_string( c, &walk);
+ }
break;
+ case '\n':
+ /* Allow strings to cross lines. Include the
+ * newline in the string. Account for it.
+ */
+ lineno++;
default:
- *(walk++)=c;
+ /* Control allowability of C-style escape-character
+ * syntax by means of a command-line switch.
+ */
+ if ( c_style_string_escape )
+ {
+ if ( c == '\\' )
+ {
+ pc++;
+ c_string_escape(&walk );
+ break;
+ }
+ }
+ add_byte_to_string( c, &walk);
}
- if (*pc++=='\n') lineno++;
+ /* Advance past the char processed, unless we're done. */
+ if ( run ) pc++;
+ /* Done if we hit end of file before string was concluded */
+ if ( pc >= end )
+ {
+ run = FALSE;
+ if ( got_until_eof )
+ {
+ warn_unterm( WARNING, "string", start_lineno);
+ /* Prevent multiple messages for one error */
+ got_until_eof = FALSE;
+ }
+ }
}
- *(walk++)=0;
-
- if (pc>=end)
- return 0;
-
- len=(unsigned long)walk-(unsigned long)statbuf;
- if (len>1023) {
- printf("%s:%d: error: buffer overflow\n", iname, lineno);
- ERROR;
+ warn_if_multiline( "string", start_lineno);
+
+ len = walk - statbuf;
+ if (len >= GET_BUF_MAX )
+ {
+ tokenization_error ( TKERROR,
+ "get_string buffer overflow. Max is %d\n.", GET_BUF_MAX-1 );
+ len = GET_BUF_MAX-1;
}
#ifdef DEBUG_SCANNER
if (verbose)
printf("%s:%d: debug: scanned string: '%s'\n",
iname, lineno, statbuf);
#endif
+ if ( pack_str && (len > STRING_LEN_MAX) )
+ {
+ tokenization_error ( WARNING,
+ "String length being truncated to %d.\n", STRING_LEN_MAX );
+ len = STRING_LEN_MAX;
+ }
+ statbuf[len] = 0;
- return len>255?255:len;
+ return len ;
}
-static int get_number(long *result)
+
+/* **************************************************************************
+ *
+ * Function name: handle_user_message
+ * Synopsis: Collect a user-generated tokenization-time message;
+ * either print it or discard it. Shared code
+ * for user_message() and skip_user_message()
+ *
+ * Inputs:
+ * Parameters:
+ * delim End-of-string delimiter character.
+ * If it's a double-quote ("), we will use
+ * the get-string() routine, with all
+ * its options, to collect the message.
+ * Otherwise, we'll capture plain text from
+ * the input stream.
+ * print_it TRUE if we should print the message
+ * Local Static Variables:
+ * got_until_eof TRUE if reached end of buffer before delim.
+ * Global Variables:
+ * lineno Save, then restore.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * statbuf The string will be collected in here
+ *
+ * Printout (if print_it is TRUE):
+ * The string, with new-line tacked on, will be printed from
+ * the tokenization_error() routine as a MESSAGE.
+ * The line-number will be shown as of the origin of the message
+ *
+ * Error Detection:
+ * Error-reports will be printed regardless of print_it param.
+ * If delimiter was not found, show "Unterminated" warning message.
+ * If delimiter was " (double-quote), the get_string() routine
+ * already checked for a multi-line construct; if delimiter is
+ * a new-line, then a multi-line construct is impossible.
+ * otherwise, we will do the multi-line check here.
+ *
+ **************************************************************************** */
+
+static void handle_user_message( char delim, bool print_it )
{
- u8 lbase, *until;
- long val;
+ signed long wlen;
+ unsigned int start_lineno = lineno;
+ unsigned int multiline_start = lineno; /* For warning message */
+ bool check_multiline = FALSE;
+ const char *ug_msg = "user-generated message";
- lbase=intok?0x10:base;
- val=parse_number(statbuf,&until, lbase);
+ if ( delim == '"' )
+ {
+ wlen = get_string( FALSE);
+ }else{
+ /*
+ * When the message-delimiter is a new-line, and the
+ * command-delimiter was a new-line, it means the
+ * string length is zero; we won't bump the PC.
+ * Otherwise, we will honor the convention we extend
+ * to .( whereby, if the command is delimited
+ * by a new-line, we allow the string to begin
+ * on the next line.
+ */
+ if ( delim == '\n' )
+ {
+ if ( *pc != '\n') pc++;
+ }else{
+ if (*pc++=='\n') lineno++;
+ multiline_start = lineno;
+ check_multiline = TRUE;
+ }
+ wlen = get_until( delim );
+ }
+
+ if ( print_it )
+ {
+ unsigned int tmp_lineno = lineno;
+ lineno = start_lineno;
+ /* Don't add a new-line to body of the message.
+ * Routine already takes care of that.
+ * Besides, buffer might be full...
+ */
+ tokenization_error( MESSAGE, statbuf);
+ lineno = tmp_lineno;
+ }
+
+ if ( got_until_eof ) /* Crude but effective retrofit... */
+ {
+ warn_unterm(WARNING, (char *)ug_msg, start_lineno);
+ }else{
+ if ( check_multiline )
+ {
+ warn_if_multiline( (char *)ug_msg, multiline_start);
+ }
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: user_message
+ * Synopsis: Collect a user-generated message and
+ * print it at tokenization-time.
+ *
+ * Tokenizer directive (either mode):
+ * Synonyms String Delimiter
+ * [MESSAGE] #MESSAGE [#MESSAGE] end-of-line
+ * #MESSAGE" "
+ * "Tokenizer-Escape" mode directive String Delimiter
+ * .( )
+ * ." "
+ *
+ * Inputs:
+ * Parameter is the "parameter field" of the TIC entry, which
+ * was initialized to the end-of-string delimiter character.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout: User-message, parsed from input.
+ *
+ * Extraneous Remarks:
+ * We would have preferred to simply use the "character value"
+ * aspect of the union, but we found portability issues
+ * between big- and little- -endian processors, so we still
+ * have to recast its type here.
+ *
+ **************************************************************************** */
+
+void user_message( tic_param_t pfield )
+{
+ char delim = (char)pfield.deflt_elem ;
+ handle_user_message( delim, TRUE);
+}
+
+/* **************************************************************************
+ *
+ * Function name: skip_user_message
+ * Synopsis: Collect a user-generated message and discard it.
+ * Used when ignoring a Conditional section.
+ *
+ * Tokenizer directive (either mode):
+ * Synonyms String Delimiter
+ * [MESSAGE] #MESSAGE [#MESSAGE] end-of-line
+ * #MESSAGE" "
+ * "Tokenizer-Escape" mode directive String Delimiter
+ * .( )
+ * ." "
+ *
+ * Inputs:
+ * Parameters:
+ * pfield "Parameter field" of the TIC entry, which
+ * was initialized to the delimiter.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout: NONE
+ *
+ **************************************************************************** */
+
+void skip_user_message( tic_param_t pfield )
+{
+ char delim = (char)pfield.deflt_elem ;
+ handle_user_message( delim, FALSE);
+}
+
+
+
+/* **************************************************************************
+ *
+ * Function name: get_number
+ * Synopsis: If the word retrieved from the input stream is a
+ * valid number (under the current base) convert it.
+ * Return an indication if it was not.
+ *
+ * Inputs:
+ * Parameters:
+ * *result Pointer to place to return the number
+ * Global Variables:
+ * statbuf The word just read that is to be converted.
+ * base The current numeric-interpretation base.
+ *
+ * Outputs:
+ * Returned Value: TRUE = Input was a valid number
+ * Supplied Pointers:
+ * *result The converted number, if valid
+ * otherwise undefined
+ *
+ * Revision History:
+ * Updated Mon, 28 Mar 2005 by David L. Paktor
+ * Always use the current base.
+ * Reversed sense of return-flag.
+ *
+ **************************************************************************** */
+
+bool get_number( long *result)
+{
+ u8 *until;
+ long val;
+ bool retval = FALSE ;
+
+ val = parse_number(statbuf, &until, base);
#ifdef DEBUG_SCANNER
- printf("%s:%d: debug: parsing number: base 0x%x, val 0x%lx, "
- "processed %ld of %ld bytes\n", iname, lineno,
- lbase, val,(size_t)(until-statbuf), strlen((char *)statbuf));
+ printf("%s:%d: debug: parsing number: base 0x%x, val 0x%lx, "
+ "processed %ld of %ld bytes\n", iname, lineno,
+ base, val,(size_t)(until-statbuf), strlen((char *)statbuf));
#endif
- if (until==(statbuf+strlen((char *)statbuf))) {
- *result=val;
- return 0;
- }
-
- return -1;
+ /* If number-parsing ended before the end of the input word,
+ * then the input word was not a valid number.
+ */
+ if (until==(statbuf+strlen((char *)statbuf)))
+ {
+ *result=val;
+ retval = TRUE;
+ }
+
+ return ( retval );
}
+/* **************************************************************************
+ *
+ * Function name: deliver_number
+ * Synopsis: Deliver the supplied number according to the
+ * state of the tokenizer:
+ * In normal tokenization mode, emit it as an
+ * FCode literal.
+ * In "Tokenizer-Escape" mode, push it onto
+ * the Data Stack.
+ *
+ * Inputs:
+ * Parameters:
+ * numval The number, verified to be valid.
+ * Global Variables:
+ * in_tokz_esc TRUE if tokenizer is in "Tokenizer Escape" mode.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Items Pushed onto Data-Stack:
+ * Top: The number, if in_tokz_esc was TRUE
+ * FCode Output buffer:
+ * If in_tokz_esc was FALSE, a b(lit) token will be written,
+ * followed by the number.
+ *
+ **************************************************************************** */
+
+static void deliver_number( long numval)
+{
+ if ( in_tokz_esc )
+ {
+ dpush( numval );
+ } else {
+ emit_literal(numval);
+ }
+}
+/* **************************************************************************
+ *
+ * Function name: handle_number
+ * Synopsis: Convert the word just retrieved from the input stream
+ * to a number.
+ * Indicate whether the string was a valid number and
+ * deliver it, as appropriate.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * statbuf The word that was just read, and to be converted.
+ *
+ * Outputs:
+ * Returned Value: TRUE = Input string was a valid number
+ * If input string was a valid number, the converted number will
+ * be delivered, as appropriate, by deliver_number().
+ *
+ **************************************************************************** */
+
+static bool handle_number( void )
+{
+ bool retval ;
+ long numval;
+
+ retval = get_number( &numval );
+ if ( retval )
+ {
+ deliver_number( numval );
+ }
+
+ return ( retval );
+}
+
+/* **************************************************************************
+ *
+ * Function name: ascii_right_number
+ * Synopsis: Convert a character sequence to a number, justified
+ * toward the right (i.e., the low-order bytes) and
+ * deliver it, as appropriate.
+ *
+ * Inputs:
+ * Parameters:
+ * in_str The input string
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * The converted number will be delivered by deliver_number().
+ *
+ * Process Explanation:
+ * The last four characters in the sequence will become the number.
+ * If there are fewer than four, they will fill the low-order part
+ * of the number.
+ * Example: PCIR is converted to h# 50434952
+ * CPU is converted to h# 00435055
+ * and
+ * LotsOfStuff is equivalent to a# tuff
+ * and is converted to h# 74756666
+ *
+ **************************************************************************** */
+
+static void ascii_right_number( char *in_str)
+{
+ u8 nxt_ch;
+ char *str_ptr = in_str;
+ long numval = 0;
+
+ for ( nxt_ch = (u8)*str_ptr ;
+ ( nxt_ch = (u8)*str_ptr ) != 0 ;
+ str_ptr++ )
+ {
+ numval = ( numval << 8 ) + nxt_ch ;
+ }
+ deliver_number( numval );
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: ascii_left_number
+ * Synopsis: Similar to ascii_right_number() except justified
+ * toward the left (i.e., the high-order bytes).
+ *
+ *
+ * Inputs:
+ * Parameters:
+ * in_str The input string
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * The converted number will be delivered by deliver_number().
+ *
+ * Process Explanation:
+ * If there are fewer than four characters in the sequence, they
+ * will fill the high-order part of the number.
+ * CPU is converted to h# 43505500
+ * In all other respects, similar to ascii_right_number()
+ *
+ **************************************************************************** */
+
+static void ascii_left_number( char *in_str)
+{
+ u8 nxt_ch;
+ char *str_ptr = in_str;
+ long numval = 0;
+ int shift_amt = 24;
+ bool shift_over = FALSE ;
+
+ for ( nxt_ch = (u8)*str_ptr ;
+ ( nxt_ch = (u8)*str_ptr ) != 0 ;
+ str_ptr++ )
+ {
+ if ( shift_over ) numval <<= 8;
+ if ( shift_amt == 0 ) shift_over = TRUE ;
+ numval += ( nxt_ch << shift_amt );
+ if ( shift_amt > 0 ) shift_amt -= 8;
+ }
+ deliver_number( numval );
+
+}
+
+/* **************************************************************************
+ *
+ * Function name: init_scanner
+ * Synopsis: Allocate memory the Scanner will need.
+ * Only need to call once per program run.
+ *
+ **************************************************************************** */
+
void init_scanner(void)
{
- statbuf=malloc(1024);
- if (!statbuf) {
- printf ("no memory.\n");
- exit(-1);
- }
+ statbuf=safe_malloc(GET_BUF_MAX, "initting scanner");
}
+/* **************************************************************************
+ *
+ * Function name: exit_scanner
+ * Synopsis: Free up memory the Scanner used
+ *
+ **************************************************************************** */
+
void exit_scanner(void)
{
free(statbuf);
}
-#define FLAG_EXTERNAL 0x01
-#define FLAG_HEADERS 0x02
-char *name, *alias;
-int flags=0;
+/* **************************************************************************
+ *
+ * Function name: set_hdr_flag
+ * Synopsis: Set the state of the "headered-ness" flag to the
+ * value given, unless over-ridden by one or both
+ * of the "always-..." Command-Line Flags
+ *
+ * Inputs:
+ * Parameters:
+ * new_flag New setting
+ * Global Variables:
+ * always_headers Override HEADERLESS and make HEADERS
+ * always_external Override HEADERLESS and HEADERS;
+ * make EXTERNAL
+ *
+ * Outputs:
+ * Returned Value: None
+ * Local Static Variables:
+ * hdr_flag Adjusted to new setting
+ *
+ * Process Explanation:
+ * If always_headers is TRUE, and new_flag is not FLAG_EXTERNAL
+ * then set to FLAG_HEADERS
+ * If always_external is TRUE, set to FLAG_EXTERNAL, regardless.
+ * (Note: always_external over-rides always_headers).
+ * Otherwise, set to new_flag
+ *
+ **************************************************************************** */
-static int create_word(void)
+static void set_hdr_flag( headeredness new_flag)
{
- unsigned long wlen;
+ headeredness new_state = new_flag;
+ switch ( new_flag)
+ {
+ case FLAG_HEADERLESS:
+ {
+ if ( always_headers )
+ { new_state = FLAG_HEADERS;
+ }
+ /* No break. Intentional... */
+ }
+ case FLAG_HEADERS:
+ {
+ if ( always_external )
+ { new_state = FLAG_EXTERNAL;
+ }
+ /* No break. Intentional... */
+ }
+ case FLAG_EXTERNAL:
+ break; /* Satisfy compiler's error-checking... */
+ /* No default needed here... */
+ }
- if (incolon) {
- printf("%s:%d: error: creating words not allowed "
- "in colon definition.\n", iname, lineno);
- ERROR;
+ hdr_flag = new_state;
+
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: init_scan_state
+ * Synopsis: Initialize various state variables for each time
+ * a new tokenization scan is started.
+ *
+ * Inputs:
+ * Parameters: NONE
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables: Initialized to:
+ * base 0x0a (I.e., base = "decimal")
+ * nextfcode By reset_fcode_ranges()
+ * pci_is_last_image TRUE
+ * incolon FALSE
+ * Local Static Variables:
+ * hdr_flag FLAG_HEADERLESS (unless over-ridden)
+ * is_instance FALSE
+ * last_colon_filename NULL
+ * instance_filename NULL
+ * dev_change_instance_warning TRUE
+ * instance_definer_gap FALSE
+ * need_to_pop_source FALSE
+ * first_fc_starter TRUE
+ * ret_stk_depth 0
+ * Memory Freed
+ * Copies of input-file name in last_colon_filename and
+ * instance_filename , if allocated.
+ *
+ **************************************************************************** */
+
+void init_scan_state( void)
+{
+ base = 0x0a;
+ pci_is_last_image = TRUE;
+ incolon = FALSE;
+ is_instance = FALSE;
+ set_hdr_flag( FLAG_HEADERLESS);
+ reset_fcode_ranges();
+ first_fc_starter = TRUE;
+ if ( last_colon_filename != NULL ) free( last_colon_filename);
+ if ( instance_filename != NULL ) free( instance_filename);
+ last_colon_filename = NULL;
+ instance_filename = NULL;
+ dev_change_instance_warning = TRUE;
+ instance_definer_gap = FALSE;
+ need_to_pop_source = FALSE;
+ ret_stk_depth = 0;
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: collect_input_filename
+ * Synopsis: Save a copy of the current input file name in the
+ * given variable, for error-reporting purposes
+ *
+ * Inputs:
+ * Parameters:
+ * saved_nam Pointer to pointer for copy of name
+ * Global Variables:
+ * iname Current input file name
+ * Local Static Variables:
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Supplied Pointers:
+ * *saved_nam Copy of name
+ * Memory Allocated
+ * For copy of input file name
+ * When Freed?
+ * Subsequent call to this routine with same pointer
+ * (Last copy made will be freed if starting a new tokenization,
+ * otherwise, will persist until end of program.)
+ * Memory Freed
+ * Previous copy in same pointer.
+ *
+ * Process Explanation:
+ * If there is a previous copy, and it still matches the current
+ * input-file name, we don't need to free or re-allocate.
+ *
+ **************************************************************************** */
+
+static void collect_input_filename( char **saved_nam)
+{
+ bool update_lcfn = TRUE; /* Need to re-allocate? */
+ if ( *saved_nam != NULL )
+ {
+ if ( strcmp( *saved_nam, iname) == 0 )
+ {
+ /* Last collected filename unchanged from iname */
+ update_lcfn = FALSE;
+ }else{
+ free( *saved_nam);
}
-
- if(nextfcode > 0xfff) {
- printf("%s:%d: error: maximum number of fcode words "
- "reached.\n", iname, lineno);
- ERROR;
+ }
+ if ( update_lcfn )
+ {
+ *saved_nam = strdup(iname);
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: test_in_colon
+ * Synopsis: Error-check whether a word is being used in the
+ * correct state, relative to being inside a colon
+ * definition; issue a message if it's not.
+ *
+ * Inputs:
+ * Parameters:
+ * wname The name of the word in question
+ * sb_in_colon TRUE if the name should be used inside
+ * a colon-definition only; FALSE if
+ * it may only be used outside of a
+ * colon-definition.
+ * severity Type of error/warning message to call.
+ * usually either WARNING or TKERROR
+ * use_instead Word the error-message should suggest be
+ * used "instead". This may be a NULL,
+ * in which case the "suggestion" part
+ * of the message will simply be omitted.
+ * Global Variables:
+ * incolon State of the tokenization; TRUE if inside
+ * a colon definition
+ *
+ * Outputs:
+ * Returned Value: TRUE if no error.
+ * Printout: Error messages as indicated.
+ *
+ * Error Detection:
+ * If the state, relative to being inside a colon-definition,
+ * is not what the parameter says it should be, issue a
+ * message of the indicated severity, and return FALSE.
+ *
+ **************************************************************************** */
+
+static bool test_in_colon ( char *wname,
+ bool sb_in_colon, /* "Should Be IN colon" */
+ int severity,
+ char *use_instead)
+{
+ bool is_wrong;
+ bool retval = TRUE ;
+
+ is_wrong = BOOLVAL(( sb_in_colon != FALSE ) != ( incolon != FALSE )) ;
+ if ( is_wrong )
+ {
+ char *ui_pt1 = "";
+ char *ui_pt2 = "";
+ char *ui_pt3 = "";
+ retval = FALSE;
+ if ( use_instead != NULL )
+ {
+ ui_pt1 = " Use ";
+ ui_pt2 = use_instead;
+ ui_pt3 = " instead.";
}
+ tokenization_error ( severity, "The word %s should not be used "
+ "%sside of a colon definition.%s%s%s\n", strupr(wname),
+ sb_in_colon ? "out" : "in", ui_pt1, ui_pt2, ui_pt3 );
+ }
+ return ( retval );
+}
+
+/* **************************************************************************
+ *
+ * Function name: must_be_deep_in_do
+ * Synopsis: Check that the statement in question is called
+ * from inside the given depth of structures
+ * of the DO ... LOOP -type (i.e., any combination
+ * of DO or ?DO and LOOP or +LOOP ).
+ * Show an error if it is not.
+ *
+ **************************************************************************** */
+
+static void must_be_deep_in_do( int how_deep )
+{
+ int functional_depth = do_loop_depth;
+ if ( incolon )
+ {
+ functional_depth -= last_colon_do_depth;
+ }
+ if ( functional_depth < how_deep )
+ {
+ char deep_do[64] = "";
+ int indx;
+ bool prefix = FALSE;
+
+ for ( indx = 0; indx < how_deep ; indx ++ )
+ {
+ strcat( deep_do, "DO ... ");
+ }
+ for ( indx = 0; indx < how_deep ; indx ++ )
+ {
+ if ( prefix )
+ {
+ strcat( deep_do, " ... ");
+ }
+ strcat( deep_do, "LOOP");
+ prefix = TRUE;
+ }
+
+ tokenization_error( TKERROR,
+ "%s outside of %s structure", strupr(statbuf), deep_do);
+ in_last_colon();
+ }
+
+}
+
+/* **************************************************************************
+ *
+ * Function name: bump_ret_stk_depth
+ * Synopsis: Increment or decrement the Return-Stack-Usage-Depth
+ * counter.
+ *
+ * Inputs:
+ * Parameters:
+ * bump Amount by which to increment;
+ * negative number to decrement.
+ * Local Static Variables:
+ * ret_stk_depth The Return-Stack-Usage-Depth counter
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * ret_stk_depth Incremented or decremented
+ *
+ * Process Explanation:
+ * This simple-seeming function is actually a place-holder
+ * for future expansion. Proper error-detection of
+ * Return-Stack usage is considerably more complex than
+ * what we are implementing here, and is deferred for a
+ * later revision.
+ *
+ * Still to be done:
+ * Full detection of whether the Return-Stack has been cleared
+ * when required, including analysis of Return-Stack usage
+ * within Flow-Control constructs, and before Loop elements...
+ *
+ * Extraneous Remarks:
+ * Some FORTHs use a Loop-Control stack separate from the Return-
+ * -Stack, but others use the Return-Stack to keep LOOP-control
+ * elements. An FCode program must be portable between different
+ * environments, and so must adhere to the restrictions listed
+ * in the ANSI Spec:
+ *
+ * 3.2.3.3 Return stack
+ * . . . . . .
+ * A program may use the return stack for temporary storage during the
+ * execution of a definition subject to the following restrictions:
+ * A program shall not access values on the return stack (using R@,
+ * R>, 2R@ or 2R>) that it did not place there using >R or 2>R;
+ * A program shall not access from within a do-loop values placed
+ * on the return stack before the loop was entered;
+ * All values placed on the return stack within a do-loop shall
+ * be removed before I, J, LOOP, +LOOP, UNLOOP, or LEAVE is
+ * executed;
+ * All values placed on the return stack within a definition
+ * shall be removed before the definition is terminated
+ * or before EXIT is executed.
+ *
+ **************************************************************************** */
+
+static void bump_ret_stk_depth( int bump)
+{
+ ret_stk_depth += bump;
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: ret_stk_balance_rpt
+ * Synopsis: Display a Message if usage of the Return-Stack
+ * appears to be out of balance.
+ *
+ * Inputs:
+ * Parameters:
+ * before_what Phrase to use in Message;
+ * if NULL, use statbuf...
+ * clear_it TRUE if this call should also clear the
+ * Return-Stack-Usage-Depth counter
+ * Global Variables:
+ * statbuf Word currently being processed
+ * Local Static Variables:
+ * ret_stk_depth The Return-Stack-Usage-Depth counter
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * ret_stk_depth May be cleared
+ *
+ * Error Detection:
+ * Based simply on whether the Return-Stack-Usage-Depth counter
+ * is zero. This is a weak and uncertain implementation;
+ * therefore, the Message will be a WARNING phrased with
+ * some equivocation.
+ *
+ * Process Explanation:
+ * Proper detection of Return-Stack usage errors is considerably
+ * more complex, and is deferred for a future revision.
+ *
+ * Still to be done:
+ * Correct analysis of Return-Stack usage around Flow-Control
+ * constructs. Consider, for instance, the following:
+ *
+ * blablabla >R yadayada IF R> gubble ELSE flubble R> THEN
+ *
+ * It is, in fact, correct, but the present scheme would
+ * tag it as a possible error. Conversely, something like:
+ *
+ * blablabla >R yadayada IF R> gubble THEN
+ *
+ * would not get tagged, even though it is actually an error.
+ *
+ * The current simple scheme also does not cover Return-Stack
+ * usage within Do-Loops or before Loop elements like I and
+ * J or UNLOOP or LEAVE. Implementing something like that
+ * would probably need to be integrated in with Flow-Control
+ * constructs, and will be noted in flowcontrol.c
+ *
+ **************************************************************************** */
+
+static void ret_stk_balance_rpt( char *before_what, bool clear_it)
+{
+ if ( ret_stk_depth != 0 )
+ {
+ char *what_flow = ret_stk_depth < 0 ? "deficit" : "excess" ;
+ char *what_phr = before_what != NULL ? before_what : strupr(statbuf);
+
+ tokenization_error( WARNING,
+ "Possible Return-Stack %s before %s", what_flow, what_phr);
+ in_last_colon();
+
+ if ( clear_it )
+ {
+ ret_stk_depth = 0;
+ }
+ }
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: ret_stk_access_rpt
+ * Synopsis: Display a Message if an attempt to access a value
+ * on the Return-Stack appears to occur before
+ * one was placed there.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * statbuf Word currently being processed
+ * Local Static Variables:
+ * ret_stk_depth The Return-Stack-Usage-Depth counter
+ *
+ * Outputs:
+ * Returned Value: NONE
+ *
+ * Error Detection:
+ * Equivocal WARNING, based simply on whether the Return-Stack-
+ * -Usage-Depth counter not positive.
+ *
+ * Process Explanation:
+ * Proper detection is deferred...
+ *
+ * Still to be done:
+ * Correct analysis of Return-Stack usage...
+ *
+ **************************************************************************** */
+
+static void ret_stk_access_rpt( void)
+{
+ if ( ret_stk_depth <= 0 )
+ {
+ tokenization_error( WARNING,
+ "Possible Return-Stack access attempt by %s "
+ "without value having been placed there",
+ strupr(statbuf) );
+ in_last_colon();
+ }
+}
+
+
+
+/* **************************************************************************
+ *
+ * Function name: encode_file
+ * Synopsis: Input a (presumably binary) file and encode it
+ * as a series of strings which will be accumulated
+ * and encoded in a manner appropriate for a property.
+ *
+ * Associated Tokenizer directive: encode-file
+ *
+ * Error Detection:
+ * Handled by support routines.
+ *
+ **************************************************************************** */
+
+static void encode_file( const char *filename )
+{
+ FILE *f;
+ size_t s;
+ int num_encoded=0;
- wlen=get_word();
- name=strdup((char *)statbuf);
+ tokenization_error( INFO, "ENCODing File %s\n", filename );
+ f = open_expanded_file( filename, "rb", "encoding");
+ if( f != NULL )
+ {
+ while( (s=fread(statbuf, 1, STRING_LEN_MAX, f)) )
+ {
+ emit_token("b(\")");
+ emit_string(statbuf, s);
+ emit_token("encode-bytes");
+ if( num_encoded )
+ emit_token("encode+");
+ num_encoded += s;
+ }
+ fclose( f );
+ tokenization_error ( INFO, "ENCODed %d bytes.\n", num_encoded);
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: check_name_length
+ * Synopsis: If the length of a user-defined name exceeds the
+ * ANSI-specified maximum of 31 characters, issue
+ * a message. This is a hard-coded limit.
+ * Although our Tokenizer can handle longer names,
+ * they will cause big problems when encountered
+ * by an FCode interpreter.
+ * If the name is going to be included in the binary
+ * output, the message severity must be an ERROR.
+ * Otherwise, if the name is HEADERLESS, the severity
+ * can be reduced to a Warning; if the name is only
+ * defined in "Tokenizer Escape" mode the message
+ * severity can be further reduced to an Advisory.
+ *
+ * Inputs:
+ * Parameters:
+ * wlen Length of the newly-created word
+ * Global Variables:
+ * in_tokz_esc TRUE if in "Tokenizer Escape" mode.
+ * Local Static Variables:
+ * hdr_flag State of headered-ness for name-creation
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * Printout: ERROR message if applicable.
+ *
+ * Error Detection:
+ * The whole point of this routine.
+ *
+ * Revision History:
+ * Updated Wed, 20 Jul 2005 by David L. Paktor
+ * Escalated from merely an informative warning to a TKERROR
+ * Updated Fri, 21 Oct 2005 by David L. Paktor
+ * Adjust severity if name doesn't go into the FCode anyway...
+ *
+ **************************************************************************** */
+
+void check_name_length( signed long wlen )
+{
+ if ( wlen > 31 )
+ {
+ int severity = TKERROR;
+ if ( in_tokz_esc )
+ { severity = INFO;
+ }else{
+ if (hdr_flag == FLAG_HEADERLESS)
+ { severity = WARNING;
+ }
+ }
+ tokenization_error( severity,
+ "ANSI Forth does not permit definition of names "
+ "longer than 31 characters.\n" );
+ }
+
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: definer_name
+ * Synopsis: Given a defining-word internal token, return
+ * a printable string for the definer, for use
+ * in an error-message.
+ *
+ * Inputs:
+ * Parameters:
+ * definer Internal token for the defining-word
+ * reslt_ptr Pointer to string-pointer that takes
+ * the result, if successful
+ *
+ * Outputs:
+ * Returned Value: TRUE if definer was recognized
+ * Supplied Pointers:
+ * *reslt_ptr If successful, points to printable string;
+ * otherwise, left unchanged.
+ *
+ *
+ **************************************************************************** */
+
+static bool definer_name(fwtoken definer, char **reslt_ptr)
+{
+ bool retval = TRUE;
+ switch (definer)
+ {
+ case VARIABLE:
+ *reslt_ptr = "VARIABLE";
+ break;
+ case DEFER:
+ *reslt_ptr = "DEFER";
+ break;
+ case VALUE:
+ *reslt_ptr = "VALUE";
+ break;
+ case BUFFER:
+ *reslt_ptr = "BUFFER";
+ break;
+ case CONST:
+ *reslt_ptr = "CONSTANT";
+ break;
+ case COLON:
+ *reslt_ptr = "COLON";
+ break;
+ case CREATE:
+ *reslt_ptr = "CREATE";
+ break;
+ case FIELD:
+ *reslt_ptr = "FIELD";
+ break;
+ case MACRO_DEF:
+ *reslt_ptr = "MACRO";
+ break;
+ case ALIAS:
+ *reslt_ptr = "ALIAS";
+ break;
+ case LOCAL_VAL:
+ *reslt_ptr = "Local Value name";
+ break;
+ default:
+ retval = FALSE;
+ }
+
+ return ( retval);
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: as_a_what
+ * Synopsis: Add the phrase "as a[n] <DEF'N_TYPE>" for the given
+ * definition-type to the given string buffer.
+ *
+ * Inputs:
+ * Parameters:
+ * definer Internal token for the defining-word
+ * as_what The string buffer to which to add.
+ *
+ * Outputs:
+ * Returned Value: TRUE if an assigned name was found
+ * for the given definer and text
+ * was added to the buffer.
+ * Supplied Pointers:
+ * *as_what Text is added to this buffer.
+ *
+ * Process Explanation:
+ * The calling routine is responsible to make sure the size of
+ * the buffer is adequate. Allow 25 for this routine.
+ * The added text will not have spaces before or after; if any
+ * are needed, they, too, are the responsibility of the
+ * calling routine. The return value gives a helpful clue.
+ *
+ **************************************************************************** */
+
+bool as_a_what( fwtoken definer, char *as_what)
+{
+ char *defn_type_name;
+ bool retval = definer_name(definer, &defn_type_name);
+ if ( retval )
+ {
+ strcat( as_what, "as a");
+ /* Handle article preceding definer name
+ * that starts with a vowel.
+ */
+ /* HACK: Only one definer name -- ALIAS --
+ * begins with a vowel. Take advantage
+ * of that...
+ * Otherwise, we'd need to do something involving
+ * strchr( "AEIOU", defn_type_name[0] )
+ */
+ if ( definer == ALIAS ) strcat( as_what, "n" );
+
+ strcat( as_what, " ");
+ strcat( as_what, defn_type_name);
+ }
+ return( retval);
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: lookup_word
+ * Synopsis: Find the TIC-entry for the given word in the Current
+ * mode -- relative to "Tokenizer-Escape" -- and
+ * Scope into which definitions are being entered.
+ * Optionally, prepare text for various Message types.
+ *
+ * Inputs:
+ * Parameters:
+ * stat_name Word to look up
+ * where_pt1 Pointer to result-display string, part 1
+ * NULL if not preparing text
+ * where_pt2 Pointer to result-display string, part 2
+ * NULL if not preparing text
+ * Global Variables:
+ * in_tokz_esc TRUE if in "Tokenizer Escape" mode.
+ * scope_is_global TRUE if "global" scope is in effect
+ * current_device_node Current dev-node data-struct
+ * ibm_locals TRUE if IBM-style Locals are enabled
+ *
+ * Outputs:
+ * Returned Value: Pointer to TIC-entry; NULL if not found
+ * Supplied Pointers:
+ * *where_pt1 Result display string, part 1 of 2
+ * *where_pt2 Result display string, part 2 of 2
+ *
+ * Process Explanation:
+ * We will set the two-part result-display string in this routine
+ * because only here do we know in which vocabulary the word
+ * was found.
+ * Pre-load the two parts of the result-display string.
+ * If we are in "Tokenizer Escape" mode, look up the word: first,
+ * in the "Tokenizer Escape" Vocabulary, or, if not found,
+ * among the "Shared" words.
+ * Otherwise, we're in Normal" mode. Look it up: first, among the
+ * Locals, if IBM-style Locals are enabled (it can possibly be
+ * one if "Tokenizer Escape" mode was entered during a colon-
+ * -definition); then, if it was not found and if "Device"
+ * scope is in effect, look in the current device-node; then,
+ * if not found, in the "core" vocabulary.
+ * Load the second part of the result-display string with the
+ * appropriate phrase for whereever it was found.
+ * Then adjust the first part of the result-display string with
+ * the definer, if known.
+ *
+ * The two strings will be formatted to be printed adjacently,
+ * without any additional spaces in the printf() format.
+ * The first part of the result-display string will not start with
+ * a space, but will have an intermediate space if necessary.
+ * The second part of the result-display string will not start
+ * with a space, and will contain the terminating new-line
+ * if appropriate. It might or might not have been built
+ * with a call to in_what_node().
+ *
+ * If the calling routine displays the result-display strings,
+ * it should follow-up with a call to show_node_start()
+ * This will be harmless if in_what_node() was not used
+ * in the construction of the result-display string.
+ * If the calling routine is NOT going to display the result strings,
+ * it should pass NULLs for the string-pointer pointers.
+ *
+ * The second part of the string consists of pre-coded phrases;
+ * therefore, we can directly assign the pointer.
+ * The first part of the string, however, has developed into
+ * something constructed "on the fly". Earlier, it, too,
+ * had been a directly-assignable pointer; all the callers
+ * to this routine expect that. Rather than change all the
+ * callers, we will assign a local buffer for it.
+ *
+ * Extraneous Remarks:
+ * We had to add the rule allowing where_pt1 or where_pt2 to be
+ * NULL after we introduced the in_what_node() function.
+ * We had cases where residue from a lookup for processing
+ * showed up later in an unrelated Message. The NULL rule
+ * should prevent that.
+ *
+ **************************************************************************** */
+
+static char lookup_where_pt1_buf[32];
+
+tic_hdr_t *lookup_word( char *stat_name, char **where_pt1, char **where_pt2 )
+{
+ tic_hdr_t *found = NULL;
+ bool trail_space = TRUE;
+ bool doing_lookup = BOOLVAL( ( where_pt1 != NULL )
+ && ( where_pt2 != NULL ) );
+ char *temp_where_pt2 = "in the core vocabulary.\n";
+
+ lookup_where_pt1_buf[0] = 0; /* Init'lz part-1 buffer */
+
+ /* "Core vocab" refers both to shared fwords and built-in tokens. */
+
+ /* Distinguish between "Normal" and "Tokenizer Escape" mode */
+ if ( in_tokz_esc )
+ { /* "Tokenizer Escape" mode. */
+ found = lookup_tokz_esc( stat_name);
+ if ( found != NULL )
+ {
+ temp_where_pt2 = in_tkz_esc_mode;
+ }else{
+ /* "Core vocabulary". */
+ found = lookup_shared_word( stat_name);
+ }
+ }else{
+ /* "Normal" tokenization mode */
+ if ( ibm_locals )
+ {
+ found = lookup_local( stat_name);
+ if ( doing_lookup && ( found != NULL ) )
+ {
+ trail_space = FALSE;
+ temp_where_pt2 = ".\n";
+ }
+ }
+
+ if ( found == NULL )
+ {
+ found = lookup_in_dev_node( stat_name);
+ if ( found != NULL )
+ {
+ if ( doing_lookup )
+ {
+ temp_where_pt2 = in_what_node( current_device_node);
+ }
+ }else{
+ /* "Core vocabulary". */
+ found = lookup_core_word( stat_name);
+ }
+ }
+ }
+
+ if ( ( doing_lookup ) && ( found != NULL ) )
+ {
+ if ( as_a_what( found->fword_defr, lookup_where_pt1_buf) )
+ {
+ if ( trail_space )
+ {
+ strcat(lookup_where_pt1_buf, " ");
+ }
+ }
+ *where_pt1 = lookup_where_pt1_buf;
+ *where_pt2 = temp_where_pt2;
+ }
+ return( found);
+}
+
+/* **************************************************************************
+ *
+ * Function name: word_exists
+ * Synopsis: Check whether a given word is already defined in the
+ * Current mode -- relative to "Tokenizer-Escape" --
+ * and Scope into which definitions are being entered.
+ * Used for error-reporting.
+ *
+ * Inputs:
+ * Parameters:
+ * stat_name Word to look up
+ * where_pt1 Pointer to string, part 1 of 2,
+ * to display in result
+ * where_pt2 Pointer to string, part 2 of 2,
+ * to display in result
+ *
+ * Outputs:
+ * Returned Value: TRUE if the name exists.
+ * Supplied Pointers:
+ * *where_pt1 Result display string, part 1 of 2
+ * *where_pt2 Result display string, part 2 of 2
+ *
+ * Process Explanation:
+ * If the calling routine displays the result-display strings,
+ * it should follow-up with a call to show_node_start()
+ *
+ * Extraneous Remarks:
+ * This used to be a much heftier routine; now it's just
+ * a wrapper around lookup_word() .
+ *
+ **************************************************************************** */
+
+bool word_exists( char *stat_name, char **where_pt1, char **where_pt2 )
+{
+ bool retval = FALSE;
+ tic_hdr_t *found = lookup_word( stat_name, where_pt1, where_pt2 );
+
+ if ( found != NULL )
+ {
+ retval = TRUE;
+ }
+
+ return( retval);
+}
+
+/* **************************************************************************
+ *
+ * Function name: warn_if_duplicate
+ * Synopsis: Check whether a given word is already defined in
+ * the current mode and issue a warning if it is.
+ *
+ * Inputs:
+ * Parameters:
+ * stat_name Word to check
+ * Global Variables:
+ * verbose_dup_warning Whether to run the check at all.
+ * Local Static Variables:
+ * do_not_overload FALSE if OVERLOAD is in effect.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * do_not_overload Restored to TRUE
+ * Printout:
+ * Warning message if a duplicate.
+ *
+ * Error Detection:
+ * None. This is merely an informative warning.
+ *
+ * Process Explanation:
+ * "Current mode" -- meaning, whether the tokenizer is operating
+ * in "Tokenizer Escape" mode or in normal tokenization mode --
+ * will be recognized by the word_exists() function.
+ *
+ * Extraneous Remarks:
+ * The OVERLOAD directive is our best shot at creating a more
+ * fine-grained way to temporarily bypass this test when
+ * deliberately overloading a name. It would be nice to have
+ * a mechanism, comparable to the classic
+ * WARNING @ WARNING OFF ..... WARNING !
+ * that could be applied to a range of definitions, but:
+ * (1) That would require more of a true FORTH infrastructure;
+ * hence, more effort than I am willing to invest, at
+ * this juncture, for such a small return,
+ * and
+ * (2) Most intentional-overloading ranges only cover a
+ * single definition anyway.
+ *
+ **************************************************************************** */
+
+void warn_if_duplicate( char *stat_name)
+{
+ if ( verbose_dup_warning && do_not_overload )
+ {
+ char *where_pt1;
+ char *where_pt2;
+ if ( word_exists( stat_name, &where_pt1, &where_pt2) )
+ {
+ tokenization_error( WARNING,
+ "Duplicate definition: %s already exists %s%s",
+ stat_name, where_pt1, where_pt2 );
+ show_node_start();
+ }
+ }
+ do_not_overload = TRUE;
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: glob_not_allowed
+ * Synopsis: Print a Message that "XXX is not allowed."
+ * because Global Scope is in effect.
+ * Used from several places...
+ *
+ * Inputs:
+ * Parameters:
+ * severity Severity of the Message
+ * not_ignoring FALSE = "Ignoring", for the part of the
+ * message about "How It's being Handled"
+ * Global Variables:
+ * statbuf Disallowed word currently being processed
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout: Message of given severity.
+ *
+ **************************************************************************** */
+
+static void glob_not_allowed( int severity, bool not_ignoring)
+{
+ tokenization_error( severity, "Global Scope is in effect; "
+ "%s not allowed. %s.\n",
+ strupr(statbuf),
+ not_ignoring ?
+ "Attempting to compensate.." :
+ "Ignoring" );
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: not_in_dict
+ * Synopsis: Print the message "XXX is not in dictionary."
+ * Used from several places...
+ *
+ * Inputs:
+ * Parameters:
+ * stat_name Word that could not be processed
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout: Error message.
+ *
+ **************************************************************************** */
+
+static void not_in_dict( char *stat_name)
+{
+ tokenization_error ( TKERROR,
+ "Word %s is not in dictionary.\n", stat_name);
+}
+
+/* **************************************************************************
+ *
+ * Function name: tokenized_word_error
+ * Synopsis: Report an error when a word could not be processed
+ * by the tokenizer. Messages will vary...
+ *
+ * Inputs:
+ * Parameters:
+ * stat_name Word that could not be processed
+ * Global Variables:
+ * in_tokz_esc TRUE if tokenizer is in "Tokenizer Escape" mode.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout: Error message. Possible Advisory about
+ *
+ * Error Detection:
+ * Error was detected by the calling routine...
+ *
+ * Process Explanation:
+ * If the tokenizer is in "Tokenizer Escape" mode, the word might
+ * be one that can be used in normal tokenization mode;
+ * Conversely, if the tokenizer is in normal-tokenization mode,
+ * the word might be one that can be used in the "Escape" mode.
+ * Or, the word is completely unknown.
+ * Recognizing the current mode is handled by word_exists()
+ * However, we need to test for the *converse* of the current mode,
+ * so before we call word_exists() we are going to save and
+ * invert the setting of in_tokz_esc (and afterwards, of
+ * course, restore it...)
+ *
+ **************************************************************************** */
+
+static void tokenized_word_error( char *stat_name)
+{
+ char *where_pt1;
+ char *where_pt2;
+ bool found_somewhere;
+
+ bool sav_in_tokz_esc = in_tokz_esc;
+ in_tokz_esc = INVERSE(sav_in_tokz_esc);
+
+ found_somewhere = word_exists( stat_name, &where_pt1, &where_pt2);
+ if ( found_somewhere )
+ {
+ tokenization_error ( TKERROR, "The word %s is %s recognized "
+ "in tokenizer-escape mode.\n",
+ stat_name, sav_in_tokz_esc ? "not" : "only" );
+ } else {
+ not_in_dict( stat_name);
+ }
+
+ if ( INVERSE(exists_in_ancestor( stat_name)) )
+ {
+ if ( found_somewhere && sav_in_tokz_esc )
+ {
+ tokenization_error(INFO,
+ "%s is defined %s%s", stat_name, where_pt1, where_pt2 );
+ show_node_start();
+ }
+ }
+
+ in_tokz_esc = sav_in_tokz_esc;
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: unresolved_instance
+ * Synopsis: Print the "unresolved instance" message
+ *
+ * Inputs:
+ * Parameters:
+ * severity Severity of the Message
+ * Local Static Variables:
+ * instance_filename File where "instance" invoked
+ * instance_lineno Line number where "instance" invoked
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout: Message.
+ *
+ * Error Detection:
+ * Error was detected by the calling routine...
+ *
+ **************************************************************************** */
+
+static void unresolved_instance( int severity)
+{
+ tokenization_error( severity, "Unresolved \"INSTANCE\"" );
+ just_where_started( instance_filename, instance_lineno );
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: modified_by_instance
+ * Synopsis: Print the "[not] modified by instance" message
+ *
+ * Inputs:
+ * Parameters:
+ * definer Internal token for the defining-word
+ * was_modded FALSE if "not modified..."
+ * Local Static Variables:
+ * instance_filename File where "instance" invoked
+ * instance_lineno Line number where "instance" invoked
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout: WARNING message.
+ *
+ * Error Detection:
+ * Error was detected by the calling routine...
+ *
+ **************************************************************************** */
+
+static void modified_by_instance( fwtoken definer, bool was_modded)
+{
+ char *was_not = was_modded ? "was" : "not" ;
+ char *defn_type_name;
+
+ /* No need to check the return value */
+ definer_name(definer, &defn_type_name);
+
+ tokenization_error ( WARNING,
+ "%s definition %s modified by \"INSTANCE\"",
+ defn_type_name, was_not );
+ just_where_started( instance_filename, instance_lineno );
+ }
+
+/* **************************************************************************
+ *
+ * Function name: validate_instance
+ * Synopsis: If "instance" is in effect, check whether it is
+ * appropriate to the defining-word being called.
+ *
+ * Inputs:
+ * Parameters:
+ * definer Internal token for the defining-word
+ * Local Static Variables:
+ * is_instance TRUE if "instance" is in effect.
+ * instance_definer_gap TRUE if invalid definer(s) invoked
+ * since "instance" went into effect.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * is_instance Reset to FALSE if definer was valid.
+ * instance_definer_gap TRUE if definer was not valid;
+ * FALSE if definer was valid.
+ *
+ * Error Detection:
+ * If "instance" is in effect, the only defining-words that are
+ * valid are: value variable defer or buffer: Attempts
+ * to use any other defining-word will be reported with a
+ * WARNING, but "instance" will remain in effect.
+ * If an invalid defining-word was invoked since "instance" went
+ * into effect, then, when it is finally applied to a valid
+ * definer, issue a WARNING.
+ *
+ * Process Explanation:
+ * Implicit in the Standard is the notion that, once INSTANCE has
+ * been executed, it remains in effect until a valid defining-
+ * word is encountered. We will do the same.
+ *
+ **************************************************************************** */
+
+static void validate_instance(fwtoken definer)
+{
+ if ( is_instance )
+ {
+ bool is_error = TRUE ;
+
+ switch ( definer)
+ {
+ case VALUE:
+ case VARIABLE:
+ case DEFER:
+ case BUFFER:
+ is_error = FALSE;
+ /* No default needed, likewise, no breaks; */
+ /* but some compilers get upset without 'em... */
+ default:
+ break;
+ }
+
+ if( is_error )
+ {
+ modified_by_instance(definer, FALSE );
+ instance_definer_gap = TRUE;
+ }else{
+ if ( instance_definer_gap )
+ {
+ modified_by_instance(definer, TRUE );
+ }
+ is_instance = FALSE;
+ instance_definer_gap = FALSE;
+ }
+ }
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: trace_creation
+ * Synopsis: If the word being created is on the Trace List,
+ * display the appropriate message
+ *
+ * Inputs:
+ * Parameters:
+ * definer Internal token for the defining-word
+ * nu_name The word being created
+ * Global Variables:
+ * verbose No point in doing all this if we're
+ * not showing the message anyway...
+ * in_tokz_esc TRUE if we are in Tokenizer-Escape mode
+ * scope_is_global TRUE if "global" scope is in effect
+ * current_device_node Current dev-node data-struct
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout:
+ * Advisory Message, if the word is on the Trace List.
+ *
+ * Process Explanation:
+ * The order of scope-checking is important:
+ * A Local has no scope beyond the definition in which it occurs.
+ * Tokenizer-Escape mode supercedes "Normal" mode, and renders
+ * moot the differences between Global and Device scope.
+ * Global scope is mutually exclusive with Device scope.
+ * Device scope needs to identify where the Current device-node
+ * began.
+ *
+ **************************************************************************** */
+
+void trace_creation( fwtoken definer, char *nu_name)
+{
+ if ( verbose )
+ {
+ if ( is_on_trace_list( nu_name) )
+ {
+ char as_what[96] = "";
+ bool show_last_colon = BOOLVAL( definer == LOCAL_VAL);
+
+ as_a_what( definer, as_what); /* No need to check return value. */
+
+ /* Scope-checking starts here, unless show_last_colon is TRUE.
+ * Come out of this with as_what[] filled up and
+ * terminated with a new-line, if appropriate,
+ */
+ while ( ! show_last_colon )
+ {
+ strcat( as_what, " ");
+
+ if ( in_tokz_esc )
+ {
+ strcat( as_what, in_tkz_esc_mode);
+ break;
+ }
+
+ if ( scope_is_global )
+ {
+ strcat( as_what, "with Global scope.\n");
+ }else{
+ /* In Device scope. Show the Current node. */
+ strcat( as_what, in_what_node( current_device_node));
+ }
+ break;
+
+ } /* Destination of BREAKs ... */
+
+ tokenization_error(INFO, "Creating %s %s", nu_name, as_what);
+
+ if ( show_last_colon )
+ {
+ in_last_colon();
+ }else{
+ show_node_start();
+ }
+
+ }
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: create_word
+ * Synopsis:
+ *
+ * Inputs:
+ * Parameters:
+ * definer Internal token for the defining-word
+ * Global Variables:
+ * control_stack_depth Number of "Control Stack" entries in effect
+ * nextfcode FCode-number to be assigned to the new name
+ * statbuf Symbol last read from the input stream
+ * pc Input-source Scanning pointer
+ * hdr_flag State of headered-ness for name-creation
+ * force_tokens_case If TRUE, force token-names' case in FCode
+ * force_lower_case_tokens
+ * If force_tokens_case is TRUE, this
+ * determines which case to force
+ * iname Input-source file name; for error-reporting
+ * lineno Input-source Line number; also for err-rep't
+ *
+ * Outputs:
+ * Returned Value: TRUE if successful
+ * Global Variables:
+ * nextfcode Incremented (by bump_fcode() )
+ * statbuf Advanced to next symbol; must be re-read
+ * pc Advanced, then restored to previous value
+ * Memory Allocated
+ * Copy of the name being defined, by support routine.
+ * Copy of input-source file name, for error-reporting
+ * When Freed?
+ * Copy of name being defined is freed when Current Device Vocab
+ * is "finished", or at end of tokenization.
+ * Copy of input-source file name is freed at end of this routine.
+ *
+ * Error Detection:
+ * ERROR if already inside a colon-definition. Discontinue
+ * processing and return FALSE.
+ * ERROR if inside a control-structure. Continue processing,
+ * though, to catch other errors, and even return TRUE;
+ * except: leave the new token undefined.
+ * Warning on duplicate name (subject to command-line control)
+ * Message if name is excessively long; Warning if headerless.
+ * FATAL if the value of nextfcode is larger than the legal
+ * maximum for an FCode, (0x0fff).
+ *
+ * Revision History:
+ * Updated Thu, 24 Mar 2005 by David L. Paktor
+ * Optional warning when name about to be created is a
+ * duplicate of an existing name.
+ * Updated Wed, 30 Mar 2005 by David L. Paktor
+ * Warning when name length exceeds ANSI-specified max (31 chars).
+ * Updated Tue, 05 Apr 2005 by David L. Paktor
+ * Add "definer" parameter and call to add_definer() . Part
+ * of the mechanism to forbid attempts to use the TO
+ * directive to change values of CONSTANTs in particular
+ * and of inappropriate targets in general.
+ * Updated Fri, 06 May 2005 by David L. Paktor
+ * Error-detection of DO ... LOOP and BEGIN ... imbalance
+ * Error-detection of nextfcode exceeding legal maximum (0x0fff).
+ * Updated Wed, 20 Jul 2005 by David L. Paktor
+ * Put Duplicate-Name-Test under command-line control...
+ * Updated Wed, 24 Aug 2005 by David L. Paktor
+ * Error-detection via clear_control_structs() routine.
+ * Updated Tue, 10 Jan 2006 by David L. Paktor
+ * Convert to tic_hdr_t type vocabulary.
+ * Updated Thu, 20 Apr 2006 by David L. Paktor
+ * Allow creation of new definition within body of a flow-control
+ * structure. (Remove error-detection via clear_control_structs)
+ * Updated Tue, 13 Jun 2006 by David L. Paktor
+ * Move detection of out-of-bounds nextfcode to assigning_fcode()
+ * routine, which also detects Overlapping Ranges error.
+ * Updated Thu, 27 Jun 2006 by David L. Paktor
+ * Report Error for attempt to create def'n inside control structure.
+ *
+ * Extraneous Remarks:
+ * We must not set incolon to TRUE (if we are creating a colon
+ * definition) until *AFTER* this routine has been called, due
+ * to the initial error-checking. If we need to detect whether
+ * we are creating a colon definition, we can do so by testing
+ * whether the parameter, DEFINER, equals COLON .
+ *
+ **************************************************************************** */
+
+static bool create_word(fwtoken definer)
+{
+ signed long wlen;
+ bool retval = FALSE;
+ char *defn_type_name;
+
+ /* If already inside a colon, ERROR and discontinueprocessing */
+ /* If an alias to a definer is used, show the name of the alias */
+ if ( test_in_colon(statbuf, FALSE, TKERROR, NULL) )
+ {
+ char defn_type_buffr[32] = "";
+ unsigned int old_lineno = lineno; /* For error message */
+ bool define_token = TRUE;
+
+ { /* Set up definition-type text for error-message */
+
+ /* No need to check the return value */
+ definer_name(definer, &defn_type_name);
+
+ strcat( defn_type_buffr, defn_type_name);
+ strcat( defn_type_buffr, " definition");
+ }
+ /* If in a control-structure, ERROR but continue processing */
+ if ( control_stack_depth != 0 )
+ {
+ announce_control_structs( TKERROR, defn_type_buffr, 0);
+ /* Leave the new token undefined. */
+ define_token = FALSE;
+ }
+
+ /* Get the name of the new token */
+ wlen = get_word();
+
#ifdef DEBUG_SCANNER
printf("%s:%d: debug: defined new word %s, fcode no 0x%x\n",
iname, lineno, name, nextfcode);
#endif
- add_token(nextfcode, name);
- if (flags) {
- if (flags&FLAG_EXTERNAL)
- emit_token("external-token");
- else
- emit_token("named-token");
- emit_string((u8 *)name, wlen);
- } else
- emit_token("new-token");
+ if ( wlen <= 0 )
+ {
+ warn_unterm( TKERROR, defn_type_buffr, old_lineno);
+ }else{
+ bool emit_token_name = TRUE;
+
+ /* Handle Tracing of new definitions */
+ trace_creation( definer, statbuf);
+
+ /* Other Error or Warnings as applicable */
+ validate_instance( definer);
+ warn_if_duplicate( statbuf);
+ check_name_length( wlen);
+
+ /* Bump FCode; error-check as applicable */
+ assigning_fcode();
+
+ /* Define the new token, unless disallowed */
+ add_to_current( statbuf, nextfcode, definer, define_token);
+
+ /* Emit appropriate FCodes: Type of def'n, */
+ switch ( hdr_flag )
+ {
+ case FLAG_HEADERS:
+ emit_token("named-token");
+ break;
+
+ case FLAG_EXTERNAL:
+ emit_token("external-token");
+ break;
+
+ default: /* FLAG_HEADERLESS */
+ emit_token("new-token");
+ emit_token_name = FALSE;
+ }
+
+ /* Emit name of token, if applicable */
+ if ( emit_token_name )
+ {
+ if ( force_tokens_case )
+ {
+ if ( force_lower_case_tokens )
+ {
+ strlwr( statbuf);
+ }else{
+ strupr( statbuf);
+ }
+ }
+ emit_string((u8 *)statbuf, wlen);
+ }
+
+ /* Emit the new token's FCode */
+ emit_fcode(nextfcode);
+
+ /* Prepare FCode Assignment Counter for next definition */
+ bump_fcode();
+
+ /* Declare victory */
+ retval = TRUE;
+ }
+ }
+ return( retval);
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: cannot_apply
+ * Synopsis: Print error message of the form:
+ * "Cannot apply <func> to <targ>, which is a <def'n>"
+ *
+ * Inputs:
+ * Parameters:
+ * func_nam The name of the function
+ * targ_nam The name of the target
+ * defr The numeric-code of the definer-type
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout:
+ * The error message is the entire printout of this routine
+ *
+ * Error Detection:
+ * Error was detected by calling routine
+ *
+ * Process Explanation:
+ * The calling routine already looked up the definer for its
+ * own purposes, so we don't need to do that again here.
+ *
+ * Still to be done:
+ * If the definer-name is not found, we might still look up
+ * the target name in the various vocabularies and use
+ * a phrase for those. E.g., if it is a valid token,
+ * we could say it's defined as a "primitive". (I'm
+ * not sure what we'd say about an FWord...)
+ *
+ **************************************************************************** */
+
+static void cannot_apply( char *func_nam, char *targ_nam, fwtoken defr)
+{
+ char *defr_name = "" ;
+ const char *defr_phrase = ", which is defined as a " ;
+
+ if ( ! definer_name(defr, &defr_name) )
+ {
+ defr_phrase = "";
+ }
+
+ tokenization_error ( TKERROR ,
+ "Cannot apply %s to %s %s%s.\n",
+ func_nam, targ_nam, defr_phrase, defr_name );
+
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: lookup_with_definer
+ * Synopsis: Return pointer to data-structure of named word,
+ * if it's valid in Current context, and supply its
+ * definer. If it's not valid in Current context,
+ * see if it might be a Local, and supply that definer.
+ *
+ * Inputs:
+ * Parameters:
+ * stat_name Name to look up
+ * *definr Pointer to place to put the definer.
+ *
+ * Outputs:
+ * Returned Value: Pointer to data-structure, or
+ * NULL if not in Current context.
+ * Supplied Pointers:
+ * *definr Definer; possibly LOCAL_VAL
+ *
+ * Process Explanation:
+ * If the name is not found in the Current context, and does not
+ * exist as a Local, *definr will remain unchanged.
+ *
+ * Extraneous Remarks:
+ * This is an odd duck^H^H^H^H^H^H^H^H^H^H^H^H a highly-specialized
+ * routine created to meet some corner-case needs engendered by
+ * the conversion to tic_hdr_t vocabularies all around, combined
+ * with an obsessive urge to preserve a high level of detail in
+ * our error-messages.
+ *
+ **************************************************************************** */
+
+static tic_hdr_t *lookup_with_definer( char *stat_name, fwtoken *definr )
+{
+ tic_hdr_t *retval = lookup_current( stat_name);
+ if ( retval != NULL )
+ {
+ *definr = retval->fword_defr;
+ }else{
+ if ( exists_as_local( stat_name) ) *definr = LOCAL_VAL;
+ }
+ return ( retval );
+}
+
+/* **************************************************************************
+ *
+ * Function name: validate_to_target
+ * Synopsis: Print a message if the intended target
+ * of the TO directive is not valid
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * statbuf Next symbol to be read from the input stream
+ * pc Input-source Scanning pointer
+ *
+ * Outputs:
+ * Returned Value: TRUE = Allow b(to) token to be output.
+ * Global Variables:
+ * statbuf Advanced to next symbol; must be re-read
+ * pc Advanced, then restored to previous value
+ *
+ * Error Detection:
+ * If next symbol is not a valid target of TO , issue ERROR
+ * message. Restored pc will cause the next symbol to
+ * be processed by ordinary means.
+ * Allow b(to) token to be output in selected cases. Even if
+ * user has set the "Ignore Errors" flag, certain targets are
+ * still too risky to be allowed to follow a b(to) token;
+ * if "Ignore Errors" is not set, output won't get created
+ * anyway.
+ * Issue ERROR in the extremely unlikely case that "to" is the
+ * last word in the Source.
+ *
+ * Process Explanation:
+ * Valid targets for a TO directive are words defined by:
+ * DEFER, VALUE and arguably VARIABLE. We will also allow
+ * CONSTANT, but will still issue an Error message.
+ * After the check, restore pc ; this was only a look-ahead.
+ * Also restore lineno and abs_token_no
+ *
+ * Extraneous Remarks:
+ * Main part of the mechanism to detect attempts to use the TO
+ * directive to change the values of CONSTANTs in particular
+ * and of inappropriate targets in general.
+ *
+ **************************************************************************** */
+
+static bool validate_to_target( void )
+{
+ signed long wlen;
+ tic_hdr_t *test_entry;
+ u8 *saved_pc = pc;
+ char *cmd_cpy = strupr( strdup( statbuf)); /* For error message */
+ unsigned int saved_lineno = lineno;
+ unsigned int saved_abs_token_no = abs_token_no;
+ fwtoken defr = UNSPECIFIED ;
+ bool targ_err = TRUE ;
+ bool retval = FALSE ;
+
+ wlen = get_word();
+ if ( wlen <= 0 )
+ {
+ warn_unterm( TKERROR, cmd_cpy, saved_lineno);
+ }else{
+
+ test_entry = lookup_with_definer( statbuf, &defr);
+ if ( test_entry != NULL )
+ {
+ switch (defr)
+ {
+ case VARIABLE:
+ tokenization_error( WARNING,
+ "Applying %s to a VARIABLE (%s) is "
+ "not recommended; use ! instead.\n",
+ cmd_cpy, statbuf);
+ case DEFER:
+ case VALUE:
+ targ_err = FALSE ;
+ case CONST:
+ retval = TRUE ;
+ /* No default needed, likewise, no breaks; */
+ /* but some compilers get upset without 'em... */
+ default:
+ break;
+ }
+ }
+
+ if ( targ_err )
+ {
+ cannot_apply(cmd_cpy, strupr(statbuf), defr );
+ }
+
+ pc = saved_pc;
+ lineno = saved_lineno;
+ abs_token_no = saved_abs_token_no;
+ }
+ free( cmd_cpy);
+ return( retval);
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: you_are_here
+ * Synopsis: Display a generic Advisory of the Source command
+ * or directive encountered and being processed
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * statbuf The command being processed
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout:
+ * Advisory message
+ *
+ **************************************************************************** */
+
+static void you_are_here( void)
+{
+ tokenization_error( INFO,
+ "%s encountered; processing...\n",
+ strupr(statbuf) );
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: fcode_starter
+ * Synopsis: Respond to one of the "FCode Starter" words
+ *
+ * Inputs:
+ * Parameters:
+ * token_name The FCode-token for this "Starter" word
+ * spread The separation between tokens.
+ * is_offs16 Whether we are using a 16-bit number
+ * for branch- (and suchlike) -offsets,
+ * or the older-style 8-bit offset numbers.
+ * Global Variables:
+ * iname Input-File name, used to set ifile_name
+ * field of current_device_node
+ * lineno Current Input line number, used to set
+ * line_no field of current_device_node
+ * Local Static Variables:
+ * fcode_started If this is TRUE, we have an Error.
+ * first_fc_starter Control calling reset_fcode_ranges() ;
+ * only on the first fcode_starter of
+ * a tokenization.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * offs16 Global "16-bit-offsets" flag
+ * current_device_node The ifile_name and line_no fields will be
+ * loaded with the current input file name
+ * and line number. This node will be the
+ * top-level device-node.
+ * FCode Ranges will be reset the first time per tokenization
+ * that this routine is entered.
+ * A new FCode Range will be started every time after that.
+ * Local Static Variables:
+ * fcode_started Set to TRUE. We invoke the starter only
+ * once per image-block.
+ * first_fc_starter Reset to FALSE if not already
+ * Memory Allocated
+ * Duplicate of Input-File name
+ * When Freed?
+ * In fcode_ender()
+ *
+ * Error Detection:
+ * Spread of other than 1 -- Warning message.
+ * "FCode Starter" previously encountered -- Warning and ignore.
+ *
+ * Question under consideration:
+ * Do we want directives -- such as definitions of constants --
+ * supplied before the "FCode Starter", to be considered as
+ * taking place in "Tokenizer Escape" mode? That would mean
+ * the "Starter" functions must be recognized in "Tokenizer
+ * Escape" mode. Many ramifications to be thought through...
+ * I think I'm coming down strongly on the side of "No". The user
+ * who wants to do that can very well invoke "Tokenizer Escape"
+ * mode explicitly.
+ *
+ **************************************************************************** */
+
+static void fcode_starter( const char *token_name, int spread, bool is_offs16)
+{
+ you_are_here();
+ if ( spread != 1 )
+ {
+ tokenization_error( WARNING, "spread of %d not supported.\n", spread);
+ }
+ if ( fcode_started )
+ {
+ tokenization_error( WARNING,
+ "Only one \"FCode Starter\" permitted per tokenization. "
+ "Ignoring...\n");
+ } else {
+
+ emit_fcodehdr(token_name);
+ offs16 = is_offs16;
+ fcode_started = TRUE;
+
+ current_device_node->ifile_name = strdup(iname);
+ current_device_node->line_no = lineno;
+
+ if ( first_fc_starter )
+ {
+ reset_fcode_ranges();
+ first_fc_starter = FALSE;
+ }else{
+ set_next_fcode( nextfcode);
+ }
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: fcode_end_err_check
+ * Synopsis: Do error-checking at end of tokenization,
+ * whether due to FCODE-END or end-of-file,
+ * and reset the indicators we check.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * Data-Stack depth Is anything left on the stack?
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * Data-Stack Reset to empty
+ *
+ * Error Detection:
+ * Unresolved control structures detected by clear_control_structs()
+ * If anything is left on the stack, it indicates some incomplete
+ * condition; we will treat it as a Warning.
+ *
+ **************************************************************************** */
+
+static void fcode_end_err_check( void)
+{
+ bool stack_imbal = BOOLVAL( stackdepth() != 0 );
+
+ if ( stack_imbal )
+ {
+ tokenization_error( WARNING,
+ "Stack imbalance before end of tokenization.\n");
+ }
+ clear_stack();
+ clear_control_structs("End of tokenization");
+}
+
+/* **************************************************************************
+ *
+ * Function name: fcode_ender
+ * Synopsis: Respond to one of the "FCode Ender" words:
+ * The FCode-token for "End0" or "End1"
+ * has already been written to the
+ * FCode Output buffer.
+ * Finish the FCode header: fill in its
+ * checksum and length.
+ * Reset the token names defined in "normal" mode
+ * (Does not reset the FCode-token number)
+ *
+ * Associated FORTH words: END0, END1
+ * Associated Tokenizer directive: FCODE-END
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * incolon If TRUE, a colon def'n has not been completed
+ * last_colon_filename For error message.
+ * last_colon_lineno For error message.
+ * scope_is_global For error detection
+ * is_instance For error detection
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * haveend Set to TRUE
+ * fcode_started Reset to FALSE. Be ready to start anew.
+ * FCode-defined tokens, aliases and macros -- i.e., those
+ * *NOT* defined in tokenizer-escape mode -- are reset.
+ * (Also, command-line-defined symbols are preserved).
+ * Vocabularies will be reset
+ * Device-node data structures will be deleted
+ * Top-level device-node ifile_name and line_no fields
+ * will be reset.
+ * Memory Freed
+ * Duplicate of Input-File name, in top-level device-node.
+ * Printout:
+ * Advisory message giving current value of nextfcode
+ * (the "FCode-token Assignment Counter")
+ *
+ * Error Detection:
+ * ERROR if a Colon definition has not been completed.
+ * ERROR if "instance" is still in effect
+ * WARNING if Global-Scope has not been terminated; compensate.
+ *
+ * Extraneous Remarks:
+ * In order to accommodate odd cases, such as multiple FCode blocks
+ * within a single PCI header, this routine does not automatically
+ * reset nextfcode to h# 0800
+ *
+ **************************************************************************** */
+
+void fcode_ender(void)
+{
+ if ( incolon )
+ {
+ char *tmp_iname = iname;
+ iname = last_colon_filename;
+ unterm_is_colon = TRUE;
+ warn_unterm( TKERROR, "Colon Definition", last_colon_lineno);
+ iname = tmp_iname;
+ }
+
+ haveend = TRUE;
+
+ if ( is_instance )
+ {
+ unresolved_instance( TKERROR);
+ }
+
+ if ( scope_is_global )
+ {
+ tokenization_error( WARNING ,
+ "No DEVICE-DEFINITIONS directive encountered before end. "
+ "Compensating...\n");
+ resume_device_scope();
+ }
+ fcode_end_err_check();
+ reset_normal_vocabs();
+ finish_fcodehdr();
+ fcode_started = FALSE;
+
+ if ( current_device_node->ifile_name != default_top_dev_ifile_name )
+ {
+ free( current_device_node->ifile_name );
+ current_device_node->ifile_name = default_top_dev_ifile_name;
+ current_device_node->line_no = 0;
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: get_token
+ * Synopsis: Read the next word in the input stream and retrieve
+ * its FCode-token number. If it's not a symbol to
+ * which a single token is assigned (e.g., if it's
+ * a macro), report an error.
+ *
+ * Associated FORTH words: ['] '
+ * Associated Tokenizer directive: F[']
+ *
+ * Inputs:
+ * Parameters:
+ * *tok_entry Place to put the pointer to token entry
+ * Global Variables:
+ * statbuf The command being processed
+ * pc Input stream character pointer
+ *
+ * Outputs:
+ * Returned Value: TRUE if successful (i.e., no error)
+ * Supplied Pointers:
+ * *tok_entry The token entry, if no error
+ * Global Variables:
+ * statbuf The next word in the input stream
+ * pc Restored to previous value if error
+ *
+ * Error Detection:
+ * The next word in the input stream is expected to be on the
+ * same line as the directive. The get_word_in_line()
+ * routine will check for that.
+ * If the next word in the input stream is not a symbol
+ * for which a single-token FCode number is assigned,
+ * report an ERROR and restore PC to its previous value.
+ *
+ **************************************************************************** */
+
+static bool get_token(tic_hdr_t **tok_entry)
+{
+ bool retval = FALSE;
+ u8 *save_pc;
+
+ /* Copy of command being processed, for error message */
+ char cmnd_cpy[FUNC_CPY_BUF_SIZE+1];
+ strncpy( cmnd_cpy, statbuf, FUNC_CPY_BUF_SIZE);
+ cmnd_cpy[FUNC_CPY_BUF_SIZE] = 0; /* Guarantee null terminator. */
+
+ save_pc = pc;
+
+ if ( get_word_in_line( statbuf) )
+ {
+ fwtoken defr = UNSPECIFIED;
+
+ /* We need to scan the newest definitions first; they
+ * might supercede standard ones. We need, though,
+ * to bypass built-in FWords that need to trigger
+ * some tokenizer internals before emitting their
+ * synonymous FCode Tokens, (e.g., version1 , end0 ,
+ * and start{0-4}); if we find one of those, we will
+ * need to search again, specifically within the list
+ * of FCode Tokens.
+ */
+ *tok_entry = lookup_with_definer( statbuf, &defr);
+ if ( *tok_entry != NULL )
+ {
+ /* Built-in FWords can be uniquely identified by their
+ * definer, BI_FWRD_DEFN . The definer for "shared"
+ * FWords is COMMON_FWORD but there are none of
+ * those that might be synonymous with legitimate
+ * FCode Tokens, nor are any likely ever to be...
+ */
+ if ( defr == BI_FWRD_DEFN )
+ {
+ *tok_entry = lookup_token( statbuf);
+ retval = BOOLVAL( *tok_entry != NULL );
+ }else{
+ retval = entry_is_token( *tok_entry);
+ }
+ }
+
+ if ( INVERSE( retval) )
+ {
+ cannot_apply( cmnd_cpy, strupr(statbuf), defr );
+ pc = save_pc;
+ }
+ }
+
+ return ( retval );
+}
+
+
+static void base_change ( int new_base )
+{
+ if ( incolon && ( INVERSE( in_tokz_esc) ) )
+ {
+ emit_literal(new_base );
+ emit_token("base");
+ emit_token("!");
+ } else {
+ base = new_base;
+ }
+}
+
+static void base_val (int new_base)
+{
+ u8 *old_pc;
+
+ char base_cmnd[FUNC_CPY_BUF_SIZE+1];
+ strncpy( base_cmnd, statbuf, FUNC_CPY_BUF_SIZE);
+ base_cmnd[FUNC_CPY_BUF_SIZE] = 0; /* Guarantee NULL terminator */
+
+ old_pc=pc;
+ if ( get_word_in_line( statbuf) )
+ {
+ u8 basecpy=base;
+
+ base = new_base;
+ if ( ! handle_number() )
+ {
+ /* We did get a word on the line, but it's not a valid number */
+ tokenization_error( WARNING ,
+ "Applying %s to non-numeric value. Ignoring.\n",
+ strupr(base_cmnd) );
+ pc = old_pc;
+ }
+ base=basecpy;
+ }
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: eval_string
+ * Synopsis: Prepare to tokenize a string, artificially generated
+ * by this program or created as a user-defined
+ * Macro. When done, resume at existing source.
+ * Keep the file-name and line-number unchanged.
+ *
+ * Inputs:
+ * Parameters:
+ * inp_bufr String (or buffer) to evaluate
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables, changed by call to init_inbuf():
+ * start Points to given string
+ * pc ditto
+ * end Points to end of given string
+ *
+ * Revision History:
+ * Updated Thu, 23 Feb 2006 by David L. Paktor
+ * This routine no longer calls its own instance of tokenize()
+ * It has become the gateway to the mechanism that makes a
+ * smooth transition between the body of the Macro, User-
+ * defined Symbol or internally-generated string and the
+ * resumption of processing the source file.
+ * A similar (but more complicated) transition when processing
+ * an FLOADed file will be handled elsewhere.
+ * Updated Fri, 24 Feb 2006 by David L. Paktor
+ * In order to support Macro-recursion protection, this routine
+ * is no longer the gateway for Macros; they will have to
+ * call push_source() directly.
+ *
+ **************************************************************************** */
+
+void eval_string( char *inp_bufr)
+{
+ push_source( NULL, NULL, FALSE);
+ init_inbuf( inp_bufr, strlen(inp_bufr));
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: finish_or_new_device
+ * Synopsis: Handle the shared logic for the NEW-DEVICE and
+ * FINISH-DEVICE commands.
+ *
+ * Inputs:
+ * Parameters:
+ * finishing_device TRUE for FINISH-DEVICE,
+ * FALSE for NEW-DEVICE
+ * Global Variables:
+ * incolon TRUE if inside a colon definition
+ * noerrors TRUE if ignoring errors
+ * scope_is_global TRUE if "global scope" in effect
+ * Local Static Variables:
+ * is_instance TRUE if "instance" is in effect
+ * dev_change_instance_warning TRUE if warning hasn't been issued
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * dev_change_instance_warning FALSE if warning is issued
+ * instance_definer_gap TRUE if "instance" is in effect
+ *
+ * Error Detection:
+ * NEW-DEVICE and FINISH-DEVICE should not be used outside of
+ * a colon-definition if global-scope is in effect. Error
+ * message; no further action unless we are ignoring errors.
+ * Issue a WARNING if INSTANCE wasn't resolved before the current
+ * device-node is changed. Try not to be too repetitive...
+ *
+ * Process Explanation:
+ * The words NEW-DEVICE and FINISH-DEVICE may be incorporated into
+ * a colon-definition, whether the word is defined in global-
+ * or device- -scope. Such an incorporation does not effect
+ * a change in the device-node vocabulary; simply emit the token.
+ * If we are in interpretation mode, though, we need to check for
+ * errors before changing the device-node vocabulary:
+ * If global-scope is in effect, we need to check whether we are
+ * ignoring errors; if so, we will compensate by switching to
+ * device-scope.
+ * If "instance" is in effect, it's "dangling". It will remain
+ * in effect through a device-node change, but this is very
+ * bad style and deserves a WARNING, but only one for each
+ * occurrence. It would be unaesthetic, to say the least,
+ * to have multiple messages for the same dangling "instance"
+ * in a "finish-device new-device" sequence.
+ * We must be careful about the order we do things, because of
+ * the messages printed as a side-effect of the node change...
+ *
+ * Extraneous Remarks:
+ * I will violate strict structure here.
+ *
+ **************************************************************************** */
+
+static void finish_or_new_device( bool finishing_device )
+{
+ if ( INVERSE( incolon ) )
+ {
+ if ( INVERSE( is_instance) )
+ {
+ /* Arm warning for next time: */
+ dev_change_instance_warning = TRUE;
+ }else{
+ /* Dangling "instance" */
+ instance_definer_gap = TRUE;
+ /* Warn only once. */
+ if ( dev_change_instance_warning )
+ {
+ unresolved_instance( WARNING);
+ dev_change_instance_warning = FALSE;
+ }
+ }
+
+ /* Note: "Instance" cannot be in effect during "global" scope */
+ if ( scope_is_global )
+ {
+ glob_not_allowed( TKERROR, noerrors );
+ if ( noerrors )
+ {
+ resume_device_scope();
+ }else{
+ return;
+ }
+ }
+
+ if ( finishing_device )
+ {
+ finish_device_vocab();
+ }else{
+ new_device_vocab();
+ }
+ }
+ emit_token( finishing_device ? "finish-device" : "new-device" );
+ }
- emit_fcode(nextfcode);
- nextfcode++;
+
+/* **************************************************************************
+ *
+ * Function name: abort_quote
+ * Synopsis: Optionally implement the ABORT" function as
+ * though it were a macro. Control whether to allow
+ * it, and which style to support, via switches set
+ * on the command-line at run-time.
+ *
+ * Inputs:
+ * Parameters:
+ * tok Numeric-code associated with the
+ * FORTH word that was just read.
+ * Global Variables:
+ * enable_abort_quote Whether to allow ABORT"
+ * sun_style_abort_quote SUN-style versus Apple-style
+ * abort_quote_throw Whether to use -2 THROW vs ABORT
+ *
+ * Outputs:
+ * Returned Value: TRUE if it was handled
+ * Global Variables:
+ * report_multiline Reset to FALSE.
+ * Printout:
+ * ADVISORY: ABORT" in fcode is not defined by IEEE 1275-1994
+ *
+ * Error Detection:
+ * Performed by other routines. If user selected not to
+ * allow ABORT" , it will simply be treated as an
+ * unknown word.
+ * The string following it, however, will still be consumed.
+ *
+ * Process Explanation:
+ * If the supplied tok was not ABORTTXT , then return FALSE.
+ * If the enable_abort_quote flag is FALSE, consume the
+ * string following the Abort" token, but be careful to
+ * leave the Abort" token in statbuf, as it will be used
+ * for the error message.
+ * Otherwise, create and prepare for processing the appropriate Macro:
+ * For Apple Style, we push the specified string onto the stack
+ * and do -2 THROW (and hope the stack unwinds correctly).
+ * For Sun Style, we test the condition on top of the stack,
+ * and if it's true, print the specified string before we
+ * do the -2 THROW.
+ * We perform the underlying operations directly: placing an "IF"
+ * (if Sun Style), then placing the string. This bypasses
+ * any issues of double-parsing, as well as of doubly checking
+ * for a multi-line string.
+ * Finally, we perform the operational equivalents of the remainder
+ * of the command sequence.
+ *
+ * Extraneous Remarks:
+ * I would have preferred not to have to directly perform the under-
+ * lying operations, and instead simply prepare the entire command
+ * sequence in a buffer, but I needed to handle the case where
+ * quote-escaped quotes are included in the string: If the string
+ * were simply to be reproduced into the buffer, the quote-escaped
+ * quotes would appear as plain quote-marks and terminate the
+ * string parsing prematurely, leaving the rest of the string
+ * to be treated as code instead of text...
+ * Also, the introduction of the variability of whether to do the
+ * -2 THROW or to compile-in the token for ABORT makes the
+ * buffer-interpretation scheme somewhat too messy for my tastes.
+ *
+ **************************************************************************** */
+
+static bool abort_quote( fwtoken tok)
+{
+ bool retval = FALSE;
+ if ( tok == ABORTTXT )
+ {
+ if ( ! enable_abort_quote )
+ {
+ /* ABORT" is not enabled; we'd better consume the string */
+ char *save_statbuf;
+ signed long wlen;
+ save_statbuf = strdup( (char *)statbuf);
+ wlen = get_string( FALSE);
+ strcpy( statbuf, save_statbuf);
+ free( save_statbuf);
+ }else{
+ /* ABORT" is not to be used in FCODE drivers
+ * but Apple drivers do use it. Therefore we
+ * allow it. We push the specified string to
+ * the stack, do -2 THROW and hope that THROW
+ * will correctly unwind the stack.
+ * Presumably, Apple Source supplies its own
+ * IF ... THEN
+ */
+ char *abort_string;
+ signed long wlen;
- return 0;
+ retval = TRUE;
+ tokenization_error (INFO, "ABORT\" in fcode not "
+ "defined by IEEE 1275-1994\n");
+ test_in_colon("ABORT\"", TRUE, TKERROR, NULL);
+ wlen=get_string( TRUE);
+
+ if ( sun_style_abort_quote ) emit_if();
+
+ emit_token("b(\")");
+ emit_string(statbuf, wlen);
+
+ if ( sun_style_abort_quote ) emit_token("type");
+
+ if ( abort_quote_throw )
+ {
+ emit_literal( -2);
+ emit_token("throw");
+ }else{
+ emit_token("abort");
+ }
+
+ if ( sun_style_abort_quote ) emit_then();
+ /* Sun Style */
+ abort_string = " type -2 THROW THEN:" ;
}
+ }
+ return( retval );
+}
-static void encode_file( const char *filename )
+
+/* **************************************************************************
+ *
+ * Function name: create_alias
+ * Synopsis: Create an alias, as specified by the user
+ *
+ * Associated FORTH word: ALIAS
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * incolon Colon-def'n-in-progress indicator
+ * in_tokz_esc "Tokenizer Escape" mode indicator
+ * Input Stream
+ * Two words will be read.
+ *
+ * Outputs:
+ * Returned Value: TRUE if succeeded.
+ * Global Variables:
+ * statbuf New name will be copied back into here.
+ * Memory Allocated
+ * The two words will be copied into freshly-allocated memory
+ * that will be passed to the create_..._alias() routine.
+ * When Freed?
+ * When Current Device Vocabulary is "finished", or at end
+ * of tokenization, or upon termination of program.
+ * If not able to create alias, the copies will be freed here.
+ *
+ * Error Detection:
+ * If the ALIAS command was given during colon-definition, that
+ * can be handled by this tokenizer, but it is not supported
+ * by IEEE 1275-1994. Issue a WARNING.
+ * If the new name is a copy of an existing word-name, issue a warning.
+ * If the word to which an alias is to be created does not exist
+ * in the appropriate mode -- relative to "Tokenizer-Escape" --
+ * that is an ERROR.
+ * If "instance" is in effect, the ALIAS command is an ERROR.
+ *
+ * Process Explanation:
+ * Get two words -- the new name and the "old" word -- from the
+ * same line of input as the ALIAS command.
+ * Copy the new name back into statbuf for use in trace_creation.
+ * Determine whether or not we are in "Tokenizer-Escape" mode.
+ * Subsequent searches will take place in that same mode.
+ * If the "new" name already exists, issue a warning.
+ * In each vocabulary applicable to the current mode -- i.e.,
+ * "Tokenizer-Escape" or "Normal" -- (except: cannot
+ * make aliases to "Locals"):
+ * Try using the create_..._alias() routine.
+ * If it succeeds, we are done.
+ * IMPORTANT: The order in which we try the vocabularies MUST
+ * match the order in which tokenize_one_word() searches them.
+ * If all the attempts failed, the "old" word does not exist;
+ * declare an ERROR and free up the memory that was allocated.
+ *
+ * Extraneous Remarks:
+ * With the separation of the tokenizer[ state, this
+ * function has become too complicated to keep as a
+ * simple CASE in the big SWITCH statement anymore...
+ *
+ * I had earlier thought that it was sufficient to create a
+ * macro linking the "new" name to the "old" word. There
+ * were too many cases, though, where that didn't work.
+ * This is cleaner.
+ *
+ * I will not be adhering to the strict rules of structure in
+ * this routine, as it would get me nested too deeply...
+ *
+ * Revision History:
+ * Updated Tue, 10 Jan 2006 by David L. Paktor
+ * Convert to tic_hdr_t type vocabularies.
+ *
+ **************************************************************************** */
+
+static bool create_alias( void )
{
- FILE *f;
- size_t s;
- int i=0;
+ char *new_alias ;
+
+ validate_instance(ALIAS);
+ if ( incolon )
+ {
+ tokenization_error ( WARNING,
+ "ALIAS during colon-definition "
+ "is not supported by IEEE 1275-1994\n");
+}
+ if ( get_word_in_line( "ALIAS") )
+ {
+
+ new_alias = strdup((char *)statbuf);
+
+ if (get_word_in_line( "ALIAS") )
+{
+ char *old_name = strdup((char *)statbuf) ;
+
+ /* Copy the "new" alias name back into statbuf.
+ * This is a HACK ^H^H^H^H awkward way to retrofit
+ * support for the trace_creation() function.
+ */
+ strcpy( statbuf, new_alias);
+
+ /* We don't call trace_creation() here because we don't
+ * know if the creation succeeded. However, we want
+ * to issue a "Duplicate" warning based on the attempt,
+ * even if it doesn't succeed.
+ * We would prefer to have the "Trace" message precede the
+ * "Duplicate" warning, but we don't think it's worth
+ * the effort. When it becomes worthwhile, the way to
+ * do it would be to factor out the block that handles
+ * normal-tokenization versus "Tokenizer-Escape" mode;
+ * condition the "Trace" message on its success-return,
+ * show the "Duplicate" warning in any case, then show
+ * the error-message and do the cleanup conditioned on
+ * a failure-return.
+ * That will also obviate the need for a return value from
+ * this routine and for the copy-back into statbuf.
+ */
+ warn_if_duplicate(new_alias);
+
+ /*
+ * Here is where we begin trying the create_..._alias()
+ * routines for the vocabularies.
+ */
+
+ /*
+ * Distinguish between "Normal" tokenization mode
+ * and "Tokenizer Escape" mode
+ */
+ if ( in_tokz_esc )
+ {
+ if ( create_tokz_esc_alias( new_alias, old_name) )
+ return(TRUE);
- if( !(f=fopen(filename,"rb")) ) {
- printf("%s:%d: opening '%s':\n", iname, lineno, filename );
- ERROR;
- return;
+ /*
+ * Handle the classes of operatives that are common between
+ * "Tokenizer Escape" mode and "Normal" tokenization mode.
+ * Those classes include selected non-fcode forth constructs
+ * and Conditional-Compilation Operators.
+ */
+ {
+ tic_hdr_t *found = lookup_shared_word( old_name);
+ if ( found != NULL )
+ {
+ if ( create_core_alias( new_alias, old_name) )
+ return(TRUE);
+ }
}
- while( (s=fread(statbuf, 1, 255, f)) ) {
- emit_token("b(\")");
- emit_string(statbuf, s);
- emit_token("encode-bytes");
- if( i++ )
- emit_token("encode+");
+ }else{
+ /* "Normal" tokenization mode */
+
+ /* Can create aliases for "Locals", why not? */
+ if ( create_local_alias( new_alias, old_name) )
+ return(TRUE);
+
+ /*
+ * All other classes of operatives -- non-fcode forth
+ * constructs, Standard and user-defined fcode
+ * tokens, Macros, and Conditional-Compilation
+ * Operators, -- are included in the "currently
+ * active" vocabulary.
+ */
+
+ if ( create_current_alias( new_alias, old_name) )
+ return(TRUE);
+
+ } /* End of separate handling for normal-tokenization mode
+ * versus "Tokenizer-Escape" mode
+ */
+
+ /* It's not a word, a macro or any of that other stuff. */
+ tokenized_word_error(old_name);
+ free(old_name);
}
- fclose( f );
+ free (new_alias);
+ }
+ return(FALSE);
}
+
+/* **************************************************************************
+ *
+ * Function name: string_err_check
+ * Synopsis: Error-check after processing or Ignoring
+ * simple strings
+ *
+ * Inputs:
+ * Parameters:
+ * is_paren TRUE if string is Dot-Paren .(
+ * FALSE if Ess-Quote ( s" )
+ * sav_lineno Saved Line Number, for Unterminated Error
+ * strt_lineno Start Line Number, for Multiline Warning
+ * Global Variables:
+ * noerrors TRUE if ignoring errors
+ * Local Static Variables:
+ * got_until_eof TRUE if reached end of buffer before delim.
+ *
+ * Outputs:
+ * Returned Value: TRUE if did not reach end of buffer, or,
+ * if ignoring errors, TRUE anyway.
+ *
+ * Error Detection:
+ * Multi-line warning, "Unterminated" Error messages, as apppropriate
+ *
+ **************************************************************************** */
-static void handle_internal(u16 tok)
+static bool string_err_check( bool is_paren,
+ unsigned int sav_lineno,
+ unsigned int strt_lineno )
{
- unsigned long wlen;
- long offs1,offs2;
- u16 itok;
+ bool retval = noerrors ;
+ char *item_typ = is_paren ?
+ "Dot-Paren" : "Ess-Quote" ;
+ if ( got_until_eof ) /* Crude retrofit... */
+ {
+ warn_unterm( TKERROR, item_typ, sav_lineno );
+ }else{
+ retval = TRUE;
+ warn_if_multiline( item_typ, strt_lineno );
+ }
+ return( retval);
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: handle_internal
+ * Synopsis: Perform the functions associated with FORTH words
+ * that do not map directly to a single token. This
+ * is the functions that will go into the FUNCT field
+ * of entries in the "FWords" and "Shared Words" lists.
+ *
+ * Inputs:
+ * Parameters:
+ * pfield Param-field of the tic_hdr_t -type entry
+ * associated with the FORTH-Word (FWord)
+ * just read that is being "handled".
+ * Global Variables:
+ * statbuf The word that was just read.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * statbuf More words may be read.
+ *
+ * Error Detection:
+ * Too numerous to list here...
+ *
+ * Process Explanation:
+ * Recast the type of the param-field of a tic_hdr_t -type
+ * entry and rename it "tok".
+ * The "tok" will be used as the control-expression for a
+ * SWITCH statement with a large number of CASE labels.
+ * Both "FWords" and "shared_words" list entries will
+ * be processed by this routine.
+ *
+ * Revision History:
+ * Updated Wed, 20 Jul 2005 by David L. Paktor
+ * Put handling of ABORT" under control of a run-time
+ * command-line switch.
+ * Put decision to support IBM-style Locals under control
+ * of a run-time command-line switch.
+ * Updated Tue, 17 Jan 2006 by David L. Paktor
+ * Convert to handler for tic_hdr_t type vocab entries.
+ *
+ * Extraneous Remarks:
+ * We would prefer to keep this function private, so we will
+ * declare its prototype here and in the one other file
+ * where we need it, namely, dictionary.c, rather than
+ * exporting it widely in a .h file.
+ *
+ **************************************************************************** */
+
+void handle_internal( tic_param_t pfield);
+void handle_internal( tic_param_t pfield)
+{
+ fwtoken tok = pfield.fw_token;
+
+ signed long wlen;
+ unsigned int sav_lineno = lineno; /* For error message */
+
+ bool handy_toggle = TRUE ; /* Various uses... */
#ifdef DEBUG_SCANNER
printf("%s:%d: debug: tokenizing control word '%s'\n",
@@ -443,727 +4450,1087 @@
#endif
switch (tok) {
case BEGIN:
- emit_token("b(<mark)");
- dpush((unsigned long)opc);
+ emit_begin();
break;
case BUFFER:
- create_word();
+ if ( create_word(tok) )
+ {
emit_token("b(buffer:)");
+ }
break;
case CONST:
- create_word();
+ if ( create_word(tok) )
+ {
emit_token("b(constant)");
+ }
break;
case COLON:
- create_word();
+ {
+ /* Collect error- -detection or -reporting items,
+ * but don't commit until we're sure the
+ * creation was a success.
+ */
+ u16 maybe_last_colon_fcode = nextfcode ;
+ unsigned int maybe_last_colon_lineno = lineno;
+ unsigned int maybe_last_colon_abs_token_no = abs_token_no;
+ unsigned int maybe_last_colon_do_depth = do_loop_depth;
+ /* last_colon_defname
+ * has to wait until after call to create_word()
+ */
+
+ if ( create_word(tok) )
+ {
+ last_colon_fcode = maybe_last_colon_fcode;
+ last_colon_lineno = maybe_last_colon_lineno;
+ last_colon_abs_token_no = maybe_last_colon_abs_token_no;
+ last_colon_do_depth = maybe_last_colon_do_depth;
+ collect_input_filename( &last_colon_filename);
+ /* Now we can get last_colon_defname */
+ if ( last_colon_defname != NULL )
+ {
+ free( last_colon_defname);
+ }
+ last_colon_defname = strdup(statbuf);
+
emit_token("b(:)");
incolon=TRUE;
+ hide_last_colon();
+ lastcolon = opc;
+ }
+ }
break;
case SEMICOLON:
+ if ( test_in_colon("SEMICOLON", TRUE, TKERROR, NULL) )
+ {
+ ret_stk_balance_rpt( "termination,", TRUE);
+ /* Clear Control Structures just back to where
+ * the current Colon-definition began.
+ */
+ clear_control_structs_to_limit(
+ "End of colon-definition", last_colon_abs_token_no);
+
+ if ( ibm_locals )
+ {
+ finish_locals();
+ forget_locals();
+ }
+
emit_token("b(;)");
incolon=FALSE;
+ reveal_last_colon();
+ }
break;
case CREATE:
- create_word();
+ if ( create_word(tok) )
+ {
emit_token("b(create)");
+ }
break;
case DEFER:
- create_word();
+ if ( create_word(tok) )
+ {
emit_token("b(defer)");
+ }
break;
+ case ALLOW_MULTI_LINE:
+ report_multiline = FALSE;
+ break;
+
+ case OVERLOAD:
+ if ( test_in_colon(statbuf, FALSE, WARNING, NULL) )
+ {
+ do_not_overload = FALSE;
+ }
+ break;
+
+ case DEFINED:
+ if (get_word_in_line( statbuf) )
+ {
+ eval_user_symbol(statbuf);
+ }
+ break;
+
+ case CL_FLAG:
+ if (get_word_in_line( statbuf) )
+ {
+ set_cl_flag( statbuf, TRUE);
+ }
+ break;
+
+ case SHOW_CL_FLAGS:
+ show_all_cl_flag_settings( TRUE);
+ break;
+
case FIELD:
- create_word();
+ if ( create_word(tok) )
+ {
emit_token("b(field)");
+ }
break;
case VALUE:
- create_word();
+ if ( create_word(tok) )
+ {
emit_token("b(value)");
+ }
break;
case VARIABLE:
- create_word();
+ if ( create_word(tok) )
+ {
emit_token("b(variable)");
+ }
break;
- case EXTERNAL:
- flags=FLAG_EXTERNAL;
- break;
-
- case TOKENIZE:
- emit_token("b(')");
- break;
-
case AGAIN:
- emit_token("bbranch");
- offs1=dpop()-(unsigned long)opc;
- emit_offset(offs1);
+ emit_again();
break;
case ALIAS:
- wlen=get_word();
- name=strdup((char *)statbuf);
- wlen=get_word();
- alias=strdup((char *)statbuf);
- if(lookup_macro(name))
- printf("%s:%d: warning: duplicate alias\n",
- iname, lineno);
- add_macro(name,alias);
+ if ( create_alias() )
+ {
+ trace_creation( ALIAS, statbuf);
+ }
break;
case CONTROL:
- wlen=get_word();
- emit_token("b(lit)");
- emit_num32(statbuf[0]&0x1f);
+ if ( get_word_in_line( statbuf) )
+ {
+ emit_literal(statbuf[0]&0x1f);
+ }
break;
case DO:
emit_token("b(do)");
- dpush((unsigned long)opc);
- emit_offset(0);
- dpush((unsigned long)opc);
+ mark_do();
break;
case CDO:
emit_token("b(?do)");
- dpush((unsigned long)opc);
- emit_offset(0);
- dpush((unsigned long)opc);
+ mark_do();
break;
case ELSE:
- offs2=dpop();
- emit_token("bbranch");
- dpush((unsigned long)opc);
- emit_offset(0);
- emit_token("b(>resolve)");
- offs1=(unsigned long)opc;
- opc=(u8 *)offs2;
- offs2=offs1-(unsigned long)opc;
- emit_offset(offs2);
- opc=(u8 *)offs1;
+ emit_else();
break;
case CASE:
- emit_token("b(case)");
- dpush(0);
+ emit_case();
break;
case ENDCASE:
- /* first emit endcase, then calculate offsets. */
- emit_token("b(endcase)");
-
- offs1=(unsigned long)opc;
-
- offs2=dpop();
- while (offs2) {
- u16 tmp;
-
- opc=(u8 *)(ostart+offs2);
+ emit_endcase();
+ break;
- /* we're using an fcode offset to temporarily
- * store our linked list. At this point we take
- * the signed fcode offset as unsigned as we know
- * that the offset will always be >0. This code
- * is still broken for any case statement that
- * occurs after the fcode bytecode grows larger
- * than 64kB
- */
- tmp=receive_offset();
+ case NEW_DEVICE:
+ handy_toggle = FALSE;
+ case FINISH_DEVICE:
+ finish_or_new_device( handy_toggle );
+ break;
- offs2=(unsigned long)offs1-(unsigned long)opc;
-
-#if defined(DEBUG_SCANNER)
- printf ("%s:%d: debug: endcase offset 0x%lx\n",
- iname,lineno, (unsigned long)offs2);
-#endif
- emit_offset(offs2);
- offs2=tmp;
+ case FLITERAL:
+ {
+ u32 val;
+ val = dpop();
+ emit_literal(val);
}
- opc=(u8 *)offs1;
break;
case OF:
- emit_token("b(of)");
- dpush((unsigned long)(opc-ostart));
- emit_offset(0);
+ emit_of();
break;
case ENDOF:
- offs1=dpop();
- emit_token("b(endof)");
+ emit_endof();
+ break;
- offs2=dpop();
- dpush((unsigned long)(opc-ostart));
- emit_offset(offs2);
-
- offs2=(unsigned long)(opc-ostart);
- opc=(u8 *)(ostart+offs1);
- offs1=offs2-offs1;
- emit_offset(offs1);
-
- opc=(u8 *)(ostart+offs2);
+ case EXTERNAL:
+ set_hdr_flag( FLAG_EXTERNAL );
break;
case HEADERLESS:
- flags=0;
+ set_hdr_flag( FLAG_HEADERLESS );
break;
case HEADERS:
- flags=FLAG_HEADERS;
+ set_hdr_flag( FLAG_HEADERS );
break;
case DECIMAL:
/* in a definition this is expanded as macro "10 base !" */
- if (incolon) {
- emit_token("b(lit)");
- emit_num32(0x0a);
- emit_token("base");
- emit_token("!");
- } else
- base=10;
+ base_change ( 0x0a );
break;
case HEX:
- if (incolon) {
- emit_token("b(lit)");
- emit_num32(0x10);
- emit_token("base");
- emit_token("!");
- } else
- base=16;
+ base_change ( 0x10 );
break;
case OCTAL:
- if (incolon) {
- emit_token("b(lit)");
- emit_num32(0x08);
- emit_token("base");
- emit_token("!");
- } else
- base=8;
+ base_change ( 0x08 );
break;
case OFFSET16:
if (!offs16)
- printf("%s:%d: switching to "
- "16bit offsets.\n", iname, lineno);
+ {
+ tokenization_error(INFO, "Switching to 16-bit offsets.\n");
+ }else{
+ tokenization_error(WARNING,
+ "Call of OFFSET16 is redundant.\n");
+ }
emit_token("offset16");
offs16=TRUE;
break;
case IF:
- emit_token("b?branch");
- dpush((unsigned long)opc);
- emit_offset(0);
+ emit_if();
break;
- case CLEAVE:
+/* **************************************************************************
+ *
+ * Still to be done:
+ * Correct analysis of Return-Stack usage within Do-Loops
+ * or before Loop Elements like I and J or UNLOOP or LEAVE.
+ *
+ **************************************************************************** */
+ case UNLOOP:
+ emit_token("unloop");
+ must_be_deep_in_do(1);
+ break;
+
case LEAVE:
emit_token("b(leave)");
+ must_be_deep_in_do(1);
break;
+
+ case LOOP_I:
+ emit_token("i");
+ must_be_deep_in_do(1);
+ break;
+
+ case LOOP_J:
+ emit_token("j");
+ must_be_deep_in_do(2);
+ break;
case LOOP:
emit_token("b(loop)");
- offs1=dpop();
- offs2=offs1-(unsigned long)opc;
- emit_offset(offs2);
- offs1=(unsigned long)opc;
- opc=(u8 *)dpop();
- offs2=offs1-(unsigned long)opc;
- emit_offset(offs2);
- opc=(u8 *)offs1;
+ resolve_loop();
break;
- case CLOOP:
+ case PLUS_LOOP:
emit_token("b(+loop)");
- offs1=dpop();
- offs2=offs1-(unsigned long)opc;
- emit_offset(offs2);
- offs1=(unsigned long)opc;
- opc=(u8 *)dpop();
- offs2=offs1-(unsigned long)opc;
- emit_offset(offs2);
- opc=(u8 *)offs1;
+ resolve_loop();
break;
- case GETTOKEN:
- emit_token("b(')");
- wlen=get_word();
- itok=lookup_token((char *)statbuf);
- if (itok==0xffff) {
- printf("%s:%d: error: no such word '%s' in [']\n",
- iname, lineno, statbuf);
- ERROR;
+
+ case INSTANCE:
+ {
+ bool set_instance_state = FALSE;
+ bool emit_instance = TRUE;
+ /* We will treat "instance" in a colon-definition as
+ * an error, but allow it to be emitted if we're
+ * ignoring errors; if we're not ignoring errors,
+ * there's no output anyway...
+ */
+ if ( test_in_colon(statbuf, FALSE, TKERROR, NULL) )
+ { /* We are in interpretation (not colon) state. */
+ /* "Instance" not allowed during "global" scope */
+ if ( scope_is_global )
+ {
+ glob_not_allowed( WARNING, FALSE );
+ emit_instance = FALSE;
+ }else{
+ set_instance_state = TRUE;
+ }
+ }
+ if ( emit_instance )
+ {
+ if ( set_instance_state )
+ {
+ /* "Instance" isn't cumulative.... */
+ if ( is_instance )
+ {
+ unresolved_instance( WARNING);
+ }
+ collect_input_filename( &instance_filename);
+ instance_lineno = lineno;
+ is_instance = TRUE;
+ dev_change_instance_warning = TRUE;
+ }
+ emit_token("instance");
+ }
}
- /* FIXME check size, u16 or token */
- emit_fcode(itok);
break;
- case ASCII:
- wlen=get_word();
- emit_token("b(lit)");
- emit_num32(statbuf[0]);
+ case GLOB_SCOPE:
+ if ( test_in_colon(statbuf, FALSE, TKERROR, NULL) )
+ {
+ if ( INVERSE( is_instance) )
+ {
+ enter_global_scope();
+ }else{
+ tokenization_error( TKERROR,
+ "Global Scope not allowed. "
+ "\"Instance\" is in effect; issued" );
+ just_where_started( instance_filename,
+ instance_lineno );
+ }
+ }
break;
- case CHAR:
- if (incolon)
- printf("%s:%d: warning: CHAR cannot be used inside "
- "of a colon definition.\n", iname, lineno);
- wlen=get_word();
- emit_token("b(lit)");
- emit_num32(statbuf[0]);
+ case DEV_SCOPE:
+ if ( test_in_colon(statbuf, FALSE, TKERROR, NULL) )
+ {
+ resume_device_scope();
+ }
break;
+ case TICK: /* ' */
+ test_in_colon(statbuf, FALSE, WARNING, "[']");
+ case BRACK_TICK: /* ['] */
+ {
+ tic_hdr_t *token_entry;
+ if ( get_token( &token_entry) )
+ {
+ emit_token("b(')");
+ /* Emit the token; warning or whatever comes gratis */
+ token_entry->funct( token_entry->pfield);
+ }
+ }
+ break;
+
+ case F_BRACK_TICK: /* F['] <name>
+ * emits the token-number for <name>
+ * Mainly useful to compute the argument
+ * to get-token or set-token
+ */
+ {
+ tic_hdr_t *token_entry;
+ if ( get_token( &token_entry) )
+ {
+ /* "Obsolete" warning doesn't come gratis here... */
+ token_entry_warning( token_entry);
+ /* In Tokenizer-Escape mode, push the token */
+ if ( in_tokz_esc )
+ {
+ dpush( token_entry->pfield.deflt_elem);
+ }else{
+ emit_literal( token_entry->pfield.deflt_elem);
+ }
+ }
+ }
+ break;
+
+ case CHAR:
+ handy_toggle = FALSE;
case CCHAR:
- wlen=get_word();
- emit_token("b(lit)");
- emit_num32(statbuf[0]);
+ test_in_colon(statbuf, handy_toggle, WARNING,
+ handy_toggle ? "CHAR" : "[CHAR]" );
+ case ASCII:
+ if ( get_word_in_line( statbuf) )
+ {
+ emit_literal(statbuf[0]);
+ }
break;
case UNTIL:
- emit_token("b?branch");
- emit_offset(dpop()-(unsigned long)opc);
+ emit_until();
break;
case WHILE:
- emit_token("b?branch");
- dpush((unsigned long)opc);
- emit_offset(0);
+ emit_while();
break;
case REPEAT:
- emit_token("bbranch");
- offs2=dpop();
- offs1=dpop();
- offs1-=(unsigned long)opc;
- emit_offset(offs1);
-
- emit_token("b(>resolve)");
- offs1=(unsigned long)opc;
- opc=(u8 *)offs2;
- emit_offset(offs1-offs2);
- opc=(u8 *)offs1;
+ emit_repeat();
break;
case THEN:
- emit_token("b(>resolve)");
- offs1=(unsigned long)opc;
- opc=(u8 *)dpop();
- offs2=offs1-(unsigned long)opc;
- emit_offset(offs2);
- opc=(u8 *)offs1;
+ emit_then();
break;
+ case IS:
+ tokenization_error ( INFO,
+ "Substituting TO for deprecated IS\n");
case TO:
+ if ( validate_to_target() )
+ {
emit_token("b(to)");
+ }
break;
case FLOAD:
+ if ( get_word_in_line( statbuf) )
{
- u8 *oldstart, *oldpc, *oldend;
- char *oldiname;
- int oldlineno;
-
- wlen=get_word();
+ bool stream_ok ;
- oldstart=start; oldpc=pc; oldend=end;
- oldiname=iname; oldlineno=lineno;
+ push_source( close_stream, NULL, TRUE) ;
- init_stream((char *)statbuf);
- tokenize();
- close_stream();
+ tokenization_error( INFO, "FLOADing %s\n", statbuf );
- iname=oldiname; lineno=oldlineno;
- end=oldend; pc=oldpc; start=oldstart;
+ stream_ok = init_stream( statbuf );
+ if ( INVERSE( stream_ok) )
+ {
+ drop_source();
+ }
}
break;
- case STRING:
- if (*pc++=='\n') lineno++;
- wlen=get_string();
+ case STRING: /* Double-Quote ( " ) string */
+ handy_toggle = FALSE;
+ case PSTRING: /* Dot-Quote ( ." ) string */
+ wlen=get_string( TRUE);
emit_token("b(\")");
- emit_string(statbuf,wlen-1);
+ emit_string(statbuf, wlen);
+ if ( handy_toggle )
+ {
+ emit_token("type");
+ }
break;
- case PSTRING:
+ case SSTRING: /* Ess-Quote ( s" ) string */
+ handy_toggle = FALSE;
+ case PBSTRING: /* Dot-Paren .( string */
if (*pc++=='\n') lineno++;
- wlen=get_string();
+ {
+ unsigned int strt_lineno = lineno;
+ wlen = get_until( handy_toggle ? ')' : '"' );
+ if ( string_err_check( handy_toggle,
+ sav_lineno, strt_lineno) )
+ {
emit_token("b(\")");
- emit_string(statbuf,wlen-1);
+ emit_string(statbuf, wlen);
+ if ( handy_toggle )
+ {
emit_token("type");
+ }
+ }
+ }
break;
- case PBSTRING:
- if (*pc++=='\n') lineno++;
- get_until(')');
+ case FUNC_NAME:
+ if ( test_in_colon( statbuf, TRUE, TKERROR, NULL) )
+ {
+ if ( in_tokz_esc )
+ {
+ tokenization_error( P_MESSAGE, "Currently" );
+ in_last_colon();
+ }else{
emit_token("b(\")");
- emit_string(statbuf,strlen((char *)statbuf)-1);
- emit_token("type");
+ emit_string( last_colon_defname,
+ strlen( last_colon_defname) );
+ /* if ( hdr_flag == FLAG_HEADERLESS ) { WARNING } */
+ }
+ }
break;
- case SSTRING:
- if (*pc++=='\n') lineno++;
- get_until('"');
+ case IFILE_NAME:
emit_token("b(\")");
- emit_string(statbuf,strlen((char *)statbuf)-1);
- pc++; /* skip " */
+ emit_string( iname, strlen( iname) );
break;
+ case ILINE_NUM:
+ emit_literal( lineno);
+ break;
+
case HEXVAL:
- {
- u8 basecpy=base;
- long val;
-
- base=0x10;
- wlen=get_word();
- if (!get_number(&val)) {
- emit_token("b(lit)");
- emit_num32(val);
- } else {
- printf("%s:%d: warning: illegal value in h#"
- " ignored\n", iname, lineno);
- }
- base=basecpy;
- }
+ base_val (0x10);
break;
case DECVAL:
- {
- u8 basecpy=base;
- long val;
-
- base=0x0a;
- wlen=get_word();
- if (!get_number(&val)) {
- emit_token("b(lit)");
- emit_num32(val);
- } else {
- printf("%s:%d: warning: illegal value in d#"
- " ignored\n", iname, lineno);
- }
-
- base=basecpy;
- }
+ base_val (0x0a);
break;
case OCTVAL:
+ base_val (8);
+ break;
+
+ case ASC_LEFT_NUM:
+ handy_toggle = FALSE;
+ case ASC_NUM:
+ if (get_word_in_line( statbuf) )
{
- u8 basecpy=base;
- long val;
-
- base=0x08;
- wlen=get_word();
- if (!get_number(&val)) {
- emit_token("b(lit)");
- emit_num32(val);
+ if ( handy_toggle )
+ {
+ ascii_right_number( statbuf);
} else {
- printf("%s:%d: warning: illegal value in o#"
- " ignored\n", iname, lineno);
+ ascii_left_number( statbuf);
}
-
- base=basecpy;
}
break;
- case BEGINTOK:
- intok=TRUE;
+
+ case CONDL_ENDER: /* Conditional directives out of context */
+ case CONDL_ELSE:
+ tokenization_error ( TKERROR,
+ "No conditional preceding %s directive\n",
+ strupr(statbuf) );
break;
- case EMITBYTE:
- if (intok)
- emit_byte(dpop());
- else
- printf ("%s:%d: warning: emit-byte outside tokenizer"
- " scope\n", iname, lineno);
+ case PUSH_FCODE:
+ tokenization_error( INFO,
+ "FCode-token Assignment Counter of 0x%x "
+ "has been saved on stack.\n", nextfcode );
+ dpush( (long)nextfcode );
break;
- case NEXTFCODE:
- if (intok)
- nextfcode=dpop();
- else
- printf("%s:%d: warning: next-fcode outside tokenizer"
- " scope\n", iname, lineno);
+ case POP_FCODE:
+ pop_next_fcode();
break;
+
+ case RESET_FCODE:
+ tokenization_error( INFO,
+ "Encountered %s. Resetting FCode-token "
+ "Assignment Counter. ", strupr(statbuf) );
+ list_fcode_ranges( FALSE);
+ reset_fcode_ranges();
+ break;
- case ENDTOK:
- intok=FALSE;
+ case EXIT:
+ if ( test_in_colon( statbuf, TRUE, TKERROR, NULL)
+ || noerrors )
+ {
+ ret_stk_balance_rpt( NULL, FALSE);
+ if ( ibm_locals )
+ {
+ finish_locals ();
+ }
+ emit_token("exit");
+ }
break;
+
+ case ESCAPETOK:
+ enter_tokz_esc();
+ break;
case VERSION1:
case FCODE_V1:
- printf("%s:%d: using version1 header\n", iname, lineno);
- emit_token("version1");
- fcode_hdr=opc;
- emit_fcodehdr();
- offs16=FALSE;
+ tokenization_error( INFO, "Using version1 header "
+ "(8-bit offsets).\n");
+ fcode_starter( "version1", 1, FALSE) ;
break;
case START1:
case FCODE_V2:
case FCODE_V3: /* Full IEEE 1275 */
- emit_token("start1");
- fcode_hdr=opc;
- emit_fcodehdr();
- offs16=TRUE;
+ fcode_starter( "start1", 1, TRUE);
break;
case START0:
- printf ("%s:%d: warning: spread of 0 not supported.",
- iname, lineno);
- emit_token("start0");
- fcode_hdr=opc;
- emit_fcodehdr();
- offs16=TRUE;
+ fcode_starter( "start0", 0, TRUE);
break;
case START2:
- printf ("%s:%d: warning: spread of 2 not supported.",
- iname, lineno);
- emit_token("start2");
- fcode_hdr=opc;
- emit_fcodehdr();
- offs16=TRUE;
+ fcode_starter( "start2", 2, TRUE);
break;
case START4:
- printf ("%s:%d: warning: spread of 4 not supported.",
- iname, lineno);
- emit_token("start4");
- fcode_hdr=opc;
- emit_fcodehdr();
- offs16=TRUE;
+ fcode_starter( "start4", 4, TRUE);
break;
+ case END1:
+ tokenization_error( WARNING,
+ "Appearance of END1 in FCode source code "
+ "is not intended by IEEE 1275-1994\n");
+ handy_toggle = FALSE;
case END0:
case FCODE_END:
- haveend=TRUE;
- emit_token("end0");
+ if ( handy_toggle )
+ {
+ you_are_here();
+ }
+ emit_token( handy_toggle ? "end0" : "end1" );
+ fcode_ender();
+ FFLUSH_STDOUT
break;
- case END1:
- haveend=TRUE;
- emit_token("end1");
+ case RECURSE:
+ if ( test_in_colon(statbuf, TRUE, TKERROR, NULL ) )
+ {
+ emit_fcode(last_colon_fcode);
+ }
break;
+
case RECURSIVE:
+ if ( test_in_colon(statbuf, TRUE, TKERROR, NULL ) )
+ {
+ reveal_last_colon();
+ }
break;
+ case RET_STK_FETCH:
+ ret_stk_access_rpt();
+ emit_token( "r@");
+ break;
+
+ case RET_STK_FROM:
+ ret_stk_access_rpt();
+ bump_ret_stk_depth( -1);
+ emit_token( "r>");
+ break;
+
+ case RET_STK_TO:
+ bump_ret_stk_depth( 1);
+ emit_token( ">r");
+ break;
+
case PCIHDR:
- {
- u32 classid=dpop();
- u16 did=dpop();
- u16 vid=dpop();
-
- pci_hdr=opc;
- emit_pcihdr(vid, did, classid);
-
- printf("%s:%d: PCI header vendor id=0x%04x, "
- "device id=0x%04x, class=%06x\n",
- iname, lineno, vid, did, classid);
- }
+ emit_pcihdr();
break;
case PCIEND:
- if (!pci_hdr) {
- printf("%s:%d: error: pci-header-end/pci-end "
- "without pci-header\n", iname, lineno);
- ERROR;
- }
finish_pcihdr();
+ reset_fcode_ranges();
+ FFLUSH_STDOUT
break;
case PCIREV:
- pci_revision=dpop();
- printf("%s:%d: PCI header revision=0x%04x\n",
- iname, lineno, pci_revision);
+ pci_image_rev = dpop();
+ tokenization_error( INFO,
+ "PCI header revision=0x%04x%s\n", pci_image_rev,
+ big_end_pci_image_rev ?
+ ". Will be saved in Big-Endian format."
+ : "" );
break;
case NOTLAST:
- pci_is_last_image=FALSE;
- printf("%s:%d: PCI header not last image!\n",
- iname, lineno);
+ handy_toggle = FALSE;
+ case ISLAST:
+ dpush(handy_toggle);
+ case SETLAST:
+ {
+ u32 val = dpop();
+ bool new_pili = BOOLVAL( (val != 0) );
+ if ( pci_is_last_image != new_pili )
+ {
+ tokenization_error( INFO,
+ new_pili ?
+ "Last image for PCI header.\n" :
+ "PCI header not last image.\n" );
+ pci_is_last_image = new_pili;
+ }
+ }
break;
- case ABORTTXT:
- /* ABORT" is not to be used in FCODE drivers
- * but Apple drivers do use it. Therefore we
- * allow it. We push the specified string to
- * the stack, do -2 THROW and hope that THROW
- * will correctly unwind the stack.
- */
-
- printf("%s:%d: warning: ABORT\" in fcode not defined by "
- "IEEE 1275-1994.\n", iname, lineno);
- if (*pc++=='\n') lineno++;
- wlen=get_string();
-
-#ifdef BREAK_COMPLIANCE
- /* IF */
- emit_token("b?branch");
-
- dpush((unsigned long)opc);
- emit_offset(0);
-#endif
- emit_token("b(\")");
- emit_string(statbuf,wlen-1);
-#ifdef BREAK_COMPLIANCE
- emit_token("type");
-#endif
- emit_token("-2");
- emit_token("throw");
-#ifdef BREAK_COMPLIANCE
- /* THEN */
- emit_token("b(>resolve)");
- offs1=(unsigned long)opc;
- opc=(u8 *)dpop();
- offs2=offs1-(unsigned long)opc;
- emit_offset(offs2);
- opc=(u8 *)offs1;
-#endif
+ case SAVEIMG:
+ if (get_word_in_line( statbuf) )
+ {
+ free(oname);
+ oname = strdup( statbuf );
+ tokenization_error( INFO,
+ "Output is redirected to file: %s\n", oname);
+ }
break;
- case FCODE_DATE:
+ case RESETSYMBS:
+ tokenization_error( INFO,
+ "Resetting symbols defined in %s mode.\n",
+ in_tokz_esc ? "tokenizer-escape" : "\"normal\"");
+ if ( in_tokz_esc )
{
- time_t tt;
- char fcode_date[11];
-
- tt=time(NULL);
- strftime(fcode_date, 11, "%m/%d.%Y",
- localtime(&tt));
- emit_token("b(\")");
- emit_string((u8 *)fcode_date,10);
+ reset_tokz_esc();
+ }else{
+ reset_normal_vocabs();
}
break;
+ case FCODE_DATE:
+ handy_toggle = FALSE;
case FCODE_TIME:
{
time_t tt;
- char fcode_time[9];
+ char temp_buffr[32];
tt=time(NULL);
- strftime(fcode_time, 9, "%H:%M:%S",
- localtime(&tt));
+ if ( handy_toggle )
+ {
+ strftime(temp_buffr, 32, "%T %Z", localtime(&tt));
+ }else{
+ strftime(temp_buffr, 32, "%m/%d/%Y", localtime(&tt));
+ }
+ if ( in_tokz_esc )
+ {
+ tokenization_error( MESSAGE, temp_buffr);
+ }else{
emit_token("b(\")");
- emit_string((u8 *)fcode_time,8);
+ emit_string((u8 *)temp_buffr, strlen(temp_buffr) );
+ }
}
break;
case ENCODEFILE:
- wlen=get_word();
+ if (get_word_in_line( statbuf) )
+ {
encode_file( (char*)statbuf );
+ }
break;
default:
- printf("%s:%d: error: Unimplemented control word '%s'\n",
- iname, lineno, statbuf);
- ERROR;
+ /* IBM-style Locals, under control of a switch */
+ if ( ibm_locals )
+ {
+ bool found_it = TRUE;
+ switch (tok) {
+ case CURLY_BRACE:
+ declare_locals( FALSE);
+ break;
+ case DASH_ARROW:
+ assign_local();
+ break;
+ default:
+ found_it = FALSE;
}
+ if ( found_it ) break;
}
-void tokenize(void)
+ /* Down here, we have our last chance to recognize a token.
+ * If abort_quote is disallowed, we will still consume
+ * the string. In case the string spans more than one
+ * line, we want to make sure the line number displayed
+ * in the error-message is the one on which the disallowed
+ * abort_quote token appeared, not the one where the
+ * string ended; therefore, we might need to be able to
+ * "fake-out" the line number...
+ */
{
- unsigned long wlen;
- u16 tok;
- u8 *mac;
- long val;
+ bool fake_out_lineno = FALSE;
+ unsigned int save_lineno = lineno;
+ unsigned int true_lineno;
+ if ( abort_quote( tok) )
+ { break;
+ }else{
+ if ( tok == ABORTTXT ) fake_out_lineno = TRUE;
+ }
+ true_lineno = lineno;
+
+ if ( fake_out_lineno ) lineno = save_lineno;
+ tokenization_error ( TKERROR,
+ "Unimplemented control word '%s'\n", strupr(statbuf) );
+ if ( fake_out_lineno ) lineno = true_lineno;
+ }
+ }
+}
- while ((wlen=get_word())!=0) {
+/* **************************************************************************
+ *
+ * Function name: skip_string
+ * Synopsis: When Ignoring, skip various kinds of strings. Maps
+ * to string-handlers in handle_internal()...
+ *
+ * Associated FORTH words: Double-Quote ( " ) string
+ * Dot-Quote ( ." ) string
+ * Ess-Quote ( s" ) string
+ * Dot-Paren .( string
+ * ABORT" (even if not enabled)
+ * { (Local-Values declaration) and -> (Local-Values assignment)
+ * are also handled if ibm_locals is enabled.
+ *
+ * Inputs:
+ * Parameters:
+ * pfield Param-field of the entry associated with
+ * the FWord that is being Ignored.
+ * Global Variables:
+ * statbuf The word that was just read.
+ * pc Input-stream pointer
+ * lineno Line-number, used for errors and warnings
+ * ibm_locals TRUE if IBM-style Locals are enabled
+ *
+ * Outputs:
+ * Returned Value: NONE
+ *
+ * Error Detection:
+ * Multi-line warnings, "Unterminated" Errors
+ * handled by called routines
+ *
+ * Extraneous Remarks:
+ * We would prefer to keep this function private, too, so we
+ * will declare its prototype here and in the one other
+ * file where we need it, namely, dictionary.c, rather
+ * than exporting it widely in a .h file.
+ *
+ **************************************************************************** */
- /* Filter comments */
- switch (statbuf[0]) {
- case '\\':
- pc-=wlen;
- get_until('\n');
- continue;
+void skip_string( tic_param_t pfield);
+void skip_string( tic_param_t pfield)
+{
+ fwtoken tok = pfield.fw_token;
+ unsigned int sav_lineno = lineno;
+ bool handy_toggle = TRUE ; /* Various uses... */
- case '(':
- /* only a ws encapsulated '(' is a stack comment */
- if (statbuf[1])
+ switch (tok) {
+ case STRING: /* Double-Quote ( " ) string */
+ case PSTRING: /* Dot-Quote ( ." ) string */
+ case ABORTTXT: /* ABORT", even if not enabled */
+ get_string( FALSE); /* Don't truncate; ignoring anyway */
+ /* Will handle multi-line warnings, etc. */
break;
- pc-=wlen;
- get_until(')');
+ case SSTRING: /* Ess-Quote ( s" ) string */
+ handy_toggle = FALSE;
+ case PBSTRING: /* Dot-Paren .( string */
if (*pc++=='\n') lineno++;
+ {
+ unsigned int strt_lineno = lineno;
+ get_until( handy_toggle ? ')' : '"' );
+ string_err_check( handy_toggle, sav_lineno, strt_lineno );
+ }
+ break;
+
+ default:
+ /* IBM-style Locals, under control of a switch */
+ if ( ibm_locals )
+ {
+ bool found_it = TRUE;
+ switch (tok) {
+ case CURLY_BRACE:
+ declare_locals( TRUE);
+ break;
+ case DASH_ARROW:
+ get_word();
+ break;
+ default:
+ found_it = FALSE;
+ }
+ if ( found_it ) break;
+ }
+
+ tokenization_error ( FATAL, "Program Error. "
+ "Unimplemented skip-string word '%s'\n", strupr(statbuf) );
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: process_remark
+ * Synopsis: The active function for remarks (backslash-space)
+ * and comments (enclosed within parens)
+ *
+ * Associated FORTH word(s): \ (
+ *
+ * Inputs:
+ * Parameters:
+ * TIC entry "parameter field", init'd to delimiter character.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ *
+ * Error Detection:
+ * Warning if end-of-file encountered before delimiter.
+ * Warning if multi-line parentheses-delimited comment.
+ *
+ * Process Explanation:
+ * Skip until the delimiter.
+ * If end-of-file was encountered, issue Warning.
+ * Otherwise, and if delimiter was not new-line,
+ * check for multi-line with Warning.
+ *
+ **************************************************************************** */
+
+void process_remark( tic_param_t pfield )
+{
+ char until_char = (char)pfield.deflt_elem ;
+ unsigned int start_lineno = lineno;
+
#ifdef DEBUG_SCANNER
+
+ get_until(until_char);
printf ("%s:%d: debug: stack diagram: %s)\n",
iname, lineno, statbuf);
-#endif
- continue;
- }
+#else
- /* Check whether a macro with given name exists */
+ if ( skip_until( until_char) )
+ {
+ if ( until_char == '\n' )
+ {
+ /* Don't need any saved line number here ... */
+ tokenization_error ( WARNING,
+ "Unterminated remark.\n");
+ }else{
+ warn_unterm( WARNING, "comment", start_lineno);
+ }
+ }else{
+ if ( until_char != '\n' )
+ {
+ pc++;
+ warn_if_multiline( "comment", start_lineno);
+ }
+ }
+#endif /* DEBUG_SCANNER */
+}
- mac=(u8 *)lookup_macro((char *)statbuf);
- if(mac) {
- u8 *oldstart, *oldpc, *oldend;
-#ifdef DEBUG_SCANNER
- printf("%s:%d: debug: macro %s folds out to sequence"
- " '%s'\n", iname, lineno, statbuf, mac);
-#endif
- oldstart=start; oldpc=pc; oldend=end;
- start=pc=end=mac;
- end+=strlen((char *)mac);
- tokenize();
+/* **************************************************************************
+ *
+ * Function name: filter_comments
+ * Synopsis: Process remarks and comments in special conditions
+ *
+ * Inputs:
+ * Parameters:
+ * inword Current word just parsed
+ *
+ * Outputs:
+ * Returned Value: TRUE if Current word is a Comment-starter.
+ * Comment will be processed
+ *
+ * Process Explanation:
+ * We want to be able to recognize any alias the user may have
+ * defined to a comment-delimiter, in whatever applicable
+ * vocabulary it might be.
+ * The active-function of any such alias will, of necessity, be
+ * the process_remark() routine, defined just above.
+ * We will search for the TIC-entry of the given word; if we don't
+ * find it, it's not a comment-delimiter. If we do find it,
+ * and it is one, we invoke its active-function and return TRUE.
+ * We also want to permit the "allow-multiline-comments" directive
+ * to be processed in the context that calls this routine, so
+ * we will check for that condition, too.
+ *
+ **************************************************************************** */
- end=oldend; pc=oldpc; start=oldstart;
+bool filter_comments( u8 *inword)
+{
+ bool retval = FALSE;
+ tic_hdr_t *found = lookup_word( inword, NULL, NULL );
- continue;
+ if ( found != NULL )
+ {
+ if ( found->funct == process_remark )
+ {
+ found->funct( found->pfield);
+ retval = TRUE;
+ }else{
+ /* Permit the "allow-multiline-comments" directive */
+ if ( found->funct == handle_internal )
+ {
+ if ( found->pfield.fw_token == ALLOW_MULTI_LINE )
+ {
+ /* Make sure any intended side-effects occur... */
+ found->funct( found->pfield);
+ retval = TRUE;
}
+ }
+ }
+ }
+ return ( retval );
+ }
- /* Check whether it's a non-fcode forth construct */
- tok=lookup_fword((char *)statbuf);
- if (tok!=0xffff) {
-#ifdef DEBUG_SCANNER
- printf("%s:%d: debug: matched internal opcode 0x%04x\n",
- iname, lineno, tok);
-#endif
- handle_internal(tok);
-#ifdef DEBUG_SCANNER
- if (verbose)
- printf("%s:%d: debug: '%s' done.\n",
- iname,lineno,statbuf);
-#endif
- continue;
- }
+/* **************************************************************************
+ *
+ * Function name: tokenize_one_word
+ * Synopsis: Tokenize the currently-obtained word
+ * along with whatever it consumes.
+ *
+ * Inputs:
+ * Parameters:
+ * wlen Length of symbol just retrieved from the input stream
+ * This is not really used here any more; it's
+ * left over from an earlier implementation.
+ * Global Variables:
+ * statbuf The symbol (word) just retrieved from input stream.
+ * in_tokz_esc TRUE if "Tokenizer-Escape" mode is in effect; a
+ * different set of vocabularies from "Normal"
+ * mode will be checked (along with those that
+ * are common to both modes).
+ * ibm_locals Controls whether to check for IBM-style Locals;
+ * set by means of a command-line switch.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * statbuf May be incremented
+ * in_tokz_esc May be set if the word just retrieved is
+ * the tokenizer[ directive.
+ * tic_found
+ *
+ * Error Detection:
+ * If the word could neither be identified nor processed as a number,
+ * that is an ERROR; pass it to tokenized_word_error for a
+ * message.
+ *
+ * Process Explanation:
+ * Look for the word in each of the various lists and vocabularies
+ * in which it might be found, as appropriate to the current
+ * state of activity.
+ * If found, process it accordingly.
+ * If not found, try to process it as a number.
+ * If cannot process it as a number, declare an error.
+ *
+ * Revision History:
+ * Updated Tue, 10 Jan 2006 by David L. Paktor
+ * Convert to tic_hdr_t type vocabularies.
+ * Updated Mon, 03 Apr 2006 by David L. Paktor
+ * Replaced bulky "Normal"-vs-"Escape" block with a call
+ * to lookup_word . Attend to a small but important
+ * side-effect of the "handle_<vocab>" routines that
+ * feeds directly into the protection against self-
+ * -recursion in a user-defined Macro: Set the global
+ * variable tic_found to the entry, just before we
+ * execute it, and we're good to go...
+ *
+ * Extraneous Remarks:
+ * We trade off the strict rules of structure for simplicity
+ * of coding.
+ *
+ **************************************************************************** */
- /* Check whether it's one of the defined fcode words */
+void tokenize_one_word( signed long wlen )
+{
- tok=lookup_token((char *)statbuf);
- if (tok!=0xffff) {
-#ifdef DEBUG_SCANNER
- printf("%s:%d: debug: matched fcode no 0x%04x\n",
- iname, lineno, tok);
-#endif
- emit_fcode(tok);
- continue;
- }
+ /* The shared lookup routine now handles everything. */
+ tic_hdr_t *found = lookup_word( statbuf, NULL, NULL );
- /* It's not a word or macro - is it a number? */
+ if ( found != NULL )
+ {
+ tic_found = found;
+ found->funct( found->pfield);
+ return ;
+ }
- if (!get_number(&val)) {
- if (intok)
- dpush(val);
- else {
- emit_fcode(lookup_token("b(lit)"));
- emit_num32(val);
+ /* It's not a word in any of our current contexts.
+ * Is it a number?
+ */
+ if ( handle_number() )
+ {
+ return ;
}
- continue;
+
+ /* Could not identify - give a shout. */
+ tokenized_word_error( statbuf );
}
- /* could not identify - bail out. */
+/* **************************************************************************
+ *
+ * Function name: tokenize
+ * Synopsis: Tokenize the current input stream.
+ * May be called recursively for macros and such.
+ *
+ * Revision History:
+ * Updated Thu, 24 Mar 2005 by David L. Paktor
+ * Factor-out comment-filtration; apply to gather_locals
+ * Factor-out tokenizing a single word (for conditionals)
+ * Separate actions of "Tokenizer-Escape" mode.
+ *
+ **************************************************************************** */
+
+void tokenize(void)
+{
+ signed long wlen = 0;
- printf("%s:%d: error: word '%s' is not in dictionary.\n",
- iname, lineno, statbuf);
- ERROR;
+ while ( wlen >= 0 )
+ {
+ wlen = get_word();
+ if ( wlen > 0 )
+ {
+ tokenize_one_word( wlen );
}
+ }
}
Added: fcode-utils/toke/scanner.h
===================================================================
--- fcode-utils/toke/scanner.h (rev 0)
+++ fcode-utils/toke/scanner.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,123 @@
+#ifndef _TOKE_SCANNER_H
+#define _TOKE_SCANNER_H
+
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * External/Prototype definitions for Scanning functions in Tokenizer
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+
+#include "types.h"
+#include "ticvocab.h"
+
+/* ************************************************************************** *
+ *
+ * Global Variables Exported
+ *
+ **************************************************************************** */
+
+extern u8 *statbuf; /* The word just read from the input stream */
+extern u8 base; /* The numeric-interpretation base */
+
+
+/* pci data */
+extern bool pci_is_last_image;
+extern u16 pci_image_rev; /* Vendor's Image, NOT PCI Data Struct Rev */
+extern u16 pci_vpd;
+
+
+/* Having to do with the state of the tokenization */
+extern bool offs16; /* Using 16-bit branch- (etc) -offsets */
+extern bool in_tokz_esc; /* TRUE if in "Tokenizer Escape" mode */
+extern bool incolon; /* TRUE if inside a colon definition */
+extern bool haveend; /* TRUE if the "end" code was read. */
+extern int do_loop_depth; /* How deep we are inside DO ... LOOP variants */
+
+/* For special-case error detection or reporting */
+extern int lastcolon; /* Loc'n in output stream of latest colon-def'n. */
+ /* Used for error-checking of IBM-style Locals */
+extern char *last_colon_defname; /* Name of last colon-definition */
+extern char *last_colon_filename; /* File where last colon-def'n made */
+extern unsigned int last_colon_lineno; /* Line number of last colon-def'n */
+extern bool report_multiline; /* False to suspend multiline warning */
+extern unsigned int last_colon_abs_token_no;
+
+/* ************************************************************************** *
+ *
+ * Function Prototypes / Functions Exported:
+ *
+ **************************************************************************** */
+
+void init_scanner( void );
+void exit_scanner( void );
+void init_scan_state( void );
+void fcode_ender( void );
+
+bool skip_until( char lim_ch);
+void push_source( void (*res_func)(), _PTR res_parm, bool is_f_chg );
+signed long get_word( void);
+bool get_word_in_line( char *func_nam);
+bool get_rest_of_line( void);
+void warn_unterm( int severity,
+ char *something,
+ unsigned int saved_lineno);
+void warn_if_multiline( char *something, unsigned int start_lineno );
+void user_message( tic_param_t pfield );
+void skip_user_message( tic_param_t pfield );
+bool get_number( long *result);
+void eval_string( char *inp_bufr);
+
+void process_remark( tic_param_t pfield );
+bool filter_comments( u8 *inword);
+bool as_a_what( fwtoken definer, char *as_what);
+tic_hdr_t *lookup_word( char *stat_name, char **where_pt1, char **where_pt2 );
+bool word_exists( char *stat_name, char **where_pt1, char **where_pt2 );
+void warn_if_duplicate ( char *stat_name);
+void trace_creation( fwtoken definer, char *nu_name);
+void tokenize_one_word( signed long wlen );
+void check_name_length( signed long wlen );
+
+void tokenize( void );
+
+/* **************************************************************************
+ *
+ * Macro Name: FUNC_CPY_BUF_SIZE
+ * Size of a temporary buffer to retain a copy of
+ * a function name taken from statbuf, when statbuf
+ * will be used to return a value, but the function
+ * name might still be needed for an error message.
+ *
+ **************************************************************************** */
+
+#define FUNC_CPY_BUF_SIZE 40
+
+
+#endif /* _TOKE_SCANNER_H */
Modified: fcode-utils/toke/stack.c
===================================================================
--- fcode-utils/toke/stack.c 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/toke/stack.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -24,93 +24,203 @@
*
*/
+/* **************************************************************************
+ * Modifications made in 2005 by IBM Corporation
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Modifications Author: David L. Paktor dlpaktor(a)us.ibm.com
+ **************************************************************************** */
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include "toke.h"
#include "stack.h"
+#include "scanner.h"
+#include "errhandler.h"
+/* **************************************************************************
+ *
+ * Global Variables Imported
+ * statbuf The word just read from the input stream
+ *
+ **************************************************************************** */
-#define GUARD_STACK
-#define EXIT_STACKERR
-#ifdef GLOBALSTACK
-#define STATIC static
-#else
-#define STATIC
-#endif
-STATIC long *dstack,*startdstack,*enddstack;
-#undef STATIC
+/* **************************************************************************
+ *
+ * Global Variables Exported
+ * dstack Pointer to current item on top of Data Stack
+ *
+ **************************************************************************** */
+long *dstack;
+
+/* **************************************************************************
+ *
+ * Local/Static Pointers ..... to ... -> Points to ...
+ * startdstack Start of data-stack area -> last possible item
+ * enddstack End of data-stack area -> past first item
+ *
+ *************************************************************************** */
+
+static long *startdstack;
+static long *enddstack;
+
+void clear_stack(void)
+{
+ dstack = enddstack;
+}
+
/* internal stack functions */
-int init_stack(void)
+void init_stack(void)
{
- startdstack=enddstack=malloc(MAX_ELEMENTS*sizeof(long));
- enddstack+=MAX_ELEMENTS;
+ startdstack = safe_malloc(MAX_ELEMENTS*sizeof(long), "initting stack");
+ enddstack = startdstack + MAX_ELEMENTS;
dstack=enddstack;
- return 0;
}
-#ifdef GLOBALSTACK
+/* Input Param: stat TRUE = Underflow, FALSE = Overflow */
+static void stackerror(bool stat)
+{
+ /*
+ * Because all of our stack operations are protected and
+ * we have no risk of the dstack pointer going into
+ * invalid territory, this error needs not be FATAL.
+ */
+ tokenization_error ( TKERROR , "stack %sflow at or near %s \n",
+ (stat)?"under":"over" , statbuf );
+}
-#ifdef GUARD_STACK
-static void stackerror(int stat)
+/*
+ * Return TRUE if the stack depth is equal to or greater than
+ * the supplied minimum requirement. If not, print an error.
+ */
+bool min_stack_depth(int mindep)
{
- printf ("FATAL: stack %sflow\n",
- (stat)?"under":"over" );
-#ifdef EXIT_STACKERR
- exit(-1);
-#endif
+ bool retval = TRUE ;
+ long *stack_result;
+
+ stack_result = dstack + mindep;
+ /*
+ * The above appears counter-intuitive. However, C compensates
+ * for the size of the object of a pointer when it handles
+ * address arithmetic. A more explicit expression that would
+ * yield the same result, might look something like this:
+ *
+ * (long *)((int)dstack + (mindep * sizeof(long)))
+ *
+ * I doubt that that form would yield tighter code, or otherwise
+ * represent any material advantage...
+ */
+
+ if ( stack_result > enddstack )
+ {
+ retval = FALSE;
+ stackerror(TRUE);
+ }
+
+ return ( retval );
}
-#endif
+/*
+ * Return TRUE if the stack has room for the supplied # of items
+ */
+static bool room_on_stack_for(int newdep)
+{
+ bool retval = TRUE ;
+ long *stack_result;
+
+ stack_result = dstack - newdep;
+ /* See above note about "counter-intuitive" pointer address arithmetic */
+
+ if ( stack_result < startdstack )
+ {
+ retval = FALSE;
+ stackerror(FALSE);
+ }
+
+ return ( retval );
+}
+
void dpush(long data)
{
#ifdef DEBUG_DSTACK
printf("dpush: sp=%p, data=0x%lx, ", dstack, data);
#endif
- *(--dstack)=data;
-#ifdef GUARD_STACK
- if (dstack<startdstack) stackerror(0);
-#endif
+ if ( room_on_stack_for(1) )
+ {
+ --dstack;
+ *(dstack)=data;
+ }
}
long dpop(void)
{
- long val;
+ long val = 0;
#ifdef DEBUG_DSTACK
printf("dpop: sp=%p, data=0x%lx, ",dstack, *dstack);
#endif
- val=*(dstack++);
-#ifdef GUARD_STACK
- if (dstack>enddstack) stackerror(1);
-#endif
+ if ( min_stack_depth(1) )
+ {
+ val=*(dstack);
+ dstack++;
+ }
return val;
}
long dget(void)
{
- return *(dstack);
+ long val = 0;
+ if ( min_stack_depth(1) )
+ {
+ val = *(dstack);
+ }
+ return val;
}
-#endif
-/* Stack helper functions */
-
-u8 *get_stackstring(void)
+long stackdepth(void)
{
- long size;
- u8 *fstring, *retstring;
+ long depth;
- size=dpop();
- fstring=(u8 *)dpop();
+ depth = enddstack - dstack;
+ /*
+ * Again, C's address arithmetic compensation comes into play.
+ * See the note at min_stack_depth()
+ *
+ * A more explicit equivalent expression might look like this:
+ *
+ * (((long int)enddstack - (long int)dstack) / sizeof(long))
+ *
+ * I doubt any material advantage with that one either...
+ */
- retstring=malloc(size+1);
- strncpy((char *)retstring, (const char *)fstring, size);
- retstring[size]=0;
+ return (depth);
+}
- return retstring;
+void swap(void)
+{
+ long nos_temp; /* Next-On-Stack temp */
+ if ( min_stack_depth(2) )
+ {
+ nos_temp = dstack[1];
+ dstack[1]= dstack[0];
+ dstack[0]= nos_temp;
+ }
}
+void two_swap(void)
+{
+ long two_deep, three_deep;
+ if ( min_stack_depth(4) )
+ {
+ two_deep = dstack[2];
+ three_deep = dstack[3];
+ dstack[2] = dstack[0];
+ dstack[3] = dstack[1];
+ dstack[1] = three_deep;
+ dstack[0] = two_deep;
+ }
+}
+
Modified: fcode-utils/toke/stack.h
===================================================================
--- fcode-utils/toke/stack.h 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/toke/stack.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -1,3 +1,6 @@
+#ifndef _TOKE_STACK_H
+#define _TOKE_STACK_H
+
/*
* OpenBIOS - free your system!
* ( FCode tokenizer )
@@ -24,23 +27,47 @@
*
*/
-#ifdef ANSI_ONLY
-#define GLOBALSTACK
-#endif
+/* **************************************************************************
+ * Modifications made in 2005 by IBM Corporation
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Modifications Author: David L. Paktor dlpaktor(a)us.ibm.com
+ **************************************************************************** */
+#include "types.h"
+
+/* ************************************************************************** *
+ *
+ * Macros:
+ * MAX_ELEMENTS Size of stack area, in "elements"
+ *
+ **************************************************************************** */
+
#define MAX_ELEMENTS 1024
-#ifdef GLOBALSTACK
+/* ************************************************************************** *
+ *
+ * Global Variables Exported
+ *
+ **************************************************************************** */
+
+extern long *dstack;
+
+/* ************************************************************************** *
+ *
+ * Function Prototypes / Functions Exported:
+ *
+ **************************************************************************** */
+
void dpush(long data);
long dpop(void);
long dget(void);
-#else
-extern long *dstack,*startdstack;
-static inline void dpush(long data) { *(--dstack)=data; }
-static inline long dpop(void) { return (long)*(dstack++); }
-static inline long dget(void) { return *(dstack); }
-#endif
-int init_stack(void);
-u8 *get_stackstring(void);
+void clear_stack(void);
+void init_stack(void);
+bool min_stack_depth(int mindep); /* TRUE if no error */
+long stackdepth(void);
+void swap(void);
+void two_swap(void);
+
+#endif /* _TOKE_STACK_H */
Modified: fcode-utils/toke/stream.c
===================================================================
--- fcode-utils/toke/stream.c 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/toke/stream.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -24,6 +24,12 @@
*
*/
+/* **************************************************************************
+ * Modifications made in 2005 by IBM Corporation
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Modifications Author: David L. Paktor dlpaktor(a)us.ibm.com
+ **************************************************************************** */
+
#include <stdio.h>
#include <stdlib.h>
#ifdef __GLIBC__
@@ -32,134 +38,1577 @@
#include <string.h>
#include <sys/stat.h>
+#include "emit.h"
+#include "stream.h"
+#include "errhandler.h"
#include "toke.h"
-#include "stream.h"
-#define OUTPUT_SIZE 131072
+/* **************************************************************************
+ *
+ * Revision History:
+ * Updated Tue, 31 Jan 2006 by David L. Paktor
+ * Add support for embedded Environment-Variables in path name
+ * Updated Thu, 16 Feb 2006 David L. Paktor
+ * Collect missing (inaccessible) filenames
+ * Updated Thu, 16 Mar 2006 David L. Paktor
+ * Add support for Include-Lists
+ *
+ **************************************************************************** */
-extern bool offs16;
-extern u16 nextfcode;
+/* **************************************************************************
+ *
+ * Global Variables Exported
+ * start Start of input-source buffer
+ * end End of input-source buffer
+ * pc Input-source Scanning pointer
+ * iname Current Input File name
+ * lineno Current Line Number in Input File
+ * ostart Start of Output Buffer
+ * opc FCode Output Buffer Position Counter
+ * oname Output File name
+ *
+ **************************************************************************** */
-u8 *start, *pc, *end;
-char *iname;
+/* Input pointers, Position Counters and Length counters */
+u8 *start = NULL;
+u8 *pc;
+u8 *end;
+char *iname = NULL;
+unsigned int lineno = 0;
+unsigned int abs_token_no = 0; /* Absolute Token Number in all Source Input
+ * Will be used to identify position
+ * where colon-definition begins and
+ * to limit clearing of control-structs.
+ */
+static unsigned int ilen; /* Length of Input Buffer */
+
/* output pointers */
-u8 *ostart, *opc, *oend, *oname;
-static unsigned int ilen;
+u8 *ostart;
+char *oname = NULL;
+unsigned int opc; /* Output Position Counter */
-unsigned int lineno;
+/* We want to limit exposure of this v'ble, so don't put it in .h file */
+unsigned int olen; /* Length of Output Buffer */
+/* We want to limit exposure of this Imported Function, likewise. */
+void init_emit( void);
-int init_stream( const char *name)
+/* **************************************************************************
+ *
+ * Internal Static Variables
+ * load_list_name Name of the Load List File
+ * load_list_file (Pointer to) File-Structure for the Load List File
+ * depncy_list_name Name of the Dependency List File
+ * depncy_file (Pointer to) File-Structure for the Dependency List File
+ * missing_list_name Name of the Missing-Files-List File
+ * missing_list_file (Pointer to) File-Structure for Missing-List File
+ * no_files_missing TRUE if able to load all files
+ *
+ **************************************************************************** */
+
+static char *load_list_name;
+static FILE *load_list_file;
+static char *depncy_list_name;
+static FILE *depncy_file;
+static char *missing_list_name;
+static FILE *missing_list_file;
+static bool no_files_missing = TRUE;
+
+/* **************************************************************************
+ *
+ * Private data-structure for Include-List support
+ *
+ * Components are simply a string-pointer and a link pointer
+ *
+ **************************************************************************** */
+
+typedef struct incl_list
{
- FILE *infile;
- unsigned int i;
+ char *dir_path;
+ struct incl_list *next;
+ } incl_list_t;
+
+/* **************************************************************************
+ *
+ * Internal Static Variables associated with Include-List support
+ * include_list_start Start of the Include-List
+ * include_list_next Next entry in Include-List to add or read
+ * max_dir_path_len Size of longest entry in the Include-List
+ * include_list_full_path Full-Path (i.e., expanded File-name with
+ * Include-List Entry) that was last opened.
+ *
+ **************************************************************************** */
+static incl_list_t *include_list_start = NULL;
+static incl_list_t *include_list_next = NULL;
+static unsigned int max_dir_path_len = 0;
+static char *include_list_full_path = NULL;
+
+
+/* **************************************************************************
+ *
+ * Function name: add_to_include_list
+ * Synopsis: Add an entry to the Include-List
+ *
+ * Inputs:
+ * Parameters:
+ * dir_compt Directory Component to add to Inc-List
+ * Local Static Variables:
+ * include_list_start First entry in the Include-List
+ * include_list_next Next entry in Include-List to add
+ * max_dir_path_len Previous max Dir-Component Length
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * include_list_start Assigned a value, first time through
+ * include_list_next "Next" field updated with new entry,
+ * then pointer updated to new entry.
+ * max_dir_path_len Maximum Length
+ * Memory Allocated
+ * For the list-entry, and for the directory/path name to be added
+ * When Freed?
+ * Remains in effect through the life of the program.
+ *
+ * Process Explanation:
+ * Unlike most of our linked-lists, this one will be linked forward,
+ * i.e., in the order elements are added, and will be searched
+ * in a forward order.
+ * This means extra code to handle the first entry.
+ * Allocate and initialize the New Include-List Entry.
+ * If this is the first entry, point the List-Starter at it.
+ * Otherwise, the Last-Entry-on-the-List pointer is already valid;
+ * point its "next" field at the New Entry.
+ * Point the Last-Entry-on-the-List pointer at the New Entry.
+ *
+ **************************************************************************** */
+
+void add_to_include_list( char *dir_compt)
+{
+ unsigned int new_path_len = strlen( dir_compt);
+ incl_list_t *new_i_l_e = safe_malloc( sizeof( incl_list_t),
+ "adding to include-list" );
+
+ new_i_l_e->dir_path = strdup( dir_compt);
+ new_i_l_e->next = NULL;
+
+ if ( include_list_start == NULL )
+ {
+ include_list_start = new_i_l_e;
+ }else{
+ include_list_next->next = new_i_l_e;
+ }
+
+ include_list_next = new_i_l_e;
+ if ( new_path_len > max_dir_path_len ) max_dir_path_len = new_path_len;
+}
+
+#define DISPLAY_WIDTH 80
+/* **************************************************************************
+ *
+ * Function name: display_include_list
+ * Synopsis: Display the Include-List, once it's completed,
+ * if "verbose" mode is in effect.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Local Static Variables:
+ * include_list_start First entry in the Include-List
+ * include_list_next Next entry, as we step through.
+ * Macro:
+ * DISPLAY_WIDTH Width limit of the display
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * include_list_next NULL, when reaches end of Incl-List
+ * Printout:
+ * The elements of the Include-List, separated by a space, on
+ * a line up to the DISPLAY_WIDTH, or on a line by itself
+ * if the element is wider.
+ *
+ * Process Explanation:
+ * The calling routine will check for the verbose flag.
+ * Nothing to be done here if Include-List is NULL.
+ * Print a header, then the list.
+ *
+ **************************************************************************** */
+
+void display_include_list( void)
+{
+ if ( include_list_start != NULL )
+ {
+ int curr_wid = DISPLAY_WIDTH; /* Current width; force new line */
+ printf("\nInclude-List:");
+ include_list_next = include_list_start ;
+ while ( include_list_next != NULL )
+ {
+ int this_wid = strlen( include_list_next->dir_path) + 1;
+ char *separator = " ";
+ if ( curr_wid + this_wid > DISPLAY_WIDTH )
+ {
+ separator = "\n\t";
+ curr_wid = 7; /* Allow 1 for the theoretical space */
+ }
+ printf("%s%s", separator, include_list_next->dir_path);
+ curr_wid += this_wid;
+ include_list_next = include_list_next->next ;
+ }
+ printf("\n");
+ }
+}
+
+
+
+/* **************************************************************************
+ *
+ * We cannot accommodate the structures of the different
+ * routines that open files with a single function, so
+ * we will have to divide the action up into pieces:
+ * one routine to initialize the include-list search, a
+ * second to return successive candidates. The calling
+ * routine will do the operation (stat or fopen) until
+ * it succeeds or the list is exhausted. Then it will
+ * call a final routine to clean up and display messages.
+ *
+ * I'm sure I don't need to mention that, when no include-list
+ * is defined, these functions will still support correct
+ * operation...
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Function name: init_incl_list_scan
+ * Synopsis: Initialize the search through the Include-List
+ *
+ * Inputs:
+ * Parameters:
+ * base_name Expanded user-supplied file-name
+ * Local Static Variables:
+ * include_list_start First entry in the Include-List
+ * max_dir_path_len Maximum Directory Component Length
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * include_list_next Next entry in Include-List to read
+ * include_list_full_path Full-Path Buffer pointer
+ * Memory Allocated
+ * Full-Path Buffer (If Include-List was defined)
+ * When Freed?
+ * In finish_incl_list_scan()
+ *
+ * Process Explanation:
+ * The base_name passed to the routine is expected to have
+ * any embedded Environment-Variables already expanded.
+ * The Full-Path Buffer is presumed to be unallocated, and
+ * its pointer to be NULL.
+ * The Next-Entry-to-read pointer is also presumed to be NULL.
+ * If an Include-List has been defined, we will allocate memory
+ * for the Full-Path Buffer and point the Next-Entry pointer
+ * at the Start of the List. If not, no need to do anything.
+ *
+ **************************************************************************** */
+
+static void init_incl_list_scan( char *base_name)
+{
+ if ( include_list_start != NULL )
+ {
+ /* Allocate memory for the file-name buffer.
+ * maximum path-element length plus base-name length
+ * plus one for the slash plus one for the ending NULL
+ */
+ unsigned int new_path_len = max_dir_path_len + strlen( base_name) + 2;
+ include_list_full_path = safe_malloc( new_path_len,
+ "scanning include-list" );
+ include_list_next = include_list_start;
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: scan_incl_list
+ * Synopsis: Prepare the next candidate in the include-list search
+ * Indicate when the end has been reached.
+ *
+ * Inputs:
+ * Parameters:
+ * base_name Expanded user-supplied file-name
+ * Local Static Variables:
+ * include_list_full_path Full-Path Buffer pointer
+ * include_list_next Next entry in Include-List to read
+ *
+ * Outputs:
+ * Returned Value: TRUE if valid candidate; FALSE when done
+ * Local Static Variables:
+ * include_list_full_path Next Full file-name Path to use
+ * include_list_next Updated to next entry in the List
+ *
+ * Process Explanation:
+ * Include-List Components are presumed not to require any expansion;
+ * the Shell is expected to resolve any Environment-Variables
+ * supplied in command-line arguments before they are passed
+ * to the (this) application-program.
+ * We will, therefore, not attempt to expand any Components of
+ * the Include-List.
+ * If the Full-Path Buffer pointer is NULL, it indicates that no
+ * entries have been made to the Include-List and this is our
+ * first time through this routine in this search; we will
+ * use the base-name as supplied, presumably relative to the
+ * current directory. Point the buffer-pointer at the base-
+ * -name and return "Not Done".
+ * Otherwise, we will look at the Next-Entry pointer:
+ * If it is NULL, we have come to the end of the Include-List;
+ * whether because no Include-List was defined or because
+ * we have reached the end, we will return "Done".
+ * Otherwise, we will load the Full-Path Buffer with the entry
+ * currently indicated by the Next-Entry pointer, advance
+ * it to the next entry in the List and return "Not Done".
+ * We will supply a slash as the directory-element separator in
+ * between the Include-List entry and the base_name
+ *
+ * Extraneous Remarks:
+ * The slash as directory-element separator works in UNIX-related
+ * environments, but is not guaranteed in others. I would
+ * have preferred to specify that Include-List Components are
+ * required to end with the appropriate separator, but that
+ * was neither acceptable nor compatible with existing practice
+ * in other utilities, and the effort to programmatically
+ * determine the separator used by the Host O/S was too much
+ * for such a small return. And besides, we already have so
+ * many other UNIX-centric assumptions hard-coded into the
+ * routines in this file (dollar-sign to signify Environment
+ * Variables, period for file-name-extension separator, etc.)
+ * that it's just too much of an uphill battle anymore...
+ *
+ **************************************************************************** */
+
+static bool scan_incl_list( char *base_name)
+{
+ bool retval = FALSE; /* default to "Done" */
+ if ( include_list_full_path == NULL )
+ {
+ include_list_full_path = base_name;
+ retval = TRUE;
+ }else{
+ if ( include_list_next != NULL )
+ {
+
+ /* Special case: If the next Directory Component is
+ * an empty string, do not prepend a slash; that
+ * would either become a root-based absolute path,
+ * or, if the base-name is itself an absolute path,
+ * it would be a path that begins with two slashes,
+ * and *some* Host Operating Systems ***REALLY***
+ * DO NOT LIKE that!
+ */
+ if ( strlen( include_list_next->dir_path) == 0 )
+ {
+ sprintf( include_list_full_path, "%s", base_name);
+ }else{
+ sprintf( include_list_full_path, "%s/%s",
+ include_list_next->dir_path, base_name);
+ }
+ include_list_next = include_list_next->next;
+ retval = TRUE;
+ }
+ }
+
+ return( retval);
+}
+
+/* **************************************************************************
+ *
+ * Function name: finish_incl_list_scan
+ * Synopsis: Clean up after a search through the Include-List
+ * Display appropriate messages.
+ *
+ * Inputs:
+ * Parameters:
+ * op_succeeded TRUE if intended operation was ok.
+ *
+ * Local Static Variables:
+ * include_list_start Non-NULL if Include-List was defined
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * include_list_full_path Reset to NULL
+ * include_list_next Reset to NULL
+ * Memory Freed
+ * Full-Path Buffer (If Include-List was defined)
+ * Printout:
+ * If file was found in Include-List, Advisory showing where.
+ *
+ **************************************************************************** */
+
+static void finish_incl_list_scan( bool op_succeeded)
+{
+ if ( include_list_start != NULL )
+ {
+ if ( op_succeeded )
+ {
+ tokenization_error( INFO,
+ "File was found in %s\n" ,include_list_full_path );
+ }
+ free( include_list_full_path);
+ }
+ include_list_full_path = NULL;
+ include_list_next = NULL;
+}
+
+/* **************************************************************************
+ *
+ * Function name: open_incl_list_file
+ * Synopsis: Look in the Include-List, if one is defined, for
+ * the file whose name is given and open it.
+ *
+ * Inputs:
+ * Parameters:
+ * base_name Expanded user-supplied file-name
+ * mode Mode-string to use; usually "r" or "rb"
+ * Local Static Variables:
+ * include_list_full_path Full Path to use in fopen atttempt
+ *
+ * Outputs:
+ * Returned Value: File structure pointer; NULL if failed
+ * Local Static Variables:
+ * include_list_full_path Full Path used, if succeeded
+ *
+ * Error Detection:
+ * Calling routine will detect and report Errors.
+ *
+ * Process Explanation:
+ * This routine will initialize and step through Include-List.
+ * Calling routine will be responsible for "finishing" the
+ * Include-List search, as well as any Advisory messages.
+ *
+ **************************************************************************** */
+
+static FILE *open_incl_list_file( char *base_name, char *mode)
+{
+ FILE *retval = NULL;
+
+ init_incl_list_scan( base_name);
+ while ( scan_incl_list( base_name) )
+ {
+ retval = fopen( include_list_full_path, mode);
+ if ( retval != NULL )
+ {
+ break;
+ }
+ }
+
+ return (retval);
+}
+
+/* **************************************************************************
+ *
+ * Function name: stat_incl_list_file
+ * Synopsis: Look in the Include-List, if defined, for given file,
+ * and collect its statistics.
+ *
+ *
+ * Inputs:
+ * Parameters:
+ * base_name Expanded user-supplied file-name
+ * file_info Pointer to STAT structure
+ * Local Static Variables:
+ * include_list_full_path Full Path to use in file-status atttempt
+ *
+ * Outputs:
+ * Returned Value: TRUE if succeeded.
+ * Local Static Variables:
+ * include_list_full_path Full Path used, if succeeded
+ * Supplied Pointers:
+ * *file_info File-statistics structure from STAT call
+ *
+ * Error Detection:
+ * Calling routine will detect and report Errors.
+ *
+ * Process Explanation:
+ * This routine will initialize and step through Include-List.
+ * Calling routine will be responsible for "finishing" the
+ * Include-List search, as well as any Advisory messages.
+ *
+ **************************************************************************** */
+
+static bool stat_incl_list_file( char *base_name, struct stat *file_info)
+{
+ bool retval = FALSE;
+ int stat_reslt = -1; /* Success = 0 */
+
+ init_incl_list_scan( base_name);
+ while ( scan_incl_list( base_name) )
+ {
+ stat_reslt = stat( include_list_full_path, file_info);
+ if ( stat_reslt == 0 )
+ {
+ retval = TRUE;
+ break;
+ }
+ }
+
+ return (retval);
+}
+
+/* **************************************************************************
+ *
+ * Function name: init_inbuf
+ * Synopsis: Set the given buffer as the current input source
+ *
+ * Inputs:
+ * Parameters:
+ * inbuf Pointer to start of new input buffer
+ * buflen Length of new input buffer
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * start Points to given buffer
+ * end Points to end of new input buffer
+ * pc Re-initialized
+ *
+ **************************************************************************** */
+
+void init_inbuf(char *inbuf, unsigned int buflen)
+{
+ start = inbuf;
+ pc = start;
+ end = pc + buflen;
+}
+
+/* **************************************************************************
+ *
+ * Function name: could_not_open
+ * Synopsis: Report the "Could not open" Message for various Files.
+ *
+ * Inputs:
+ * Parameters:
+ * severity Severity of message, WARNING or ERROR
+ * fle_nam Name of file
+ * for_what Phrase after "... for "
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout:
+ * Message of indicated severity.
+ *
+ * Error Detection:
+ * Error already detected; reported here.
+ *
+ **************************************************************************** */
+
+static void could_not_open(int severity, char *fle_nam, char *for_what)
+{
+ tokenization_error( severity, "Could not open file %s for %s.\n",
+ fle_nam, for_what);
+
+}
+
+/* **************************************************************************
+ *
+ * Function name: file_is_missing
+ * Synopsis: Add the given File to the Missing-Files-List.
+ *
+ * Inputs:
+ * Parameters:
+ * fle_nam Name of file
+ * Local Static Variables:
+ * missing_list_file Missing-Files-List File Structure
+ * May be NULL if none was opened
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * no_files_missing Set FALSE
+ * File Output:
+ * Write File name to Missing-Files-List (if one was opened)
+ *
+ * Error Detection:
+ * Error already detected; reported here.
+ *
+ **************************************************************************** */
+
+static void file_is_missing( char *fle_nam)
+{
+ if ( missing_list_file != NULL )
+ {
+ fprintf( missing_list_file, "%s\n", fle_nam);
+ no_files_missing = FALSE;
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: add_to_load_lists
+ * Synopsis: Add the given input file-name to the Load-List File,
+ * and the Full File path to the Dependency-List File.
+ *
+ * Inputs:
+ * Parameters:
+ * in_name Name of given input Source File
+ * Local Static Variables:
+ * load_list_file Load List File Structure pointer
+ * depncy_file Dependency-List File Structure ptr
+ * Either may be NULL if the file was not opened.
+ * include_list_full_path Full Path to where the file was found.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * File Output:
+ * Write given file-name to Load-List file (if one was opened)
+ * Write File Path to Dependency-List file (if one was opened)
+ *
+ * Process Explanation:
+ * Write into the Load-List file the input Source Filename in the
+ * same form -- i.e., unexpanded -- as was supplied by the User.
+ * Write into the Dependency-List file the full expanded path, as
+ * supplied by the program to the Host Operating System.
+ *
+ **************************************************************************** */
+
+static void add_to_load_lists( const char *in_name)
+{
+ if ( load_list_file != NULL )
+ {
+ fprintf( load_list_file, "%s\n", in_name);
+ }
+ if ( depncy_file != NULL )
+ {
+ fprintf( depncy_file, "%s\n", include_list_full_path);
+ }
+}
+
+
+/* **************************************************************************
+ *
+ * In the functions that support accessing files whose path-names
+ * contain embedded Environment-Variables, the commentaries
+ * will refer to this process, or to inputs that require it,
+ * using variants of the term "expand".
+ *
+ * We will also keep some of the relevant information as Local
+ * Static Variables.
+ *
+ **************************************************************************** */
+
+static char expansion_buffer[ 2*GET_BUF_MAX];
+static bool was_expanded;
+static int expansion_msg_severity = INFO;
+
+/* **************************************************************************
+ *
+ * Function name: expanded_name
+ * Synopsis: Advisory message to display filename expansion.
+ *
+ * Inputs:
+ * Parameters:
+ * Local Static Variables:
+ * was_expanded TRUE if expansion happened
+ * expansion_buffer Buffer with result of expansion
+ * expansion_msg_severity Whether it's an ordinary Advisory
+ * or we force a message.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ *
+ * Printout:
+ * Advisory message showing expansion, if expansion happened
+ * Otherwise, nothing.
+ *
+ **************************************************************************** */
+
+static void expanded_name( void )
+{
+ if ( was_expanded )
+ {
+ tokenization_error( expansion_msg_severity,
+ "File name expanded to: %s\n", expansion_buffer);
+ }
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: expansion_error
+ * Synopsis: Supplemental message to display filename expansion.
+ * Called after an expanded-filename failure was reported.
+ *
+ * Inputs:
+ * Parameters:
+ * Global Variables:
+ * verbose Set by "-v" switch
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout:
+ * Advisory message showing expansion, if applicable
+ * and if wasn't already shown.
+ *
+ * Error Detection:
+ * Called after Error was reported.
+ *
+ * Process Explanation:
+ * Presumptions are that:
+ * An Error message, showing the user-supplied form of the
+ * pathname is also being displayed
+ * An advisory message showing the pathname expansion may
+ * have been displayed during the expansion process,
+ * if verbose was TRUE.
+ * The purpose of this routine is to display the expansion if
+ * it had not already just been displayed, i.e., if verbose
+ * is not set to TRUE: Temporarily force the display of an
+ * Advisory message.
+ *
+ * Extraneous Remarks:
+ * If this routine is called before the Error message is displayed,
+ * the verbose and non-verbose versions of the Log-File will
+ * match up nicely...
+ *
+ **************************************************************************** */
+
+static void expansion_error( void )
+{
+ if ( INVERSE( verbose) )
+ {
+ expansion_msg_severity |= FORCE_MSG;
+ expanded_name();
+ expansion_msg_severity ^= FORCE_MSG;
+ }
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: expand_pathname
+ * Synopsis: Perform the expansion of a path-name that may contain
+ * embedded Environment-Variables
+ *
+ * Inputs:
+ * Parameters:
+ * input_pathname The user-supplied filename
+ * Global/Static MACRO:
+ * GET_BUF_MAX Size of expansion buffer is twice this.
+ *
+ * Outputs:
+ * Returned Value: Pointer to expanded name, or to
+ * input if no expansion needed.
+ * NULL if error.
+ * Local Static Variables:
+ * was_expanded TRUE if expansion needed and succeeded
+ * expansion_buffer Result of expansion
+ * Printout:
+ * Advisory message showing expansion
+ * Presumption is that an Advisory giving the user-supplied
+ * pathname was already printed.
+ *
+ * Error Detection:
+ * Syntax error. System might print something; it might not be
+ * captured, even to a log-file. System failure return might
+ * be the only program-detectable indication. Display ERROR
+ * message and return NULL pointer. Calling routine will
+ * display the user-supplied pathname in its Error message
+ * indicating failure to open the file.
+ *
+ * Process Explanation:
+ * Generally speaking, we will let the Shell expand the Environment
+ * Variables embedded in the user-supplied pathname.
+ * First, though, we will see if the expansion is necessary: Look
+ * for the telltale character, '$', in the input string. If
+ * it's not there, there are no Env't-V'bles, and no expansion
+ * is necessary. Return the pointer to the input string and
+ * we're done. Otherwise.....
+ * Acquire a temporary file-name. Construct a string of the form:
+ * echo input_string > temp_file_name
+ * and then issue that string as a command to the Shell.
+ * If that string generates a system-call failure, report an ERROR.
+ * Open the temporary file and read its contents. That will be
+ * the expansion of the input string. If its length exceeds
+ * the capacity of the expansion buffer, it's another ERROR.
+ * (Of course, don't forget to delete the temporary file.)
+ * Place the null-byte marker at the end of the expanded name,
+ * trimming off the terminating new-line.
+ * Success. Display the expanded name (as an Advisory message)
+ * Return the pointer to the expansion buffer and set the flag.
+ * (Did I mention don't forget to delete the temporary file?)
+ *
+ * Extraneous Remarks:
+ * This implementation approach turned out to be the simplest and
+ * cleanest way to accomplish our purpose. It also boasts the
+ * HUGE advantage of not requiring re-invention of a well-used
+ * (proverbial) wheel. Plus, any variations allowed by the
+ * shell (e.g.,: $PWD:h ) are automatically converted, too,
+ * depending on the System shell (e.g., not for Bourne shell).
+ * In order to spare you, the maintenance programmer, unnecessary
+ * agony, I will list a few other approaches I tested, with a
+ * brief note about the results of each:
+ * (1)
+ * I actually tried parsing the input line and passing each component
+ * V'ble to the getenv() function, accumulating the results into
+ * a conversion buffer. I needed to check for every possible
+ * delimiter, and handle curly-brace enclosures. The resultant
+ * code was *UGLY* ... you'd be appalled! The only good spot was
+ * that I was able to compensate for an open-curly-brace without
+ * a corresponding close-curly-brace (if close-c-b wasn't found,
+ * resume the search for other delimiters...) which, apparently,
+ * the System does not or will not do. It was, however, too
+ * small a compensation for all the awfulness entailed overall.
+ *
+ * I tried various approaches to using the Environment-Variables to
+ * convert and retrieve the input string:
+ * (2)
+ * Create a command-string that would set an Env't V'ble to the
+ * input-string, and pass the command-string to the system() call,
+ * then retrieve the Env't V'ble thus set via getenv(). No dice;
+ * the system() call operated in a separate sub-shell and could
+ * not export its Env't upwards.
+ * (3)
+ * Use the setenv() command to set an Env't V'ble to the input-string
+ * and retrieve it via getenv(). The returned string matched the
+ * input-string without converting it.
+ * (4)
+ * Use the setenv() command to set an Env't V'ble to a string like:
+ * `echo input_string`
+ * Again, the string retrieved via getenv() exactly matched the
+ * unconverted command-string, back-quotes and all.
+ *
+ * Of course, the equivalents of (2), (3) and (4) worked as desired
+ * when tested as direct commands to the Shell. UNIX can be
+ * funny that way...
+ *
+ * Oh! Also: we will slightly stretch the rules of well-structured
+ * code.
+ *
+ **************************************************************************** */
+
+static char *expand_pathname( const char *input_pathname)
+{
+ static const int buffer_max = GET_BUF_MAX * 2;
+
+ char *retval = (char *)input_pathname;
+ was_expanded = FALSE;
+
+ /* If no '$' is found, expansion is unnecessary. */
+ if ( strchr( input_pathname, '$') != NULL )
+ {
+ FILE *temp_file;
+ int syst_stat;
+ const char *temp_file_name = tmpnam( NULL);
+
+ /* Use the expansion buffer for our temporary command string */
+ sprintf( expansion_buffer,
+ "echo %s>%s\n", input_pathname, temp_file_name);
+ syst_stat = system( expansion_buffer);
+ if ( syst_stat != 0 )
+ {
+ tokenization_error( TKERROR,
+ "Expansion Syntax.\n");
+ /* The "File-Opening" error message will show the input string */
+ return( NULL);
+ }
+
+ temp_file = fopen( temp_file_name, "r"); /* Cannot fail. */
+ syst_stat = fread( expansion_buffer, 1, buffer_max, temp_file);
+ /* Error test. Length of what we read is not a good indicator;
+ * it's limited anyway by buffer_max.
+ * Valid test is if last character read was the new-line.
+ */
+ if ( expansion_buffer[syst_stat-1] != '\n' )
+ {
+ tokenization_error( TKERROR,
+ "Expansion buffer overflow. Max length is %d.\n",
+ buffer_max);
+ retval = NULL;
+ }else{
+ expansion_buffer[syst_stat-1] =0;
+ was_expanded = TRUE;
+ retval = expansion_buffer;
+ expanded_name();
+ }
+
+ fclose( temp_file);
+ remove( temp_file_name);
+ }
+
+ return( retval);
+}
+
+/* **************************************************************************
+ *
+ * Function name: open_expanded_file
+ * Synopsis: Open a file, expanding Environment-Variables that
+ * may be embedded in the given path-name.
+ *
+ * Inputs:
+ * Parameters:
+ * path_name The user-supplied path-name
+ * mode Mode-string to use; usually "r" or "rb"
+ * for_what Phrase to use in Messages
+ *
+ * Outputs:
+ * Returned Value: Pointer to FILE structure; NULL if failed
+ * Local Static Variables:
+ * was_expanded TRUE if expansion happened
+ * expansion_buffer Result of expansion
+ * Printout:
+ * Advisory message showing expansion
+ *
+ * Error Detection:
+ * If expansion or system-call for file-open failed,
+ * report Error and return NULL.
+ *
+ **************************************************************************** */
+
+FILE *open_expanded_file( const char *path_name, char *mode, char *for_what)
+{
+
+ FILE *retval = NULL;
+
+ char *infile_name = expand_pathname( path_name);
+ if ( infile_name != NULL )
+ {
+ retval = open_incl_list_file( infile_name, mode);
+ }
+
+ if ( retval == NULL )
+ {
+ expansion_error();
+ tokenization_error ( TKERROR,
+ "Failed to open file %s for %s\n", path_name, for_what );
+ }
+
+ finish_incl_list_scan( BOOLVAL( retval != NULL) );
+
+ return( retval);
+}
+
+/* **************************************************************************
+ *
+ * Function name: init_stream
+ * Synopsis: Open a file and make it the current source.
+ * This is called, not only at the start of tokenization,
+ * but also when a subsidiary file is FLOADed.
+ *
+ * Inputs:
+ * Parameters:
+ * name Name of the new Input File to open
+ * May be path-name containing
+ * embedded Environment-Variables.
+ * Global Variables:
+ * oname NULL if opening Primary Input File
+ * Local Static Variables:
+ * include_list_full_path Full Path to where the file was found
+ *
+ * Outputs:
+ * Returned Value: TRUE = opened and read file successfully
+ * Global Variables (Only changed if successful):
+ * iname Set to new Input File name
+ * lineno Re-initialized to 1
+ * Local Static Variables:
+ * no_files_missing Set FALSE if couldn't read input file
+ * include_list_full_path Retains full-path if file opened was
+ * the Primary Input File (as contrasted with an FLoaded
+ * Source file), in which case a call to init_output()
+ * is expected; the Full-Path Buffer will be freed there.
+ * Memory Allocated
+ * Duplicate of Input File name (becomes iname )
+ * A fresh input buffer; input file is copied to it.
+ * Becomes start by action of call to init_inbuf().
+ * When Freed?
+ * By close_stream()
+ * File Output:
+ * Write new Input File name to Load-List file.
+ * Writing to Missing-Files-List File if failure,
+ * or Full File path to Dependency-List File,
+ * is handled by called routine.
+ * Other Exotic Effects:
+ * Force a flush of stdout before printing ERROR messages
+ *
+ * Error Detection:
+ * Failure to open or read Input file: ERROR; suppress output;
+ * write Input File name to Missing-Files-List File.
+ *
+ * Process Explanation:
+ * Free local buffer on failure.
+ * Caller should only invoke close_stream() if this call succeeded.
+ * Some filesystems use zeros for new-line; we need to convert
+ * those zeros to line-feeds.
+ * Similarly for files that have carr-ret/line-feed; the carr-ret
+ * will cause havoc; replace it w/ a space.
+ *
+ * Revision History:
+ * Updated Thu, 07 Apr 2005 by David L. Paktor
+ * Restructured. If opened file, close it, even if can't read it.
+ * Return TRUE on success.
+ * Caller examines return value.
+ * Updated Wed, 13 Jul 2005 by David L. Paktor
+ * Replace carr-rets with spaces.
+ * Updated Sun, 27 Nov 2005 by David L. Paktor
+ * Write new Input File name to Load-List file.
+ * Updated Tue, 31 Jan 2006 by David L. Paktor
+ * Add support for embedded Environment-Variables in path name
+ * Updated Thu, 16 Feb 2006 David L. Paktor
+ * Collect missing (inaccessible) filenames
+ * Updated Fri, 17 Mar 2006 David L. O'Paktor
+ * Add support for Include-List search
+ *
+ * Still to be done:
+ * Set a flag when carr-ret has been replaced by space;
+ * when a string crosses a line, if this flag is set,
+ * issue a warning that an extra space has been inserted.
+ *
+ **************************************************************************** */
+
+bool init_stream( const char *name)
+{
+ FILE *infile;
+ u8 *newbuf;
struct stat finfo;
+ bool stat_succ = FALSE;
+ bool tried_stat = FALSE;
+ bool retval = FALSE;
+ bool inp_fil_acc_err = FALSE;
+ bool inp_fil_open_err = FALSE;
+ bool inp_fil_read_err = FALSE;
+
+ char *infile_name = expand_pathname( name);
+
+ if ( (infile_name != NULL) )
+ {
+ tried_stat = TRUE;
+ stat_succ = stat_incl_list_file( infile_name, &finfo);
+ }
+
+ if ( INVERSE( stat_succ) )
+ {
+ inp_fil_acc_err = TRUE;
+ }else{
- if (stat(name,&finfo))
- return -1;
+ infile = fopen( include_list_full_path, "r");
+ if ( infile == NULL )
+ {
+ inp_fil_open_err = TRUE;
+ }else{
ilen=finfo.st_size;
- start=malloc(ilen+1);
- if (!start)
- return -1;
+ newbuf = safe_malloc(ilen+1, "initting stream");
- infile=fopen(name,"r");
- if (!infile)
- return -1;
+ if ( fread( newbuf, ilen, 1, infile) != 1 )
+ {
+ inp_fil_read_err = TRUE;
+ free( newbuf );
+ } else {
+ unsigned int i;
- if (fread(start, ilen, 1, infile)!=1) {
- free(start);
- return -1;
+ retval = TRUE ;
+ /* Replace zeroes in the file with LineFeeds. */
+ /* Replace carr-rets with spaces. */
+ for (i=0; i<ilen; i++)
+ {
+ char test_c = newbuf[i];
+ if ( test_c == 0 ) newbuf[i] = 0x0a;
+ if ( test_c == 0x0d ) newbuf[i] = ' ';
}
+ newbuf[ilen]=0;
+ init_inbuf(newbuf, ilen);
+
+ /* If the -l option was specified, write the name of the
+ * new input-file to the Load-List file... UNLESS
+ * this is the first time through and we haven't yet
+ * opened the Load-List file, in which case we'll
+ * just open it here and wait until we create the
+ * output-file name (since the Load-List file name
+ * depends on the output-file name anyway) before
+ * we write the initial input-file name to it.
+ */
+ /* Looking for the option-flag _and_ for a non-NULL value
+ * of the file-structure pointer is redundandundant:
+ * The non-NULL pointer is sufficient, once the List
+ * File has been created...
+ */
+ /* Same thing applies if the -P option was specified,
+ * for the Dependency-List file, except there we'll
+ * write the full path to where the file was found.
+ */
+ /* We have a routine to do both of those. */
+ add_to_load_lists( name);
+ /*
+ * And... there's one slight complication: If this is
+ * the first time through, (i.e., we're opening the
+ * Primary Input File) then we haven't yet opened the
+ * Dependency-List file, and we need to preserve the
+ * Full file-name Buffer until the call to init_output()
+ * where the include-list scan will be "finish"ed.
+ * Actually, we want to postpone "finish"ing the inc-l scan
+ * for several reasons beyond the Dependency-List file,
+ * such as completing the File Name Announcement first.
+ * A NULL output-name buffer is our indicator.
+ */
+ if ( oname == NULL )
+ {
+ /* Quick way to suppress "finish"ing the i-l scan */
+ tried_stat = FALSE;
+ }
+ }
fclose(infile);
+ }
+ }
- /* no zeroes within the file. */
- for (i=0; i<ilen; i++) {
- /* start[i]=start[i]?start[i]:0x0a; */
- start[i] |= (((signed char)start[i] - 1) >> 7) & 0x0a;
+ FFLUSH_STDOUT /* Do this first */
+ /* Now we can deliver our postponed error and advisory messages */
+ if ( INVERSE( retval) )
+ {
+ file_is_missing( (char *)name);
+ if ( inp_fil_acc_err )
+ {
+ expansion_error();
+ tokenization_error( TKERROR,
+ "Could not access input file %s\n", name);
+ }else{
+ if ( inp_fil_open_err )
+ {
+ expansion_error();
+ could_not_open( TKERROR, (char *)name, "input");
+ }else{
+ if ( inp_fil_read_err )
+ {
+ expansion_error();
+ tokenization_error( TKERROR,
+ "Could not read input file %s\n", name);
+ }
+ }
}
- start[ilen]=0;
+ }
- pc=start;
- end=pc+ilen;
+ if ( tried_stat )
+ {
+ finish_incl_list_scan( stat_succ);
+ }
+ /* Don't change the input file name and line-number until after
+ * the Advisory showing where the file was found.
+ */
+ if ( retval )
+ {
iname=strdup(name);
-
lineno=1;
+ }
- return 0;
+ return ( retval );
}
-int init_output( const char *in_name, const char *out_name )
+/* **************************************************************************
+ *
+ * Function name: extend_filename
+ * Synopsis: Change the filename to the given extension
+ *
+ * Inputs:
+ * Parameters:
+ * base_name Name of the Input Base File
+ * new_ext New ext'n (with leading period)
+ *
+ * Outputs:
+ * Returned Value: Result filename
+ * Memory Allocated
+ * Buffer for result filename
+ * When Freed?
+ * At end of Tokenization, by close_output().
+ *
+ * Process Explanation:
+ * If the Input Base File Name has an extension, it will be replaced
+ * with the given new extension. If not, the new extension will
+ * simply be appended.
+ * If the Input Base File Name has an extension that matches the
+ * new extension, a duplicate of the extension will be appended.
+ *
+ * Extraneous Remarks:
+ * I only recently added protection against the situation where the
+ * Input Base File Name has no extension, but the Directory Path
+ * leading to it has a period in one of the directory names.
+ * Granted, this is a rare case, but not altogether impossible;
+ * I would have done it earlier except for the fact that the
+ * separator between directories may vary with different Host
+ * Operating Systems.
+ * However, at this point we have UNIX-centric assumptions hard-
+ * -coded in to so many other places that we might as well
+ * go with the slash here too.
+ *
+ **************************************************************************** */
+
+static char *extend_filename( const char *base_name, const char *new_ext)
{
- const char *ext;
+ char *retval;
+ char *ext;
unsigned int len; /* should this be size_t? */
+ const char *root;
+ root = strrchr(base_name, '/');
+ if ( root == NULL ) root = base_name;
+
+ ext = strrchr(root, '.');
+ if ( ext != NULL )
+ {
+ if ( strcasecmp(ext, new_ext) == 0 )
+ {
+ ext = NULL;
+ }
+ }
+
+ len = ext ? (ext - base_name) : (unsigned int)strlen(base_name) ;
+ retval = safe_malloc(len+strlen(new_ext)+1, "extending file-name");
+ memcpy( retval, base_name, len);
+ retval[len] = 0;
+ strcat(retval, new_ext);
+
+ return( retval);
+}
+
+/* **************************************************************************
+ *
+ * Function name: init_output
+ * Synopsis: After the Input Source File has been opened, assign
+ * the name for the Binary Output File; initialize
+ * the FCode Output Buffer; assign names for the
+ * FLoad List, Dependency-List, and Missing-Files
+ * List files; open them and write their first
+ * entries to them.
+ * Announce the Input and various output file names.
+ *
+ * Inputs:
+ * Parameters:
+ * in_name Name of the Input Source File
+ * out_name Name of the Binary Output File, if
+ * specified on the Command Line,
+ * or NULL if not.
+ * Global Variables:
+ * fload_list Whether to create an FLoad-List file
+ * dependency_list Whether to create a Dependency-List file
+ * Local Static Variables:
+ * include_list_full_path Full Path to the Input Source File;
+ * should still be valid from opening
+ * of Primary Source Input file, for
+ * first entry to Dependency-List file.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * oname Binary Output File Name
+ * ostart Start of FCode Output Buffer
+ * opc FCode Output Buffer Position Counter
+ * abs_token_no Initialized to 1
+ * Local Static Variables:
+ * load_list_name Name of the Load List File
+ * load_list_file FLoad List File Structure pointer
+ * depncy_list_name Name of the Dependency List File ptr
+ * depncy_file Dependency List File Structure
+ * missing_list_name Name of the Missing-Files-List File
+ * missing_list_file Missing-Files-List File Structure
+ * no_files_missing Initialized to TRUE
+ * Memory Allocated
+ * Binary Output File Name Buffer
+ * FCode Output Buffer
+ * FLoad List File Name Buffer
+ * Dependency List File Name Buffer
+ *
+ * When Freed?
+ * In close_output()
+ * File Output:
+ * FLoad List or Dependency List files are opened (if specified).
+ * Primary Source Input file name and path, respectively,
+ * are written as the first entry to each.
+ * Printout:
+ * (Announcement of input file name has already been made)
+ * Announce binary output, fload- and dependency- -list file names
+ *
+ * Error Detection:
+ * Failure to open FLoad List or Dependency List file: ERROR;
+ * suppress binary output. Further attempts to write to
+ * FLoad List or Dependency List files are prevented by
+ * the respective FILE_structure pointers being NULL.
+ * Failure to open Missing-Files-List file: WARNING
+ *
+ * Process Explanation:
+ * If no Output File Name was specified on the Command Line, the
+ * name of the Binary (FCode) Output File will be derived
+ * from the name of the Input File by replacing its extension
+ * with .fc , or, if the Input File had no extension, by
+ * merely appending the extension .fc
+ * In the odd case where the Input File name has an extension
+ * of .fc, we will merely append another .fc extension.
+ * If fload_list is TRUE (i.e., the "-l" option was specified on
+ * the command-line, the FLoad List File name will be derived
+ * from the name of the Output File by the same rules, only with
+ * an extension of .fl Open the FLoad List File. Write the
+ * name of the initial input file to the FLoad List File.
+ * Similarly if the "-P" command-line option was specified, the name
+ * of the Dependency List File will be derived with an extension
+ * of .P Open it and write the Full Path for the initial input
+ * file to it. NOTE: To do that, we need to have preserved the
+ * Full Path-name Buffer from the call to init_stream() We
+ * will "finish" it here, after we've used it.
+ * The Missing-Files-List File will be created if either option was
+ * specified. Its name will be derived similarly, with an
+ * extension of .fl.missing
+ *
+ **************************************************************************** */
+
+void init_output( const char *in_name, const char *out_name )
+{
/* preparing output */
- if( out_name )
- oname = (u8 *)strdup( out_name );
- else {
- ext=strrchr(in_name, '.');
- len=ext ? (unsigned int)(ext-in_name) : (unsigned int)strlen(in_name) ;
- oname=malloc(len+4);
- memcpy(oname, in_name, len);
- oname[len] = 0;
- strcat((char *)oname, ".fc");
+ if( out_name != NULL )
+ {
+ oname = strdup( out_name );
+ }else{
+ oname = extend_filename( in_name, ".fc");
}
/* output buffer size. this is 128k per default now, but we
* could reallocate if we run out. KISS for now.
*/
- ostart=malloc(OUTPUT_SIZE);
- if (!ostart) {
- free(oname);
- free(start);
- return -1;
+ olen = OUTPUT_SIZE;
+ ostart=safe_malloc(olen, "initting output buffer");
+
+ opc = 0;
+ init_emit(); /* Init'l'zns needed by our companion file, emit.c */
+
+ printf("Binary output to %s ", oname);
+ if ( fload_list )
+ {
+ load_list_name = extend_filename( oname, ".fl");
+ load_list_file = fopen( load_list_name,"w");
+ printf(" FLoad-list to %s ", load_list_name);
}
+ if ( dependency_list )
+ {
+ depncy_list_name = extend_filename( oname, ".P");
+ depncy_file = fopen( depncy_list_name,"w");
+ printf(" Dependency-list to %s ", depncy_list_name);
+ }
+ printf("\n");
- opc=oend=ostart;
- oend+=OUTPUT_SIZE;
+ add_to_load_lists( in_name);
- /* We're beginning a new output file, so we have to
- * start our own fcode numbers at 0x800 again.
- */
- nextfcode=0x800;
+ /* Let's avoid collisions between stdout and stderr */
+ FFLUSH_STDOUT
+
+ /* Now we can deliver our advisory and error messages */
- return 0;
+ {
+ /* Suspend showing filename in advisory and error messages. */
+ char *temp_iname = iname;
+ iname = NULL;
+
+ finish_incl_list_scan( TRUE);
+
+ if ( fload_list && (load_list_file == NULL) )
+ {
+ could_not_open( TKERROR, load_list_name, "Load-List");
+ free( load_list_name);
+ }
+ if ( dependency_list && (depncy_file == NULL) )
+ {
+ could_not_open( TKERROR, depncy_list_name,
+ "Dependency-List");
+ free( depncy_list_name);
}
-int close_stream(void)
+ if ( fload_list || dependency_list )
+ {
+ missing_list_name = extend_filename( oname, ".fl.missing");
+ missing_list_file = fopen( missing_list_name,"w");
+ no_files_missing = TRUE;
+
+ if ( missing_list_file == NULL )
+ {
+ could_not_open( WARNING, missing_list_name,
+ "Missing-Files List" );
+ free( missing_list_name);
+ }
+ }
+ iname = temp_iname;
+ }
+ abs_token_no = 1;
+}
+
+/* **************************************************************************
+ *
+ * Function name: increase_output_buffer
+ * Synopsis: Reallocate the Output Buffer to double its prior size
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * ostart Start-address of current Output Buffer
+ * olen Current size of the Output Buffer
+ * Local Static Variables:
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * olen Doubled from value at input
+ * ostart Start-address of new Output Buffer
+ * Memory Allocated
+ * A new FCode Output Buffer, using the realloc() facility.
+ * When Freed?
+ * In close_output()
+ * Memory Freed
+ * Former FCode Output Buffer, also by means of realloc()
+ *
+ * Printout:
+ * Advisory message that this is taking place.
+ *
+ * Error Detection:
+ * FATAL if realloc() fails.
+ * FATAL if output buffer has been expanded to a size beyond
+ * what an INT can express. Unlikely? maybe; impossible? no...
+ *
+ * Process Explanation:
+ * Because we are allowing the Output Buffer to be relocated, we
+ * must take care to limit the exposure to external routines
+ * of its actual address. All references to locations within
+ * the Output Buffer should be made in terms of an _offset_.
+ *
+ * Extraneous Remarks:
+ * Unfortunately, it is not feasible to completely isolate the
+ * actual address of the Output Buffer, but we will keep the
+ * exposure limited to the routines in emit.c
+ * Similarly, it wasn't feasible to keep this routine isolated,
+ * nor the variable olen , but we will limit their exposure.
+ *
+ **************************************************************************** */
+void increase_output_buffer( void ); /* Keep the prototype local */
+void increase_output_buffer( void )
{
+ u8 *newout;
+
+ if ( olen == 0 )
+ {
+ tokenization_error( FATAL,
+ "Output Buffer reallocation overflow.");
+ }else{
+ unsigned int rea_len;
+ olen = olen * 2;
+ rea_len = olen;
+ if ( rea_len == 0 ) rea_len = (unsigned int)-1;
+ tokenization_error( INFO,
+ "Output Buffer overflow. "
+ "Relocating and increasing to %d bytes.\n", rea_len);
+
+ newout = realloc(ostart, rea_len);
+ if ( newout == NULL)
+ {
+ tokenization_error( FATAL,
+ "Could not reallocate %d bytes for Output Buffer", rea_len);
+ }
+
+ ostart = newout;
+ }
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: close_stream
+ * Synopsis: Free-up the memory used for the current input file
+ * whenever it is closed. Reset pointers and
+ * line-counter. Close files as necessary.
+ *
+ * The dummy parameter is there to accommodate Macro-recursion protection.
+ * It's a long story; don't get me started...
+ *
+ **************************************************************************** */
+
+void close_stream( _PTR dummy)
+{
free(start);
free(iname);
- return 0;
+ start = NULL;
+ iname = NULL;
+ lineno = 0;
}
-int close_output(void)
+/* **************************************************************************
+ *
+ * Function name: close_output
+ * Synopsis: Write the Binary Output file, if appropriate.
+ * Return a "Failure" flag.
+ *
+ **************************************************************************** */
+
+
+bool close_output(void)
{
+ bool retval = TRUE; /* "Failure" */
+ if ( error_summary() )
+ {
+ if ( opc == 0 )
+{
+ retval = FALSE; /* "Not a problem" */
+ }else{
FILE *outfile;
- unsigned int len;
- len=(unsigned long)opc-(unsigned long)ostart;
+ outfile=fopen( oname,"w");
+ if (!outfile)
+ {
+ /* Don't do this as a tokenization_error( TKERROR
+ * because those are all counted, among other reasons...
+ */
+ printf( "Could not open file %s for output.\n", oname);
+ }else{
- outfile=fopen((char *)oname,"w");
- if (!outfile) {
- printf("toke: error opening output file.\n");
- return -1;
+ if ( fwrite(ostart, opc, 1, outfile) != 1 )
+ {
+ tokenization_error( FATAL, "While writing output.");
}
- if(fwrite(ostart, len, 1, outfile)!=1)
- printf ("toke: error while writing output.\n");
-
fclose(outfile);
- printf("toke: wrote %d bytes to bytecode file '%s'\n", len, oname);
+ printf("toke: wrote %d bytes to bytecode file '%s'\n",
+ opc, oname);
+ retval = FALSE; /* "No problem" */
+ }
+ }
+ }
free(oname);
- return 0;
+ free(ostart);
+ oname = NULL;
+ ostart = NULL;
+ opc = 0;
+ olen = OUTPUT_SIZE;
+
+ if ( load_list_file != NULL )
+ {
+ fclose(load_list_file);
+ free(load_list_name);
+ }
+ if ( depncy_file != NULL )
+ {
+ fclose(depncy_file);
+ free(depncy_list_name);
+ }
+ if ( missing_list_file != NULL )
+ {
+ fclose( missing_list_file);
+ if ( no_files_missing )
+ {
+ remove( missing_list_name);
+ }
+ free( missing_list_name);
+ }
+
+ load_list_file = NULL;
+ load_list_name = NULL;
+ missing_list_file = NULL;
+ missing_list_name = NULL;
+ depncy_file = NULL;
+ depncy_list_name = NULL;
+
+ return ( retval );
}
Modified: fcode-utils/toke/stream.h
===================================================================
--- fcode-utils/toke/stream.h 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/toke/stream.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -1,3 +1,6 @@
+#ifndef _H_STREAM
+#define _H_STREAM
+
/*
* OpenBIOS - free your system!
* ( FCode tokenizer )
@@ -24,15 +27,68 @@
*
*/
-#ifndef _H_STREAM
-#define _H_STREAM
+/* **************************************************************************
+ * Modifications made in 2005 by IBM Corporation
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Modifications Author: David L. Paktor dlpaktor(a)us.ibm.com
+ **************************************************************************** */
-int init_stream( const char *name );
-int close_stream(void);
-int init_output( const char *inname, const char *outname );
-int close_output(void);
+#include "types.h"
-extern unsigned int lineno;
+/* **************************************************************************
+ *
+ * Exported Global Variables
+ *
+ **************************************************************************** */
+
+/* input pointers */
+extern u8 *start;
+extern u8 *pc;
+extern u8 *end;
extern char *iname;
+extern unsigned int lineno; /* Line Number within current input file */
+extern unsigned int abs_token_no; /* Absolute Token Number in Source Input */
+/* output pointers */
+extern char *oname; /* output file name */
+
+extern unsigned int opc; /* output buffer position counter */
+
+/* **************************************************************************
+ *
+ * Note that the variables ostart and olen , as well as the routine
+ * increase_output_buffer are not listed here.
+ *
+ * We would have preferred to isolate them completely, but we would have
+ * to disrupt the organization of emit.c (which we'd rather not);
+ * in order to avoid exporting them any more widely than necessary,
+ * we will declare them extern only in the file where they are
+ * unavoidably needed.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ * Macro Name: OUTPUT_SIZE
+ * Initial size of the Output Buffer
+ *
+ **************************************************************************** */
+
+#define OUTPUT_SIZE 131072
+
+
+/* **************************************************************************
+ *
+ * Exported Functions
+ *
+ **************************************************************************** */
+
+void add_to_include_list( char *dir_compt);
+void display_include_list( void);
+FILE *open_expanded_file( const char *path_name, char *mode, char *for_what);
+bool init_stream( const char *name );
+void close_stream( _PTR dummy);
+void init_output( const char *inname, const char *outname );
+bool close_output(void);
+void init_inbuf(char *inbuf, unsigned int buflen);
+
#endif /* _H_STREAM */
Added: fcode-utils/toke/strsubvocab.c
===================================================================
--- fcode-utils/toke/strsubvocab.c (rev 0)
+++ fcode-utils/toke/strsubvocab.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,337 @@
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * General-purpose support functions for
+ * String-Substitution-type vocabularies
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * A String-Substitution vocabulary, as the name implies, is one in
+ * in which each an entry consists of two strings; one that is
+ * sought, and one that is returned as a substitute. Macros and
+ * aliases are implemented this way, as are also user-supplied
+ * command-line symbol definitions.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Functions Exported:
+ * init_str_sub_vocab Initialize a String-Substitution vocab
+ * add_str_sub_entry Add an entry to a Str-Subst vocab
+ * lookup_str_sub Look for a name in a String-Substitution
+ * vocab, return the substitution string.
+ * exists_in_str_sub Confirm whether a given name exists in a
+ * String-Substitution vocabulary
+ * create_str_sub_alias Duplicate the behavior of one name with
+ * another name. Return a "success" flag.
+ * reset_str_sub_vocab Reset a given Str-Subst vocab to its initial
+ * "Built-In" position.
+ *
+ *
+ **************************************************************************** */
+
+#include <stdio.h>
+#include <stdlib.h>
+#if defined(__linux__) && ! defined(__USE_BSD)
+#define __USE_BSD
+#endif
+#include <string.h>
+
+#include "errhandler.h"
+#include "strsubvocab.h"
+
+
+/* **************************************************************************
+ *
+ * Function name: init_str_sub_vocab
+ * Synopsis: Dynamically initialize the link-pointers
+ * of the.given String-Substitution vocabulary
+ *
+ * Inputs:
+ * Parameters:
+ * str_sub_vocab_tbl Pointer to the initial Str-Subst vocab array
+ * max_indx Maximum Index of the initial array.
+ *
+ * Outputs:
+ * Returned Value: None
+ * Global Variables:
+ * The link-fields of the initial Str-Subs vocab array entries
+ * will be filled in.
+ *
+ **************************************************************************** */
+
+void init_str_sub_vocab( str_sub_vocab_t *str_sub_vocab_tbl, int max_indx)
+{
+ int indx;
+ for ( indx = 1 ; indx < max_indx ; indx++ )
+ {
+ str_sub_vocab_tbl[indx].next = &str_sub_vocab_tbl[indx-1];
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: add_str_sub_entry
+ * Synopsis: Add an entry to the given Str-Subst vocab
+ *
+ * Inputs:
+ * Parameters: Pointer to:
+ * ename space containing the name of the entry
+ * subst_str space containing the substitution string
+ * *str_sub_vocab the "tail" of the Str-Subst vocab-list
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Supplied Pointers:
+ * *str_sub_vocab Will point to new entry
+ * Memory Allocated:
+ * Memory for the new entry will be allocated.
+ * When Freed?
+ * When reset_str_sub_vocab() is applied to the same vocab-list.
+ * In some instances, the new entry will be freed upon end
+ * of tokenization; in others, only on termination of program.
+ *
+ * Error Detection:
+ * Failure to allocate memory is a Fatal Error.
+ *
+ * Process Explanation:
+ * The name and substitution-string pointers are presumed to already
+ * point to stable memory-spaces. Memory will be allocated
+ * for the entry itself; its pointers will be entered and the
+ * given pointer-to-the-tail-of-the-vocabulary will be updated.
+ *
+ * Extraneous Remarks:
+ * This might have been where we would have checked for re-aliasing,
+ * but the introduction of the approach to aliasing embodied in
+ * the various create_..._alias() routines neatly bypasses it.
+ *
+ **************************************************************************** */
+
+void add_str_sub_entry( char *ename,
+ char *subst_str,
+ str_sub_vocab_t **str_sub_vocab )
+{
+ str_sub_vocab_t *new_entry;
+
+ new_entry = safe_malloc(sizeof(str_sub_vocab_t), "adding str_sub_entry");
+ new_entry->name = ename;
+ new_entry->alias = subst_str;
+ new_entry->next = *str_sub_vocab;
+
+ *str_sub_vocab = new_entry;
+
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: lookup_str_sub
+ * Synopsis: Look for a name in the given Str-Subst vocabulary
+ *
+ * Inputs:
+ * Parameters:
+ * tname The "target" name for which to look
+ * str_sub_vocab The Str-Subst vocab-list
+ *
+ * Outputs:
+ * Returned Value: Pointer to the substitution string, or
+ * NULL pointer if name not found.
+ * May be NULL if subst'n string is NULL.
+ *
+ **************************************************************************** */
+
+char *lookup_str_sub( char *tname, str_sub_vocab_t *str_sub_vocab )
+{
+ str_sub_vocab_t *curr;
+ char *retval = NULL;
+
+ for (curr = str_sub_vocab ; curr != NULL ; curr=curr->next)
+ {
+ if ( strcasecmp(tname, curr->name) == 0 )
+ {
+ retval = curr->alias;
+ break;
+ }
+ }
+ return ( retval ) ;
+}
+
+/* **************************************************************************
+ *
+ * Function name: exists_in_str_sub
+ * Synopsis: Confirm whether a given name exists in a given
+ * String-Substitution vocabulary
+ *
+ * Inputs:
+ * Parameters:
+ * tname The "target" name for which to look
+ * str_sub_vocab Pointer to the Str-Subst vocab-list
+ *
+ * Outputs:
+ * Returned Value: TRUE if the name is found
+ *
+ * Extraneous Remarks:
+ * Because the Returned Value of lookup_str_sub() may be NULL for
+ * other reasons than that the name was not found, we cannot
+ * rely on that routine, and must replicate the outer-shell
+ * of its structure.
+ *
+ **************************************************************************** */
+
+bool exists_in_str_sub( char *tname, str_sub_vocab_t *str_sub_vocab )
+{
+ str_sub_vocab_t *curr;
+ bool retval = FALSE;
+
+ for (curr = str_sub_vocab ; curr != NULL ; curr=curr->next)
+ {
+ if ( strcasecmp(tname, curr->name) == 0 )
+ {
+ retval = TRUE;
+ break;
+ }
+ }
+ return ( retval );
+
+}
+
+/* **************************************************************************
+ *
+ * Function name: create_str_sub_alias
+ * Synopsis: Create an Alias in a String-Substitution vocabulary
+ * Return a "success" flag.
+ *
+ * Associated FORTH word: ALIAS
+ *
+ * Inputs:
+ * Parameters:
+ * old_name Name of existing entry
+ * new_name New name for which to create an entry
+ * *str_sub_vocab Pointer to "tail" of Str-Subst vocab-list
+ *
+ * Outputs:
+ * Returned Value: TRUE if old_name found in str_sub_vocab
+ * Supplied Pointers:
+ * *str_sub_vocab Will be updated to point to the new entry
+ * Memory Allocated:
+ * A copy of the "old" name's substitution string.
+ * When Freed?
+ * When reset_str_sub_vocab() is applied to the same vocab-list.
+ * In some instances, the new entry will be freed when the
+ * device-node in which it was created is "finish"ed; in
+ * others, only on termination of the program.
+ *
+ * Process Explanation:
+ * The "new" name is presumed to point to a stable memory-space.
+ * If the given "old" name exists in the given Str-Subst vocab-list,
+ * duplicate the substitution string into newly-allocated memory
+ * and pass the duplicated string and the "new" name along to
+ * the add_str_sub_entry() routine and return TRUE.
+ * If the given "old" name does not exist in the given vocab-list,
+ * return FALSE.
+ *
+ * Extraneous Remarks:
+ * This neatly bypasses the question of re-aliasing... ;-)
+ *
+ * We can rely on testing for a returned NULL from lookup_str_sub()
+ * because we won't be applying this routine to any vocabulary
+ * that permits a NULL in its substitution string.
+ *
+ **************************************************************************** */
+
+bool create_str_sub_alias(char *new_name,
+ char *old_name,
+ str_sub_vocab_t **str_sub_vocab )
+{
+ bool retval = FALSE;
+ char *old_subst_str = lookup_str_sub( old_name, *str_sub_vocab );
+ if ( old_subst_str != NULL )
+ {
+ char *new_subst_str = strdup(old_subst_str );
+ add_str_sub_entry(new_name, new_subst_str, str_sub_vocab );
+ retval = TRUE ;
+ }
+
+ return ( retval );
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: reset_str_sub_vocab
+ * Synopsis: Reset a given Str-Subst vocab to its initial
+ * "Built-In" position.
+ *
+ * Inputs:
+ * Parameters:
+ * *str_sub_vocab Pointer to the Str-Subst vocab-list
+ * reset_position Position to which to reset the list
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Supplied Pointers:
+ * *str_sub_vocab Reset to given "Built-In" position.
+ * Memory Freed
+ * All memory allocated by user-definitions will be freed
+ *
+ * Process Explanation:
+ * The "stable memory-spaces" to which the name and substitution
+ * string pointers point are presumed to have been acquired
+ * by allocation of memory, which is reasonable for entries
+ * created by the user as opposed to the built-in entries,
+ * which we are, in any case, not releasing.
+ * The substitution-string pointer may be null; watch out when
+ * we free() it; not all C implementations forgive that.
+ *
+ **************************************************************************** */
+
+void reset_str_sub_vocab(
+ str_sub_vocab_t **str_sub_vocab ,
+ str_sub_vocab_t *reset_position )
+{
+ str_sub_vocab_t *next_t;
+
+ next_t = *str_sub_vocab;
+ while ( next_t != reset_position )
+ {
+ next_t = (*str_sub_vocab)->next ;
+
+ free( (*str_sub_vocab)->name );
+ if ( !(*str_sub_vocab)->alias )
+ {
+ free( (*str_sub_vocab)->alias );
+ }
+ free( *str_sub_vocab );
+ *str_sub_vocab = next_t ;
+ }
+}
+
Added: fcode-utils/toke/strsubvocab.h
===================================================================
--- fcode-utils/toke/strsubvocab.h (rev 0)
+++ fcode-utils/toke/strsubvocab.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,85 @@
+#ifndef _TOKE_STRSUBVOCAB_H
+#define _TOKE_STRSUBVOCAB_H
+
+
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Headers, general-purpose support structures, function prototypes
+ * and macros for String-Substitution-type vocabularies.
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Structures:
+ * str_sub_vocab_t Entry in a String-Substitution-type vocab
+ *
+ * Macros:
+ * BUILTIN_STR_SUB Add an entry to the initial Str-Sub vocab.
+ *
+ **************************************************************************** */
+
+#include "types.h"
+
+
+typedef struct str_sub_vocab {
+ u8 *name;
+ u8 *alias;
+ struct str_sub_vocab *next;
+} str_sub_vocab_t;
+
+#if 0 /* On the way out */
+/*
+ * BUILTIN_STR_SUB Add an entry to the initial Str-Sub vocab.
+ *
+ * Arguments: (Both are strings)
+ * princ Principal name by which the string is known
+ * subst Substitution-string that replaces the Principal.
+ */
+#define BUILTIN_STR_SUB(princ, subst) \
+ { princ , subst , (str_sub_vocab_t *)NULL }
+#endif /* On the way out */
+
+
+void init_str_sub_vocab( str_sub_vocab_t *str_sub_vocab_tbl,
+ int max_indx);
+void add_str_sub_entry( char *ename,
+ char *subst_str,
+ str_sub_vocab_t **str_sub_vocab );
+char *lookup_str_sub( char *tname, str_sub_vocab_t *str_sub_vocab );
+bool create_str_sub_alias(char *new_name,
+ char *old_name,
+ str_sub_vocab_t **str_sub_vocab );
+bool exists_in_str_sub( char *tname, str_sub_vocab_t *str_sub_vocab );
+void reset_str_sub_vocab( str_sub_vocab_t **str_sub_vocab ,
+ str_sub_vocab_t *reset_position );
+
+
+#endif /* _TOKE_STRSUBVOCAB_H */
Added: fcode-utils/toke/ticvocab.c
===================================================================
--- fcode-utils/toke/ticvocab.c (rev 0)
+++ fcode-utils/toke/ticvocab.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,426 @@
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * General-purpose support functions for
+ * Threaded Interpretive Code (T. I. C.)-type vocabularies
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * We are going to implement a strategy that takes better advantage
+ * of the concept of Threaded Interpretive Code (well, okay,
+ * it won't really be interpretive ... ) We will use it to
+ * implement a small (but expandable) subset of FORTH-like
+ * commands in Tokenizer-Escape mode, as well as a few other
+ * things, such as conditional-tokenization.
+ *
+ * The Threaded Interpretive Code Header data structure is described
+ * in detail in the accompanying ticvocab.h header-file.
+ *
+ * In most cases, the contents of a beginning portion of the vocabulary
+ * are known at compile-time, and later parts are added by the
+ * user at run-time. (The linked-list structure is needed to allow
+ * for that.) We can initialize the known start of the vocabulary
+ * easily, except for the link-pointers, as an array.
+ * We can either explicitly state an index for each entry's link-pointer
+ * to the previous entry (which can become a problem to maintain) or
+ * have a function to initialize the links dynamically, at run-time.
+ * I think I will (regretfully, resignedly) choose the latter.
+ *
+ * We will define a few general-purpose functions for dealing with
+ * T. I. C. -type vocabularies. Eventually, it might be a good
+ * idea to convert all the vocabularies to this structure...
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ *
+ * Revision History:
+ * Mon, 19 Dec 2005 by David L. Paktor
+ * Begin converting most, if not all, of the vocabularies to
+ * T. I. C. -type structure.
+ *
+ **************************************************************************** */
+
+
+/* **************************************************************************
+ *
+ * Functions Exported:
+ * init_tic_vocab Initialize a TIC_HDR -type vocabulary
+ * add_tic_entry Add an entry to a TIC_HDR -type vocabulary
+ * lookup_tic_entry Look for a name in a TIC_HDR -type vocabulary
+ * handle_tic_vocab Perform a function in a TIC_HDR -type vocab
+ * exists_in_tic_vocab Confirm whether a given name exists in a
+ * TIC_HDR -type vocabulary
+ * create_tic_alias Duplicate the behavior of one name with
+ * another name. Return a "success" flag.
+ * reset_tic_vocab Reset a given TIC_HDR -type vocabulary to
+ * its "Built-In" position.
+ *
+ **************************************************************************** */
+
+
+/* **************************************************************************
+ *
+ * Global Variables Exported
+ * tic_found The entry, in a TIC_HDR -type vocabulary,
+ * that has just been found and is being
+ * "handled". Needed for protection against
+ * recursion in a User-defined Macro (which
+ * should occur only rarely).
+ *
+ **************************************************************************** */
+
+
+#include <stdlib.h>
+#include <string.h>
+#include "ticvocab.h"
+#include "errhandler.h"
+
+tic_hdr_t *tic_found;
+
+/* **************************************************************************
+ *
+ * Function name: init_tic_vocab
+ * Synopsis: Dynamically initialize the link-pointers
+ * of the.given TIC_HDR -type vocabulary
+ *
+ * Inputs:
+ * Parameters:
+ * tic_vocab_tbl Pointer to the initial TIC_HDR vocab array
+ * max_indx Maximum Index of the initial array.
+ * tic_vocab_ptr Pointer to the vocab "tail"
+ *
+ * Outputs:
+ * Returned Value: None
+ * Global Variables:
+ * The link-fields of the initial TIC_HDR vocab array entries
+ * will be filled in.
+ * Supplied Pointers:
+ * *tic_vocab_ptr Points to the last element in the array
+ *
+ * Process Explanation:
+ * The value that tic_vocab_ptr has upon entry to the routine
+ * (which may point to the end of another array which is to
+ * precede this one in the voacbulary) gets entered into
+ * the link-pointer field of the first element of the array.
+ * For this reason, it is important that all TIC_HDR vocabulary
+ * pointers that will be pased to this routine have their
+ * initial values explicitly declared NULL.
+ *
+ **************************************************************************** */
+
+void init_tic_vocab( tic_hdr_t *tic_vocab_tbl,
+ int max_indx,
+ tic_hdr_t **tic_vocab_ptr)
+{
+ int indx;
+ for ( indx = 0 ; indx < max_indx ; indx++ )
+ {
+ tic_vocab_tbl[indx].next = *tic_vocab_ptr;
+ *tic_vocab_ptr = &tic_vocab_tbl[indx];
+ }
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: add_tic_entry
+ * Synopsis: Add an entry to the given TIC_HDR -type vocabulary
+ *
+ * Inputs:
+ * Parameters:
+ * tname Pointer to space containing the name of the entry
+ * tfunct Pointer to the routine the new entry will call
+ * tparam The "parameter field" value (may be a pointer)
+ * fw_defr FWord Token of the entry's Definer
+ * pfldsiz Size of "param field" (if a pointer to alloc'd mem)
+ * ign_fnc Pointer to "ignoring" routine for new entry
+ * tic_vocab Pointer to ptr to "tail" of T.I.C.-type vocab-list
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Supplied Pointers:
+ * *tic_vocab Will point to new entry
+ * Memory Allocated:
+ * For the new entry.
+ * When Freed?
+ * When reset_tic_vocab() is applied to the same vocab-list.
+ *
+ * Error Detection:
+ * Failure to allocate memory is a Fatal Error.
+ *
+ * Process Explanation:
+ * The name pointer is presumed to already point to a stable,
+ * newly-allocated memory-space. If the parameter field is
+ * actually a pointer, it, too, is presumed to already have
+ * been allocated.
+ * Memory will be allocated for the entry itself; its pointers
+ * will be entered and the given pointer-to-the-tail-of-the-
+ * -vocabulary will be updated to point to the new entry.
+ *
+ **************************************************************************** */
+
+void add_tic_entry( char *tname,
+ void (*tfunct)(),
+ TIC_P_DEFLT_TYPE tparam,
+ fwtoken fw_defr,
+ int pfldsiz,
+ void (*ign_fnc)(),
+ tic_hdr_t **tic_vocab )
+{
+ tic_hdr_t *new_entry;
+
+ new_entry = safe_malloc(sizeof(tic_hdr_t), "adding tic_entry");
+ new_entry->name = tname;
+ new_entry->next = *tic_vocab;
+ new_entry->funct = tfunct;
+ new_entry->pfield.deflt_elem = tparam;
+ new_entry->fword_defr = fw_defr;
+ new_entry->ign_func = ign_fnc;
+ new_entry->pfld_size = pfldsiz;
+
+ *tic_vocab = new_entry;
+
+}
+
+/* **************************************************************************
+ *
+ * Function name: lookup_tic_entry
+ * Synopsis: Look for a name in the given TIC_HDR -type vocabulary
+ *
+ * Inputs:
+ * Parameters:
+ * tname The "target" name for which to look
+ * tic_vocab Pointer to the T. I. C. -type vocabulary
+ *
+ * Outputs:
+ * Returned Value: Pointer to the relevant entry, or
+ * NULL if name not found.
+ *
+ * Extraneous Remarks:
+ * We don't set the global tic_found here because this routine
+ * is not always called when the found function is going to
+ * be executed; sometimes it is called for error-detection,
+ * for instance...
+ *
+ **************************************************************************** */
+
+tic_hdr_t *lookup_tic_entry( char *tname, tic_hdr_t *tic_vocab )
+{
+ tic_hdr_t *curr ;
+
+ for (curr = tic_vocab ; curr != NULL ; curr=curr->next)
+ {
+ if ( strcasecmp(tname, curr->name) == 0 )
+ {
+ break;
+ }
+ }
+
+ return ( curr ) ;
+}
+
+/* **************************************************************************
+ *
+ * Function name: exists_in_tic_vocab
+ * Synopsis: Confirm whether the given name exists in the
+ * given TIC_HDR -type vocabulary
+ *
+ * Inputs:
+ * Parameters:
+ * tname The name for which to look
+ * tic_vocab Pointer to the T. I. C. -type vocabulary
+ *
+ * Outputs:
+ * Returned Value: TRUE if name is found,
+ *
+ **************************************************************************** */
+
+bool exists_in_tic_vocab( char *tname, tic_hdr_t *tic_vocab )
+{
+ tic_hdr_t *found ;
+ bool retval = FALSE;
+
+ found = lookup_tic_entry( tname, tic_vocab );
+ if ( found != NULL )
+ {
+ retval = TRUE;
+ }
+
+ return ( retval );
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: create_tic_alias
+ * Synopsis: Create an Alias in a TIC_HDR -type vocabulary
+ * Return a "success" flag.
+ *
+ * Associated FORTH word: ALIAS
+ *
+ * Inputs:
+ * Parameters:
+ * old_name Name of existing entry
+ * new_name New name for which to create an entry
+ * *tic_vocab Pointer to the "tail" of the
+ * T. I. C. -type vocab-list
+ *
+ * Outputs:
+ * Returned Value: TRUE if old_name found in given vocab
+ * Supplied Pointers:
+ * *tic_vocab Will be updated to point to the new entry
+ * Memory Allocated:
+ * For the new entry, by the support routine.
+ * When Freed?
+ * When reset_tic_vocab() is applied to the same vocab-list.
+ *
+ * Process Explanation:
+ * Both the "old" and "new" names are presumed to already point to
+ * stable, freshly allocated memory-spaces.
+ * Even if the "old" entry's pfld_size is not zero, meaning its
+ * param-field is a pointer to allocated memory, we still do
+ * not need to copy it into a freshly allocated memory-space,
+ * as long as we make the new alias-entry's pfld_size zero:
+ * the reference to the old space will work, and the old
+ * entry's param-field memory space will not be freed with
+ * the alias-entry but only with the "old" entry.
+ *
+ **************************************************************************** */
+
+bool create_tic_alias( char *new_name, char *old_name, tic_hdr_t **tic_vocab )
+{
+ tic_hdr_t *found ;
+ bool retval = FALSE;
+
+ found = lookup_tic_entry( old_name, *tic_vocab );
+ if ( found != NULL )
+ {
+ add_tic_entry( new_name, found->funct,
+ found->pfield.deflt_elem,
+ found->fword_defr,
+ 0, found->ign_func, tic_vocab );
+ retval = TRUE;
+ }
+
+ return ( retval );
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: handle_tic_vocab
+ * Synopsis: Perform the function associated with the given name
+ * in the given TIC_HDR -type vocabulary
+ *
+ * Inputs:
+ * Parameters:
+ * tname The "target" name for which to look
+ * tic_vocab Pointer to the T. I. C. -type vocabulary
+ *
+ * Outputs:
+ * Returned Value: TRUE if the given name is valid in the given vocab
+ * Global Variables:
+ * tic_found Points to the TIC entry of the "target"
+ * name, if it was found; else, NULL.
+ * Global Behavior:
+ * Whatever the associated function does...
+ *
+ * Process Explanation:
+ * Find the name and execute its associated function.
+ * If the name is not in the given vocabulary, return
+ * an indication; leave it to the calling routine
+ * to decide how to proceed.
+ *
+ **************************************************************************** */
+
+bool handle_tic_vocab( char *tname, tic_hdr_t *tic_vocab )
+{
+ bool retval = FALSE;
+
+ tic_found = lookup_tic_entry( tname, tic_vocab );
+ if ( tic_found != NULL )
+ {
+ tic_found->funct( tic_found->pfield);
+ retval = TRUE;
+ }
+
+ return ( retval ) ;
+}
+
+/* **************************************************************************
+ *
+ * Function name: reset_tic_vocab
+ * Synopsis: Reset a given TIC_HDR -type vocabulary to
+ * its given "Built-In" position.
+ *
+ * Inputs:
+ * Parameters:
+ * *tic_vocab Pointer to the T. I. C.-type vocab-list
+ * reset_position Position to which to reset the list
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Supplied Pointers:
+ * *tic_vocab Reset to given "Built-In" position.
+ * Memory Freed
+ * All memory allocated by user-definitions will be freed
+ *
+ * Process Explanation:
+ * The "stable memory-spaces" to which the name and parameter
+ * field pointers point are presumed to have been acquired
+ * by allocation of memory, which is reasonable for entries
+ * created by the user as opposed to the built-in entries,
+ * which we are, in any case, not releasing.
+ * The parameter-field size field tells us whether we need to
+ * free() the parameter-field pointer.
+ *
+ **************************************************************************** */
+
+void reset_tic_vocab( tic_hdr_t **tic_vocab, tic_hdr_t *reset_position )
+{
+ tic_hdr_t *next_t;
+
+ next_t = *tic_vocab;
+ while ( next_t != reset_position )
+ {
+ next_t = (*tic_vocab)->next ;
+
+ free( (*tic_vocab)->name );
+ if ( (*tic_vocab)->pfld_size != 0 )
+ {
+ free( (*tic_vocab)->pfield.chr_ptr );
+ }
+ free( *tic_vocab );
+ *tic_vocab = next_t ;
+ }
+}
Added: fcode-utils/toke/ticvocab.h
===================================================================
--- fcode-utils/toke/ticvocab.h (rev 0)
+++ fcode-utils/toke/ticvocab.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,478 @@
+#ifndef _TOKE_TICVOCAB_H
+#define _TOKE_TICVOCAB_H
+
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * General-purpose support structures and function prototypes for
+ * Threaded Interpretive Code (T. I. C.)-type vocabularies.
+ * See ticvocab.c
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Structures:
+ *
+ * The Threaded Interpretive Code Header data structure consists of:
+ * (1) A pointer to the function name as seen in the source
+ * (2) A link to the next (well, preceding) element
+ * (3) A Pointer to the routine to run as the function's behavior
+ * during active processing. It takes the "parameter field"
+ * item as its argument and has no return-value.
+ * (4) The "parameter field" item, which will be passed as an
+ * argument to the function. It may be an FCode- or FWord-
+ * -token, or an item of another type, or a pointer to data.
+ * The function may re-cast it as needed.
+ * (5) The "Definer" of the entry; a member of the subset of FWord-
+ * -tokens that may be Definers.
+ * (6) A Pointer to a routine to be run when the word is encountered
+ * in a Conditional Compilation section that is being ignored.
+ * Certain functions still need to be recognized in that state,
+ * and will require special behaviors; those that can be simply
+ * ignored will have a NULL pointer in this field. The function
+ * in this field, also, takes the "parameter field" item as its
+ * argument and has no return-value.
+ * (7) The size of the data pointed to by the "parameter field" item,
+ * if it is a pointer to allocated data; used to allocate space
+ * for a copy of the p.f. when making an alias, and to indicate
+ * whether the space needs to be freed. Automatic procedures
+ * are too often fooled, so we don't leave things to chance...
+ * To accommodate C's insistence on strong-typing, we might need
+ * to define different "parameter field" structure-types; see
+ * description of "Parameter Field as a union", below.
+ *
+ * It's not an exact name, but we'll still call it a T. I. C. Header
+ *
+ * We will use this structure for most of our vocabularies...
+ *
+ ****************************************************************************
+ *
+ * The "Parameter Field" is a union of several alternative types,
+ * for convenience, to avert excessive type-casting. It may
+ * either be the Parameter Data itself (if it is small enough)
+ * or a pointer to Parameter Data.
+ * In the case where the Parameter Field is the data itself, or is a
+ * pointer to hard-coded (non-allocated) data, the "size" field
+ * will be zero, to indicate that no space allocation is required.
+ * The types are (starting with the default for initialization)
+ * A long integer (including an FCode Token)
+ * An FWord Token
+ * A pointer to a boolean variable
+ * A pointer to a character or a character string
+ * If the parameter field value is intended to be a single character,
+ * it must be recast as a long integer, in order to preserve
+ * portability across big- and little- -endian platforms.
+ *
+ **************************************************************************** */
+
+/* ************************************************************************** *
+ *
+ * Macros:
+ * NO_PARAM_TIC Create an entry in the initial "Built-In"
+ * portion of a TIC-type vocabulary with
+ * an empty "param field".
+ * NO_PARAM_IGN Create an entry with an empty "param field"
+ * whose action- and "Ignore"- -functions
+ * are the same.
+ * VALPARAM_TIC " ... with a literal value for the "param field"
+ * DUALFUNC_TIC " ... with a literal "param" and both an action-
+ * and an "Ignore"- -function.
+ * DUFNC_FWT_PARM A tic_fwt_hdr_t -type entry with a literal
+ * "param" and both an action-function and an
+ * "Ignore"-function.
+ * FWORD_TKN_TIC " ... with an FWord Token for the "param field"
+ * DUALFUNC_FWT_TIC " " ... and both action- and "Ignore"- -function
+ * BUILTIN_MAC_TIC A tic_mac_hdr_t -type entry with a Macro-
+ * -Substitution-String "param"
+ * BUILTIN_BOOL_TIC A tic_bool_hdr_t -type entry with a boolean-
+ * -variable-pointer "param"
+ *
+ **************************************************************************** */
+
+#include "types.h"
+#include "dictionary.h"
+
+/* **************************************************************************
+ *
+ * In order to work around C's limitations regarding data-typing
+ * during initialization, we need to create some alternative
+ * data-structures that exactly match the layout of tic_hdr_t
+ * as defined above, but have a different default-type for
+ * the parameter field.
+ * I apologize in advance for any maintenance awkwardnesses this
+ * might engender; I would have come up with a more convenient
+ * way to do this if I could. At least, the pieces that need
+ * to be co-ordinated are in close proximity to each other...
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * The differences are all centered in the "parameter field" of
+ * the TIC header structure. In order to make sure all the
+ * alternative types map smoothly into each other, we will
+ * create a series of "union" types, differing only in what
+ * their default type is. We will keep the "parameter field"
+ * item the size of a Long Integer.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * This form is the default type.
+ *
+ **************************************************************************** */
+
+#define TIC_P_DEFLT_TYPE long
+typedef union tic_param
+ {
+ TIC_P_DEFLT_TYPE deflt_elem ; /* The "default element" aspect. */
+ long long_val ; /* Explicitly specifying "long" */
+ fwtoken fw_token ; /* FWord Token */
+ bool *bool_ptr ; /* Pointer to a boolean variable */
+ char *chr_ptr ; /* Pointer to a character string */
+
+ /* The "character value" aspect behaves differently on big-
+ * versus little- -endian platforms (for initialization,
+ * anyway), so we cannot actually use it.
+ * Keep this commented-out, as a reminder.
+ */
+ /* char char_val ; */
+ /* We will recast "character value" as an integer. */
+
+ } tic_param_t ;
+
+typedef struct tic_hdr
+ {
+ char *name;
+ struct tic_hdr *next;
+ void (*funct)(); /* Function for active processing */
+ tic_param_t pfield;
+ fwtoken fword_defr; /* FWord Token of entry's Definer */
+ void (*ign_func)(); /* Function in "Ignored" segment */
+ int pfld_size;
+ } tic_hdr_t ;
+
+/* **************************************************************************
+ *
+ * This form is for initialization of an FWord Token list.
+ *
+ **************************************************************************** */
+
+#define TIC_FWT_P_DEFLT_TYPE fwtoken
+typedef union tic_fwt_param
+ {
+ TIC_FWT_P_DEFLT_TYPE deflt_elem ; /* "Default element" aspect. */
+ long long_val ; /* Long integer */
+ fwtoken fw_token ; /* Explicit FWord Token */
+ bool *bool_ptr ; /* Pointer to a boolean variable */
+ char *chr_ptr ; /* Pointer to a character string */
+ } tic_fwt_param_t ;
+
+typedef struct tic_fwt_hdr
+ {
+ char *name;
+ struct tic_fwt_hdr *next;
+ void (*funct)(); /* Function for active processing */
+ tic_fwt_param_t pfield;
+ fwtoken fword_defr; /* FWord Token of entry's Definer */
+ void (*ign_func)(); /* Function in "Ignored" segment */
+ int pfld_size;
+ } tic_fwt_hdr_t ;
+
+
+/* **************************************************************************
+ *
+ * The third form is for initialization of Built-in Macros. Its
+ * default parameter field type is a pointer to a compiled-in
+ * (i.e., constant) character string. Its pfld_size can be
+ * left as zero, because no allocated-memory copies of the
+ * string will be needed, even for aliases. (User-created
+ * macros, however, will need to allocate strings; we will
+ * deal with that elsewhere...)
+ *
+ **************************************************************************** */
+
+#define TIC_MAC_P_DEFLT_TYPE char *
+typedef union tic_mac_param
+ {
+ TIC_MAC_P_DEFLT_TYPE deflt_elem ; /* "Default element" aspect. */
+ long long_val ; /* Long integer */
+ fwtoken fw_token ; /* FWord Token */
+ bool *bool_ptr ; /* Pointer to a boolean variable */
+ char *chr_ptr ; /* Explicit Pointer to char str. */
+ } tic_mac_param_t ;
+
+typedef struct tic_mac_hdr
+ {
+ char *name;
+ struct tic_mac_hdr *next;
+ void (*funct)();
+ tic_mac_param_t pfield;
+ fwtoken fword_defr;
+ void (*ign_func)();
+ int pfld_size;
+ } tic_mac_hdr_t ;
+
+/* **************************************************************************
+ *
+ * The next form is for initialization of Condtionals. Its default
+ * parameter field type is a pointer to a boolean variable.
+ *
+ **************************************************************************** */
+
+#define TIC_BOOL_P_DEFLT_TYPE bool *
+typedef union tic_bool_param
+ {
+ TIC_BOOL_P_DEFLT_TYPE deflt_elem ; /* "Default element" aspect. */
+ long long_val ; /* Long integer */
+ fwtoken fw_token ; /* FWord Token */
+ bool *bool_ptr ; /* Explicit Ptr to boolean v'ble */
+ char *chr_ptr ; /* Pointer to a character string */
+ } tic_bool_param_t ;
+
+typedef struct tic_bool_hdr
+ {
+ char *name;
+ struct tic_bool_hdr *next;
+ void (*funct)();
+ tic_bool_param_t pfield;
+ fwtoken fword_defr;
+ void (*ign_func)();
+ int pfld_size;
+ } tic_bool_hdr_t ;
+
+
+
+/* **************************************************************************
+ *
+ * Various macros to create an entry in the initial "Built-In" portion
+ * of a vocabulary-list, specified as an array of one of the
+ * matching forms of a T. I. C. Header; each macro adjusts type
+ * casting as needed.
+ * In all cases, the "size" field will be set to zero, indicating that
+ * the "param field" item is either the complete data or a pointer
+ * to a hard-coded (non-allocated) data item.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ * Macro Name: NO_PARAM_TIC
+ * Create an entry in the initial "Built-In" portion
+ * of a TIC_HDR -type vocabulary with an empty
+ * "param field"
+ *
+ * Arguments:
+ * nam (string) Name of the entry as seen in the source
+ * func (routine-name) Name of internal function to call
+ *
+ **************************************************************************** */
+#define NO_PARAM_TIC(nam, func ) \
+ { nam , (tic_hdr_t *)NULL , func , { 0 }, UNSPECIFIED , NULL , 0 }
+
+
+/* **************************************************************************
+ * Macro Name: NO_PARAM_IGN
+ * Create an entry with an empty "param field"
+ * whose action-function and "Ignore"-function
+ * are the same.
+ *
+ * Arguments:
+ * nam (string) Name of the entry as seen in the source
+ * func (routine-name) Name of internal function to call for both
+ *
+ *
+ **************************************************************************** */
+#define NO_PARAM_IGN(nam, func ) \
+ { nam , (tic_hdr_t *)NULL , func , { 0 }, UNSPECIFIED , func , 0 }
+
+
+/* **************************************************************************
+ *
+ * Variations on the above, to compensate for Type-Casting complications
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ * Macro Name: VALPARAM_TIC
+ * Create an entry in the initial "Built-In" portion
+ * of a TIC_HDR -type vocabulary with a literal
+ * value for the "param field" and a specifiable
+ * "definer".
+ * Arguments:
+ * nam (string) Name of the entry as seen in the source
+ * func (routine-name) Name of internal function to call
+ * pval (integer) The "param field" item
+ * definr (fword_token) "Definer" of the entry
+ *
+ * The "param field" item will be recast to the required default type.
+ *
+ **************************************************************************** */
+
+#define VALPARAM_TIC(nam, func, pval, definr ) \
+ { nam , (tic_hdr_t *)NULL , func , \
+ { (TIC_P_DEFLT_TYPE)(pval) }, definr , NULL , 0 }
+
+
+/* **************************************************************************
+ * Macro Name: DUALFUNC_TIC
+ * Create an entry in the initial "Built-In" portion
+ * of a TIC_HDR -type vocabulary with both an
+ * "active" and an "ignoring" function, a literal
+ * value for the "param field" and a specifiable
+ * "definer".
+ *
+ * Arguments:
+ * nam (string) Name of the entry as seen in the source
+ * afunc (routine-name) Name of internal "active" function
+ * pval (integer) The "param field" item
+ * ifunc (routine-name) Name of "ignoring" function
+ * definr (fword_token) "Definer" of the entry
+ *
+ * The "param field" item will be recast to the required default type.
+ *
+ **************************************************************************** */
+#define DUALFUNC_TIC(nam, afunc, pval, ifunc, definr ) \
+ { nam , (tic_hdr_t *)NULL , afunc , \
+ { (TIC_P_DEFLT_TYPE)(pval) }, definr , ifunc , 0 }
+
+/* Similar but a tic_fwt_hdr_t type structure */
+#define DUFNC_FWT_PARM(nam, afunc, pval, ifunc, definr ) \
+ { nam , (tic_fwt_hdr_t *)NULL , afunc , \
+ { (TIC_FWT_P_DEFLT_TYPE)(pval) }, definr , ifunc , 0 }
+
+
+/* **************************************************************************
+ * Macro Name: FWORD_TKN_TIC
+ * Create an entry in the initial "Built-In" portion
+ * of an FWord Token list of tic_fwt_hdr_t type.
+ *
+ * Arguments:
+ * nam (string) Name of the entry as seen in the source
+ * func (routine-name) Name of internal function to call
+ * fw_tokval (fword_token) Value of the FWord Token
+ * definr (fword_token) "Definer" of the entry
+ *
+ * The "param field" item should not need be recast.
+ *
+ **************************************************************************** */
+
+#define FWORD_TKN_TIC(nam, func, fw_tokval, definr ) \
+ { nam , (tic_fwt_hdr_t *)NULL , func , { fw_tokval }, definr , NULL , 0 }
+
+/* **************************************************************************
+ * Macro Name: DUALFUNC_FWT_TIC
+ * Create an entry in the initial "Built-In" portion
+ * of an FWord Token list of tic_fwt_hdr_t type
+ * with both an action- and an "Ignore"- -function.
+ *
+ * Arguments:
+ * nam (string) Name of the entry as seen in the source
+ * afunc (routine-name) Name of internal "Action" function
+ * fw_tokval (fword_token) Value of the FWord Token
+ * ifunc (routine-name) Name of "ignoring" function
+ * definr (fword_token) "Definer" of the entry
+ *
+ * The "param field" item should not need be recast.
+ *
+ **************************************************************************** */
+#define DUALFUNC_FWT_TIC(nam, afunc, fw_tokval, ifunc, definr ) \
+ { nam , (tic_fwt_hdr_t *)NULL , afunc , { fw_tokval }, definr , ifunc , 0 }
+
+/* **************************************************************************
+ * Macro Name: BUILTIN_MAC_TIC
+ * Create an entry in the initial "Built-In" portion
+ * of a Macros vocabulary of tic_mac_hdr_t type.
+ *
+ * Arguments:
+ * nam (string) Name of the entry as seen in the source
+ * func (routine-name) Name of internal function to call
+ * alias (string) Macro-Substitution string
+ *
+ * The "param field" item should not need be recast.
+ * The "definer" will be MACRO_DEF
+ * Builtin Macros do not need to be expanded while Ignoring, so
+ * the ign_func will be NULL
+ *
+ **************************************************************************** */
+
+#define BUILTIN_MAC_TIC(nam, func, alias ) \
+ { nam , (tic_mac_hdr_t *)NULL , func , { alias }, MACRO_DEF , NULL , 0 }
+
+
+/* **************************************************************************
+ * Macro Name: BUILTIN_BOOL_TIC
+ * Create an entry in the initial "Built-In" portion
+ * of a Condtionals list of tic_bool_hdr_t type.
+ *
+ * Arguments:
+ * nam (string) Name of the entry as seen in the source
+ * func (routine-name) Name of internal function to call
+ * bool_vbl (boolean v'ble) Name of the boolean variable.
+ *
+ * The "param field" item should not need be recast.
+ * For all of the Condtionals, the "Ignoring" function is the same
+ * as the "Active" function.
+ * The "definer" will be COMMON_FWORD
+ *
+ **************************************************************************** */
+
+#define BUILTIN_BOOL_TIC(nam, func, bool_vbl ) \
+ { nam , (tic_bool_hdr_t *)NULL , func , { &bool_vbl }, \
+ COMMON_FWORD , func , 0 }
+
+
+/* **************************************************************************
+ *
+ * Exported Variables and Function Prototypes the rest of the way...
+ *
+ **************************************************************************** */
+
+extern tic_hdr_t *tic_found;
+
+void init_tic_vocab( tic_hdr_t *tic_vocab_tbl,
+ int max_indx,
+ tic_hdr_t **tic_vocab_ptr);
+void add_tic_entry( char *tname,
+ void (*tfunct)(),
+ TIC_P_DEFLT_TYPE tparam,
+ fwtoken fw_defr,
+ int pfldsiz,
+ void (*ign_fnc)(),
+ tic_hdr_t **tic_vocab );
+tic_hdr_t *lookup_tic_entry( char *tname, tic_hdr_t *tic_vocab );
+bool exists_in_tic_vocab( char *tname, tic_hdr_t *tic_vocab );
+bool handle_tic_vocab( char *tname, tic_hdr_t *tic_vocab );
+bool create_tic_alias( char *new_name,
+ char *old_name,
+ tic_hdr_t **tic_vocab );
+void reset_tic_vocab( tic_hdr_t **tic_vocab, tic_hdr_t *reset_position );
+
+#endif /* _TOKE_TICVOCAB_H */
Modified: fcode-utils/toke/toke.c
===================================================================
--- fcode-utils/toke/toke.c 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/toke/toke.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -7,7 +7,7 @@
* This program is part of a free implementation of the IEEE 1275-1994
* Standard for Boot (Initialization Configuration) Firmware.
*
- * Copyright (C) 2001-2005 by Stefan Reinauer <stepan(a)openbios.org>
+ * Copyright (C) 2001-2006 by Stefan Reinauer <stepan(a)openbios.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -24,6 +24,12 @@
*
*/
+/* **************************************************************************
+ * Modifications made in 2005 by IBM Corporation
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Modifications Author: David L. Paktor dlpaktor(a)us.ibm.com
+ **************************************************************************** */
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -34,47 +40,214 @@
#include <getopt.h>
#endif
+#include "types.h"
#include "toke.h"
#include "stream.h"
#include "stack.h"
#include "emit.h"
-#define TOKE_VERSION "0.6.10"
+#define TOKE_VERSION "1.0.0"
-int verbose=0;
-int noerrors=0;
+#include "vocabfuncts.h"
+#include "scanner.h"
+#include "errhandler.h"
+#include "usersymbols.h"
+#include "clflags.h"
+#include "tracesyms.h"
+#define CORE_COPYR "(C) Copyright 2001-2006 Stefan Reinauer.\n" \
+ "(C) Copyright 2006 coresystems GmbH <info(a)coresystems.de>"
+#define IBM_COPYR "(C) Copyright 2005 IBM Corporation. All Rights Reserved."
+
+/* Temporary hack during development... See DATE_STAMP line below... */
+#ifdef DEVEL
+#include "date_stamp.h"
+#endif /* DEVEL */
+
+/* **************************************************************************
+ *
+ * Global Variables Exported:
+ * verbose If true, enable optional messages.
+ * noerrors If true, create binary even if error(s) encountered.
+ * fload_list If true, create an "FLoad-List" file
+ * dependency_list If true, create a "Dependencies-List" file
+ *
+ **************************************************************************** */
+
+bool verbose = FALSE;
+bool noerrors = FALSE;
+bool fload_list = FALSE;
+bool dependency_list = FALSE;
+
+/* **************************************************************************
+ *
+ * Internal Static Variables
+ * outputname Name of output file supplied on command-line
+ * with the optional -o switch.
+ * Internal System Variable
+ * optind Index into argv vector of first param after options,
+ * from which input file names will be taken.
+ *
+ **************************************************************************** */
+
+static char *outputname = NULL;
+
+/* **************************************************************************
+ *
+ * Print the copyright message.
+ *
+ **************************************************************************** */
static void print_copyright(void)
{
- printf( "Welcome to toke - OpenBIOS tokenizer v%s\nCopyright (c)"
- " 2001-2005 by Stefan Reinauer <stepan(a)openbios.org>\n"
+ printf( "Welcome to toke - OpenBIOS tokenizer v" TOKE_VERSION "\n"
+ CORE_COPYR "\n" IBM_COPYR "\n"
"This program is free software; you may redistribute it "
"under the terms of\nthe GNU General Public License. This "
- "program has absolutely no warranty.\n\n", TOKE_VERSION);
+ "program has absolutely no warranty.\n\n");
+#ifdef DEVEL
+ /* Temporary hack during development... */
+ printf( "\tTokenizer Compiled " DATE_STAMP "\n" );
+#endif /* DEVEL */
+
}
+/* **************************************************************************
+ *
+ * Function name: usage
+ * Synopsis: Print convenient usage-help message
+ *
+ **************************************************************************** */
+
static void usage(char *name)
{
- printf("usage: %s [-v] [-i] [-o target] <forth-file>\n\n",name);
- printf(" -v|--verbose print debug messages\n");
- printf(" -i|--ignore-errors don't bail out after an error\n");
+ printf("usage: %s [-v] [-i] [-l] [-P] [-o target] <[-d name[=value]]> "
+ "<[-f [no]flagname]> <[-I dir-path]> "
+ "<[-T symbol]> <forth-file>\n\n",name);
+ printf(" -v|--verbose print Advisory messages\n");
+ printf(" -i|--ignore-errors don't suppress output after errors\n");
+ printf(" -l|--load-list create list of FLoaded file names\n");
+ printf(" -P|--dependencies create dePendency-list file\n");
+ printf(" -o|--output-name send output to filename given\n");
+ printf(" -d|--define create user-defined symbol\n");
+ printf(" -f|--flag set (or clear) Special-Feature flag\n");
+ printf(" -I|--Include add a directory to the Include-List\n");
+ printf(" -T|--Trace add a symbol to the Trace List\n");
printf(" -h|--help print this help message\n\n");
-
+ printf(" -f|--flag help Help for Special-Feature flags\n");
}
-int main(int argc, char **argv)
+/* **************************************************************************
+ *
+ * Function name: get_args
+ * Synopsis: Parse the Command-Line option switches
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * argc Counter of command-line arguments
+ * argv Vector pointing to command-line arguments
+ * Command-Line Items: The entire command-line will be parsed
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * verbose set by "-v" switch
+ * noerrors set by "-i" switch
+ * fload_list set by "-l" switch
+ * dependency_list set by "-P" switch
+ * Internal Static Variables
+ * outputname set by "-o" switch
+ * Internal System Variable
+ * optind Index into argv vector of the position
+ * from which to take input file names.
+ * Printout:
+ * (Copyright was already printed by the main body as a
+ * matter of course, rather than here depending on
+ * the Verbose flag, because getopt() prints its
+ * own error messages and we want to be sure to show
+ * the Copyright notice before any error messages.)
+ * Rules for Usage and Flags-list or Flags-help display:
+ * Usage message on Help-Request or error.
+ * Ask for usage help, get Usage plus list of Flag Names.
+ * Ask for Flags-help alone, get Flags-help (names plus
+ * explanations)
+ * Ask for usage help and for Flags-help, get Usage plus
+ * Flags-help, without redundant list of Flag Names.
+ * Any help-request, exit Zero
+ * Error in Option switches, or missing input-file name,
+ * get error-description plus Usage
+ * Error in Flag Names, get list of Flag Names.
+ * Any error, exit One.
+ * Behavior:
+ * Exit (non-failure) after printing "Help" message
+ *
+ * Error Detection: Exit with failure status on:
+ * Unknown Option switches or Flag Names
+ * Missing input file name
+ *
+ * Process Explanation:
+ * The following switches are recognized:
+ * v
+ * h
+ * ?
+ * i
+ * I
+ * l
+ * P
+ * o
+ * d
+ * f
+ * T
+ * The conditions they set remain in effect through
+ * the entire program run.
+ *
+ * Revision History:
+ * Updated Fri, 15 Jul 2005 by David L. Paktor
+ * Don't bail on first invalid option.
+ * Flags to control special features
+ * Usage messages for "special-feature" flags
+ * Updated Mon, 18 Jul 2005 by David L. Paktor
+ * Fine-tune Usage and Flags-list or Flags-help display.
+ * Updated Sun, 27 Nov 2005 by David L. Paktor
+ * Add FLoad-List flag
+ * Updated Wed, 29 Nov 2005 by David L. Paktor
+ * Make getopt() case-insensitive
+ * Updated Fri, 17 Mar 2006 by David L. O'Paktor
+ * Make getopt() case-sensitive again,
+ * add include-list support and dePendency-list switch
+ *
+ * Extraneous Remarks:
+ * We were originally thinking about defining various classes
+ * of "Warning" Messages and (somehow) controlling their
+ * display, but now that we have "special-feature" flags
+ * that control the generation of specific messages, that
+ * step has become unnecessary...
+ *
+ **************************************************************************** */
+
+static void get_args( int argc, char **argv )
{
- const char *optstring="vhio:?";
- char *outputname = NULL;
+ const char *optstring="vhilPo:d:f:I:T:?";
int c;
+ int argindx = 0;
+ bool inval_opt = FALSE;
+ bool help_mssg = FALSE;
+ bool cl_flag_error = FALSE;
while (1) {
#ifdef __GLIBC__
int option_index = 0;
static struct option long_options[] = {
{ "verbose", 0, 0, 'v' },
+ { "help", 0, 0, 'h' },
{ "ignore-errors", 0, 0, 'i' },
- { "help", 0, 0, 'h' },
+ { "load-list", 0, 0, 'l' },
+ { "dependencies", 0, 0, 'P' },
+ { "output-name", 1, 0, 'o' },
+ { "define", 1, 0, 'd' },
+ { "flag", 1, 0, 'f' },
+ { "Include", 1, 0, 'I' },
+ { "Trace", 1, 0, 'T' },
{ 0, 0, 0, 0 }
};
@@ -86,63 +259,169 @@
if (c == -1)
break;
+ argindx++;
switch (c) {
case 'v':
- verbose=1;
+ verbose=TRUE;
break;
case 'o':
outputname = optarg;
break;
case 'i':
- noerrors=1;
+ noerrors = TRUE;
break;
+ case 'l':
+ fload_list = TRUE;
+ break;
+ case 'P':
+ dependency_list = TRUE;
+ break;
+ case 'd':
+ {
+ char *user_symb = optarg;
+ add_user_symbol(user_symb);
+ }
+ break;
+ case 'f':
+ cl_flag_error = set_cl_flag(optarg, FALSE) ;
+ break;
+ case 'I':
+ {
+ char *incl_list_elem = optarg;
+ add_to_include_list(incl_list_elem);
+ }
+ break;
+ case 'T':
+ add_to_trace_list(optarg);
+ break;
+ case '?':
+ /* Distinguish between a '?' from the user
+ * and one getopt() returned
+ */
+ if ( argv[argindx][1] != '?' )
+ {
+ inval_opt = TRUE;
+ break;
+ }
case 'h':
- case '?':
- print_copyright();
- usage(argv[0]);
- return 0;
+ case 'H':
+ help_mssg = TRUE;
+ break;
default:
- print_copyright();
+ /* This is never executed
+ * because getopt() prints the
+ * "unknown option -- X"
+ * message and returns a '?'
+ */
printf ("%s: unknown options.\n",argv[0]);
usage(argv[0]);
- return 1;
+ exit( 1 );
}
}
- if (verbose)
- print_copyright();
+ if ( help_mssg )
+ {
+ usage(argv[0]);
+ if ( ! clflag_help )
+ {
+ list_cl_flag_names();
+ }
+ }
+ if ( clflag_help ) cl_flags_help();
+ if ( help_mssg || clflag_help )
+ {
+ exit( 0 );
+ }
- if (optind >= argc) {
- print_copyright();
- printf ("%s: filename missing.\n",argv[0]);
+ if ( inval_opt ) printf ("unknown options.\n");
+ if (optind >= argc) printf ("Input file name missing.\n");
+ if ( inval_opt || (optind >= argc) )
+ {
usage(argv[0]);
- return 1;
}
+ if ( cl_flag_error ) list_cl_flag_names();
+ if ( inval_opt || (optind >= argc) || cl_flag_error )
+ {
+ exit( 1);
+ }
+
+ if (verbose)
+ {
+ list_user_symbols();
+ list_cl_flag_settings();
+ display_include_list();
+ }
+ save_cl_flags();
+}
+
+/* **************************************************************************
+ *
+ * Main body of program. Return 0 for success, 1 for failure.
+ *
+ * Still to be done:
+ * Devise a syntax to allow the command-line to specify multiple
+ * input files together with an output file name for each.
+ * Currently, the syntax allows only one output file name to be
+ * specified; when multiple input file names are specified,
+ * the specification of an output file name is disallowed,
+ * and only the default output file names are permitted.
+ * While this works around the immediate problem, a more
+ * elegant solution could be devised...
+ *
+ **************************************************************************** */
+
+int main(int argc, char **argv)
+{
+ int retval = 0;
+
+ print_copyright();
+ get_args( argc, argv );
+
init_stack();
init_dictionary();
- init_macros();
+
init_scanner();
- while (optind < argc) {
- if (init_stream(argv[optind])) {
- printf ("%s: warning: could not open file \"%s\"\n",
- argv[0], argv[optind]);
- optind++;
- continue;
+ if ( outputname != NULL )
+ {
+ if ( argc > optind + 1 )
+ {
+ /* Multiple input file names w/ single output file name */
+ /* Work-around */
+ printf( "Cannot specify single output file name "
+ "with multiple input file names.\n"
+ "Please either remove output-file-name specification,\n"
+ "or use multiple commands.\n");
+ exit ( -2 );
+ }
}
+
+ for ( ; optind < argc ; optind++ )
+ {
+ bool stream_ok ;
+
+ printf("\nTokenizing %s ", argv[optind]);
+ init_error_handler();
+ stream_ok = init_stream( argv[optind]);
+ if ( stream_ok )
+ {
init_output(argv[optind], outputname);
+ init_scan_state();
+
+ reset_vocabs();
+ reset_cl_flags();
+
tokenize();
finish_headers();
- close_output();
- close_stream();
-
- optind++;
+ close_stream( NULL);
+ if ( close_output() ) retval = 1;
+ }
}
exit_scanner();
- return 0;
+ return retval;
}
Modified: fcode-utils/toke/toke.h
===================================================================
--- fcode-utils/toke/toke.h 2006-08-18 09:45:11 UTC (rev 75)
+++ fcode-utils/toke/toke.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -1,3 +1,6 @@
+#ifndef _TOKE_TOKE_H
+#define _TOKE_TOKE_H
+
/*
* OpenBIOS - free your system!
* ( FCode tokenizer )
@@ -24,30 +27,25 @@
*
*/
-#ifndef _H_TOKE
-#define _H_TOKE
+/* **************************************************************************
+ * Modifications made in 2005 by IBM Corporation
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Modifications Author: David L. Paktor dlpaktor(a)us.ibm.com
+ **************************************************************************** */
-#define u8 unsigned char
-#define u16 unsigned short
-#define u32 unsigned int
-#define s16 short
-#define bool int
-#define TRUE (-1)
-#define FALSE (0)
-#define ANSI_ONLY
-extern void init_scanner( void );
-extern void exit_scanner( void );
+#include "types.h"
-extern void init_dictionary( void );
-extern void init_macros( void );
-extern void tokenize( void );
-extern u16 lookup_token(char *name);
-extern u16 lookup_fword(char *name);
-extern char *lookup_macro(char *name);
-extern int add_token(u16 number, char *name);
+/* ************************************************************************** *
+ *
+ * Global Variables Exported
+ *
+ **************************************************************************** */
-extern int add_macro(char *name, char *alias);
+extern bool verbose;
+extern bool noerrors;
+extern bool fload_list;
+extern bool dependency_list;
-#endif /* _H_TOKE */
+#endif /* _TOKE_TOKE_H */
Added: fcode-utils/toke/tokzesc.c
===================================================================
--- fcode-utils/toke/tokzesc.c (rev 0)
+++ fcode-utils/toke/tokzesc.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,771 @@
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Process activity inside "Tokenizer Escape" mode.
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Functions Exported:
+ * init_tokz_esc_vocab Initialize the relevant vocabulary.
+ * enter_tokz_esc Enter "Tokenizer Escape" mode
+ * handle_tokz_esc Perform a function in the
+ * "Tokenizer Escape" Vocabulary
+ * exists_in_tokz_esc Confirm whether a given name exists in
+ * the "Tokz_Esc_Vocabulary"
+ * create_tokz_esc_alias Add an alias to "Tokenizer Escape" space
+ * reset_tokz_esc Reset the "Tokenizer Escape" Vocabulary
+ * to its "Built-In" position.
+ *
+ **************************************************************************** */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include "ticvocab.h"
+#include "tokzesc.h"
+#include "stack.h"
+#include "emit.h"
+#include "stream.h"
+#include "scanner.h"
+#include "errhandler.h"
+#include "strsubvocab.h"
+#include "nextfcode.h"
+
+#undef TOKZTEST /* Define for testing only; else undef */
+#ifdef TOKZTEST /* For testing only */
+ #include "vocabfuncts.h"
+ #include "date_stamp.h"
+#endif /* For testing only */
+
+/* **************************************************************************
+ *
+ * Global Variables Imported
+ * in_tokz_esc State of the tokenization operation.
+ * Value is FALSE if it's operating normally
+ * or TRUE if it's in "Tokenizer Escape" mode.
+ * nextfcode
+ * statbuf
+ * dstack Pointer to current item on top of Data Stack.
+ * base Current tokenizer numeric conversion radix
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * We are going to implement a mini-forth using a strategy based
+ * on the concept of Threaded Interpretive Code (well, okay,
+ * it won't really be interpretive ... )
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Internal Static Variables -- (well, almost)
+ * tokz_esc_vocab Pointer to "tail" of "Tokenizer Escape" Vocab
+ *
+ * While we would prefer to keep tokz_esc_vocab private to this file,
+ * we find we need it in one other place, namely, macros.c
+ * We will declare it "extern" within that file, rather than
+ * exporting it widely by including it in a .h file
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * We will define and initialize a structure consisting of all the
+ * functions we initially support for "Tokenizer Escape" mode,
+ * called tokz_esc_vocab_tbl for "Tokenizer Escape Vocab Table".
+ * I expect we can initialize its body, but I don't think there's a
+ * convenient way in "C" to initialize its links; we'll have to
+ * do that dynamically, at run-time. Oh, well...
+ *
+ * We'll call the pointer to it the "Tokenizer Escape" Vocabulary.
+ * We have to declare it here, because we need to refer to it in
+ * a function that will be entered into the Table.
+ *
+ * We would like to pre-initialize it; to do so, we would have to
+ * declare it extern here, then later create its instance and
+ * assign its initial value. That would be all well and good,
+ * except that some linkers don't handle that very well, so, to
+ * accommodate those, we have to include its initialization in
+ * the same routine where we initialize the Table's links.
+ *
+ * Revision History:
+ * Updated Wed, 04 Jan 2006 by David L. Paktor
+ * Initialization of tokz_esc_vocab is now included with
+ * the call to init_tic_vocab()
+ *
+ **************************************************************************** */
+
+tic_hdr_t *tokz_esc_vocab = NULL ;
+
+/* **************************************************************************
+ *
+ * We'll give short prologs to the simpler functions that will be
+ * used in the "Tokenizer Escape" Vocabulary.
+ *
+ * All these take, as an argument, the "parameter field" pointer.
+ * To satisfy C's strong-typing, it will always be declared
+ * of a consistent type. The routine itself can internally
+ * recast -- or ignore -- it, as needed.
+ * Many of these will refer to the Global Variable statbuf . It
+ * all such cases, it is used for Error reporting.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Function name: enter_tokz_esc
+ * Synopsis: When you start "Tokenizer Escape" mode.
+ *
+ * Associated Tokenizer directive: TOKENIZER[
+ *
+ * Process Explanation:
+ * Enter "Tokenizer Escape" mode ... Save the current tokenizer
+ * numeric conversion radix, and set the radix to sixteen
+ * (hexadecimal)
+ *
+ **************************************************************************** */
+
+static int saved_base ; /* Place to save the numeric conversion radix */
+
+void enter_tokz_esc( void )
+{
+ saved_base = base ;
+ base = 16;
+ in_tokz_esc = TRUE;
+}
+
+/* **************************************************************************
+ *
+ * Function name: end_tokz_esc
+ * Synopsis: When you've reached the end of "Tokenizer Escape" mode.
+ *
+ * Associated Tokenizer directive: ]TOKENIZER
+ *
+ * Process Explanation:
+ * Exit "Tokenizer Escape" mode, resume "Normal"-mode behavior.
+ * Restore the tokenizer numeric conversion radix to the value
+ * saved by tokenizer[ and exit "Tokenizer Escape" mode . . .
+ *
+ **************************************************************************** */
+
+static void end_tokz_esc( tic_param_t pfield )
+{
+ in_tokz_esc = FALSE;
+ base = saved_base ;
+}
+
+/* **************************************************************************
+ *
+ * Function name: tokz_esc_emit_byte
+ * Synopsis: Emit the byte found on the data-stack
+ *
+ * Associated Tokenizer directive: EMIT-BYTE
+ *
+ * Error Detection:
+ * If number on stack is larger than a byte: Truncate and Warn
+ *
+ **************************************************************************** */
+
+static void tokz_esc_emit_byte ( tic_param_t pfield )
+{
+ long num_on_stk = dpop();
+ u8 byt_to_emit = (u8)num_on_stk;
+ if ( byt_to_emit != num_on_stk )
+ {
+ tokenization_error( WARNING,
+ "Value on stack for %s command is 0x%0x. "
+ "Truncating to 0x%02x.\n",
+ strupr(statbuf), num_on_stk, byt_to_emit);
+ }
+ user_emit_byte(byt_to_emit);
+}
+
+/* **************************************************************************
+ *
+ * Function name: get_fcode_from_stack
+ * Synopsis: Retrieve an FCode value from the data-stack.
+ * Indicate if erroneous
+ *
+ * Inputs:
+ * Parameters:
+ * the_num Pointer to where to put the number
+ * the_action Phrase to be used in ERROR message
+ * Data-Stack Items:
+ * Top: Value to be retrieved
+ *
+ * Outputs:
+ * Returned Value: TRUE if number is within valid FCode range
+ * Supplied Pointers:
+ * *the_num Value retrieved from the data-stack
+ *
+ * Error Detection:
+ * If the number on the stack is larger than 16 bits, truncate
+ * it, with a WARNING message.
+ * If the (possibly truncated) number from the stack is larger
+ * than the legal maximum for an FCode (0x0fff), or
+ * less than the legal minimum (0x0800), issue an ERROR,
+ * leave the_num unchanged and return FALSE.
+ *
+ **************************************************************************** */
+
+static bool get_fcode_from_stack( u16 *the_num, char *the_action)
+{
+ bool retval = FALSE;
+ long num_on_stk = dpop();
+ u16 test_fcode = (u16)num_on_stk;
+ if ( test_fcode != num_on_stk )
+ {
+ tokenization_error( WARNING,
+ "Value on stack for %s command is 0x%0x. "
+ "Truncating to 0x%03x.\n",
+ strupr(statbuf), num_on_stk, test_fcode);
+ }
+ if ( ( test_fcode >= 0x800 ) && ( test_fcode <= 0xfff ) )
+ {
+ retval = TRUE;
+ *the_num = test_fcode;
+ }else{ tokenization_error( TKERROR, "Attempt to %s "
+ "0x%x, which violates limit specified by IEEE-1275. "
+ "Disallowing.\n", the_action, test_fcode );
+ }
+ return( retval );
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: tokz_esc_next_fcode
+ * Synopsis: Set the next-fcode to the value on the data-stack
+ *
+ * Associated Tokenizer Directive: next-fcode
+ *
+ * Error Detection:
+ * If the number on the stack is not legal for an FCode, as
+ * detected by get_fcode_from_stack(), issue an ERROR
+ * message and don't change nextfcode.
+ *
+ * Printout:
+ * Advisory showing change in FCode token Assignment Counter
+ *
+ **************************************************************************** */
+
+static void tokz_esc_next_fcode( tic_param_t pfield )
+{
+ u16 test_fcode;
+
+ if ( get_fcode_from_stack( &test_fcode, "set next fcode to") )
+ {
+ if ( test_fcode == nextfcode )
+ {
+ tokenization_error( INFO, "FCode-token Assignment Counter "
+ "is unchanged from 0x%x.\n",
+ nextfcode);
+ }else{
+ tokenization_error( INFO, "FCode-token Assignment Counter "
+ "was 0x%x; has been %s to 0x%x.\n",
+ nextfcode,
+ test_fcode > nextfcode ? "advanced" : "reset",
+ test_fcode );
+ set_next_fcode( test_fcode);
+ }
+ }
+}
+
+/* **************************************************************************
+ *
+ * Function name: tokz_emit_fcode
+ * Synopsis: Emit the value on the data-stack as an FCode token
+ *
+ * Associated Tokenizer Directive: emit-fcode
+ *
+ * Error Detection:
+ * If the number on the stack is not legal for an FCode, as
+ * detected by get_fcode_from_stack(), issue an ERROR
+ * message and don't emit anything.
+ *
+ * Printout:
+ * Advisory showing FCode being emitted.
+ *
+ **************************************************************************** */
+
+static void tokz_emit_fcode( tic_param_t pfield )
+{
+ u16 test_fcode;
+
+ if ( get_fcode_from_stack( &test_fcode, "Emit FCode value of") )
+ {
+ tokenization_error( INFO,
+ "Emitting FCode value of 0x%x\n", test_fcode);
+ emit_fcode( test_fcode);
+ }
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: zero_equals
+ * Synopsis: Boolean-inversion of item on top of stack.
+ * If zero, make it minus-one; if non-zero, make it zero.
+ *
+ * Associated FORTH word-name: 0=
+ *
+ **************************************************************************** */
+
+static void zero_equals ( tic_param_t pfield )
+{
+ *dstack = (*dstack == 0) ? -1 : 0 ;
+}
+
+/* **************************************************************************
+ *
+ * Function name: tokz_esc_swap
+ * Synopsis: "Tokenizer Escape" mode-time data-stack SWAP operation
+ *
+ * Associated FORTH word-name: swap
+ *
+ **************************************************************************** */
+
+static void tokz_esc_swap ( tic_param_t pfield )
+{
+ swap();
+}
+
+/* **************************************************************************
+ *
+ * Function name: tokz_esc_two_swap
+ * Synopsis: "Tokenizer Escape" mode-time data-stack 2SWAP operation
+ *
+ * Associated FORTH word-name: 2swap
+ *
+ **************************************************************************** */
+
+static void tokz_esc_two_swap ( tic_param_t pfield )
+{
+ two_swap();
+}
+
+/* **************************************************************************
+ *
+ * Function name: tokz_esc_noop
+ * Synopsis: "Tokenizer Escape" mode-time non-operation
+ *
+ * Associated FORTH word-name: noop
+ *
+ **************************************************************************** */
+
+static void tokz_esc_noop ( tic_param_t pfield )
+{
+ return;
+}
+
+#ifdef TOKZTEST /* For testing only */
+
+ static void tokz_esc_emit_string( tic_param_t pfield )
+ {
+ int lenny ;
+ lenny = strlen ( pfield.chr_ptr );
+ emit_token("b(\")");
+ emit_string(pfield.chr_ptr, lenny);
+ }
+
+#endif /* For testing only */
+
+/* **************************************************************************
+ *
+ * Function name: do_constant
+ * Synopsis: The function to perform when a named constant
+ * that was defined in "Tokenizer Escape" mode
+ * is invoked in "Tokenizer Escape" mode
+ *
+ * Associated FORTH word: A user-defined constant
+ *
+ * Inputs:
+ * Parameters:
+ * The param-field of the table-entry contains
+ * the value of the constant
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Items Pushed onto Data-Stack:
+ * Top: The table-entry's param-field's value
+ *
+ * Error Detection:
+ * An attempt, while operating in normal tokenization mode, to invoke
+ * a named constant that was defined in "Tokenizer Escape" mode
+ * will be detected by the main scanning loop, and need not
+ * concern us here.
+ *
+ **************************************************************************** */
+
+static void do_constant ( tic_param_t pfield )
+{
+ dpush( pfield.long_val );
+}
+
+/* **************************************************************************
+ *
+ * Function name: create_constant
+ * Synopsis: Create a user-defined constant that will be
+ * recognized in "Tokenizer Escape" mode
+ *
+ * Associated FORTH word-name: CONSTANT (when issued
+ * in "Tokenizer Escape" mode)
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * statbuf The constant's name will be taken from the
+ * next word in the input stream.
+ * do_constant The function assigned to the definition
+ * tokz_esc_vocab The "Tokenizer Escape" Vocabulary pointer
+ * Data-Stack Items:
+ * Top: The constant's value is popped from the stack
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * statbuf Advanced to the next word in the input stream.
+ * tokz_esc_vocab Updated to point to new vocab entry.
+ * Memory Allocated:
+ * for the name and for the new entry.
+ * When Freed?
+ * When RESET-SYMBOLS is issued in "Tokenizer Escape" mode,
+ * or upon end of tokenization.
+ * Data-Stack, # of Items Popped: 1
+ *
+ * Error Detection:
+ * Failure to allocate memory is a Fatal Error.
+ * Warning on excessively long name
+ * Warning on duplicate name
+ * Name to be defined not in same file, ERROR
+ *
+ * Process Explanation:
+ * Get the next word, STRDUP it (which implicitly allocates memory).
+ * Get the number popped off the stack.
+ * Pass the pointer and the value to the add_tic_entry() routine.
+ *
+ **************************************************************************** */
+
+static void create_constant( tic_param_t pfield )
+{
+ char *c_name_space ; /* Space for copy of the name */
+ long valu ; /* Value, popped off the stack */
+ signed long wlen;
+
+ /* Get the name that is to be defined */
+ wlen = get_word();
+ if ( wlen <= 0 )
+ {
+ warn_unterm( TKERROR, "Constant definition", lineno);
+ return;
+ }
+
+ valu = dpop();
+
+ /* If ever we implement more than just this one
+ * defining-word in "Tokenizer Escape" mode,
+ * the lines from here to the end of the
+ * routine should be re-factored...
+ */
+ trace_creation( CONST, statbuf);
+
+ warn_if_duplicate( statbuf );
+ check_name_length( wlen );
+
+ c_name_space = strdup( statbuf );
+
+ add_tic_entry(
+ c_name_space,
+ do_constant,
+ (TIC_P_DEFLT_TYPE)valu,
+ CONST ,
+ 0 , NULL,
+ &tokz_esc_vocab );
+
+}
+
+/* **************************************************************************
+ *
+ * Let's create usable named constants for "Tokenizer Escape" mode.
+ * It's useful, it's easy and ... well, you get the idea.
+ *
+ **************************************************************************** */
+/* I don't think we need to any more
+static const int zero = 0 ;
+static const int minus_one = -1 ;
+static const char double_quote = '"' ;
+static const char close_paren = ')' ;
+ * Except for this next one, of course... */
+#ifdef TOKZTEST /* For testing only */
+ static const char date_me[] = DATE_STAMP;
+#endif /* For testing only */
+
+/* **************************************************************************
+ *
+ * Here, at long last, we define and initialize the structure containing
+ * all the functions we support in "Tokenizer Escape" mode.
+ * Let's call it the "Tokenizer Escape Vocabulary Table" and the
+ * pointer to it, the "Tokenizer Escape" Vocabulary.
+ * We can initialize the start of the "Tokenizer Escape" Vocabulary
+ * easily, except for the link-pointers, as an array.
+ *
+ **************************************************************************** */
+
+#define TKZESC_CONST(nam, pval) \
+ VALPARAM_TIC(nam, do_constant, pval, CONST )
+#define TKZ_ESC_FUNC(nam, afunc, pval, ifunc) \
+ DUALFUNC_TIC(nam, afunc, pval, ifunc, UNSPECIFIED)
+
+static tic_hdr_t tokz_esc_vocab_tbl[] = {
+ NO_PARAM_IGN( "]tokenizer" , end_tokz_esc ) ,
+
+ /* An IBM-ish synonym. */
+ NO_PARAM_IGN( "f]" , end_tokz_esc ) ,
+ /* An alternate synonym. */
+ NO_PARAM_IGN( "]f" , end_tokz_esc ) ,
+
+ NO_PARAM_TIC( "emit-byte" , tokz_esc_emit_byte ) ,
+ NO_PARAM_TIC( "next-fcode" , tokz_esc_next_fcode ) ,
+ NO_PARAM_TIC( "emit-fcode" , tokz_emit_fcode ) ,
+ NO_PARAM_TIC( "constant" , create_constant ) ,
+ NO_PARAM_TIC( "0=" , zero_equals ) ,
+ NO_PARAM_TIC( "swap" , tokz_esc_swap ) ,
+ NO_PARAM_TIC( "2swap" , tokz_esc_two_swap ) ,
+ NO_PARAM_TIC( "noop" , tokz_esc_noop ) ,
+ TKZESC_CONST( "false" , 0 ) ,
+ TKZESC_CONST( "true" , -1 ) ,
+ TKZ_ESC_FUNC( ".(" , user_message, ')', skip_user_message ) ,
+ TKZ_ESC_FUNC( ".\"" , user_message, '"', skip_user_message ) ,
+#ifdef TOKZTEST /* For testing only */
+ /* Data is a pointer to a constant string in the compiler; */
+ /* no need to copy, hence data_size can remain zero. */
+ /* We could almost use the Macro macro, except for the type. */
+ TKZ_ESC_FUNC( "emit-date" , tokz_esc_emit_string, date_me , NULL ) ,
+#endif /* For testing only */
+};
+
+/* **************************************************************************
+ *
+ * Also, keep a pointer to the "Built-In" position of
+ * the "Tokenizer Escape" Vocabulary
+ *
+ **************************************************************************** */
+
+static const tic_hdr_t *built_in_tokz_esc =
+ &tokz_esc_vocab_tbl[(sizeof(tokz_esc_vocab_tbl)/sizeof(tic_hdr_t))-1];
+
+/* **************************************************************************
+ *
+ * Function name: init_tokz_esc_vocab
+ * Synopsis: Initialize the "Tokenizer Escape" Vocabulary
+ * link-pointers dynamically.
+ *
+ **************************************************************************** */
+
+void init_tokz_esc_vocab ( void )
+{
+ static const int tokz_esc_vocab_max_indx =
+ sizeof(tokz_esc_vocab_tbl)/sizeof(tic_hdr_t) ;
+
+ tokz_esc_vocab = NULL ; /* Belt-and-suspenders... */
+ init_tic_vocab(tokz_esc_vocab_tbl,
+ tokz_esc_vocab_max_indx,
+ &tokz_esc_vocab );
+}
+
+/* **************************************************************************
+ *
+ * Function name: handle_tokz_esc
+ * Synopsis: Perform a function in the "Tokenizer Escape" Vocabulary
+ * Indicate whether the name is valid in this vocabulary.
+ * Handle "Tokenizer Escape" aliases implicitly.
+ *
+ * Inputs:
+ * Parameters:
+ * tname The name to handle
+ * Global Variables:
+ * tokz_esc_vocab Pointer to "Tokenizer Escape" Vocabulary
+ *
+ * Outputs:
+ * Returned Value: TRUE if the given name is valid in tokz_esc
+ *
+ * Process Explanation:
+ * Find the name and execute its associated function.
+ * If the name is not in the "Tokenizer Escape" Vocabulary,
+ * let the calling routine determine whether to try it
+ * out as a number or to print an error message.
+ *
+ **************************************************************************** */
+
+bool handle_tokz_esc( char *tname )
+{
+ bool retval = handle_tic_vocab( tname, tokz_esc_vocab );
+ return ( retval ) ;
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: lookup_tokz_esc
+ * Synopsis: Return a pointer to the data-structure of the named
+ * word in the"Tokenizer Escape" Vocabulary
+ *
+ * Inputs:
+ * Parameters:
+ * name The given name for which to look
+ * Local Static Variables:
+ * tokz_esc_vocab Pointer to "Tokenizer Escape" Vocabulary
+ *
+ * Outputs:
+ * Returned Value: TRUE if name is found,
+ *
+ **************************************************************************** */
+
+tic_hdr_t *lookup_tokz_esc(char *name)
+{
+ tic_hdr_t *retval = lookup_tic_entry( name, tokz_esc_vocab );
+ return ( retval );
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: exists_in_tokz_esc
+ * Synopsis: Confirm whether a given name exists in the
+ * "Tokenizer Escape" Vocabulary
+ *
+ * Inputs:
+ * Parameters:
+ * name The given name to confirm
+ * Global Variables:
+ * tokz_esc_vocab Pointer to "Tokenizer Escape" Vocabulary
+ *
+ * Outputs:
+ * Returned Value: TRUE if name is found,
+ *
+ **************************************************************************** */
+
+bool exists_in_tokz_esc(char *name)
+{
+ bool retval = exists_in_tic_vocab( name, tokz_esc_vocab );
+ return ( retval );
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: create_tokz_esc_alias
+ * Synopsis: Create an alias in the "Tokenizer Escape" Vocabulary
+ *
+ * Associated FORTH word: ALIAS (in "Tokenizer Escape" mode)
+ *
+ * Inputs:
+ * Parameters:
+ * old_name Name of existing entry
+ * new_name New name for which to create an entry
+ *
+ * Outputs:
+ * Returned Value: TRUE if old_name found in "Tok Esc" vocab
+ * Global Variables:
+ * tokz_esc_vocab Will point to the new entry
+ * Memory Allocated:
+ * Memory for the new entry will be allocated
+ * by the support routine
+ * When Freed?
+ * When RESET-SYMBOLS is issued in "Tokenizer Escape" mode,
+ * or upon end of tokenization.
+ *
+ **************************************************************************** */
+
+bool create_tokz_esc_alias(char *new_name, char *old_name)
+{
+ bool retval = create_tic_alias( new_name, old_name, &tokz_esc_vocab );
+ return ( retval );
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: reset_tokz_esc
+ * Synopsis: Reset the "Tokenizer Escape" Vocabulary to
+ * its "Built-In" position.
+ *
+ * Associated Tokenizer directive: RESET-SYMBOLS (when issued
+ * in "Tokenizer Escape" mode)
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Global Variables:
+ * tokz_esc_vocab Pointer to "Tokenizer Escape" Vocabulary
+ * built_in_tokz_esc Pointer to "Built-In" position
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Global Variables:
+ * tokz_esc_vocab Reset to "Built-In" position
+ * Memory Freed
+ * Memory will be freed by the support routine
+ *
+ **************************************************************************** */
+
+void reset_tokz_esc( void )
+{
+ reset_tic_vocab( &tokz_esc_vocab, (tic_hdr_t *)built_in_tokz_esc);
+}
+
+/* **************************************************************************
+ *
+ * Function name: pop_next_fcode
+ * Synopsis: Vector off to the tokz_esc_next_fcode function,
+ * but without the pseudo-param. A retro-fit...
+ *
+ * Associated Tokenizer directive: FCODE-POP (issued in either mode)
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Data-Stack Items:
+ * Top: Next FCode value, presumably saved
+ * by an FCODE-PUSH issued earlier.
+ *
+ * Outputs:
+ * Returned Value:
+ * Global Variables:
+ * nextfcode FCode token Assignment Counter
+ *
+ **************************************************************************** */
+
+void pop_next_fcode( void)
+{
+ tic_param_t dummy_param;
+ tokz_esc_next_fcode( dummy_param);
+}
Added: fcode-utils/toke/tokzesc.h
===================================================================
--- fcode-utils/toke/tokzesc.h (rev 0)
+++ fcode-utils/toke/tokzesc.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,50 @@
+#ifndef _TOKE_TOKZESC_H
+#define _TOKE_TOKZESC_H
+
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * External and Prototype definitions for functions that process
+ * activity in "Tokenizer Escape" mode
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+#include "types.h"
+#include "ticvocab.h"
+
+void init_tokz_esc_vocab( void );
+bool create_tokz_esc_alias(char *new_name, char *old_name);
+void enter_tokz_esc( void );
+bool handle_tokz_esc( char *tname );
+tic_hdr_t *lookup_tokz_esc(char *name);
+bool exists_in_tokz_esc(char *name);
+void reset_tokz_esc( void );
+void pop_next_fcode( void);
+
+#endif /* _TOKE_TOKZESC_H */
Added: fcode-utils/toke/tracesyms.c
===================================================================
--- fcode-utils/toke/tracesyms.c (rev 0)
+++ fcode-utils/toke/tracesyms.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,172 @@
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Support routines for "Trace-Symbols" debugging feature
+ *
+ * (C) Copyright 2006 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Functions Exported:
+ * add_to_trace_list Add the given name to the Trace List
+ * show_initial_traces Show pre-defined names the user
+ * asked to Trace (if any)
+ * is_on_trace_list Indicate whether the given name is
+ * on the Trace List
+ *
+ **************************************************************************** */
+
+#include <string.h>
+
+#include "tracesyms.h"
+#include "errhandler.h"
+
+
+/* **************************************************************************
+ *
+ * Internal Static Variables
+ * trace_list Pointer to last entry in the Trace List linked-list
+ * data structure
+ *
+ *
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Internal (Static) Structures:
+ * trace_entry_t Linked-list of entries in the Trace List
+ *
+ * Fields:
+ * tracee Name of the symbol to be traced
+ * prev Pointer to previous entry in the linked-list
+ *
+ **************************************************************************** */
+
+typedef struct trace_entry {
+ char *tracee;
+ struct trace_entry *prev;
+} trace_entry_t;
+
+static trace_entry_t *trace_list = NULL;
+
+
+
+/* **************************************************************************
+ *
+ * Function name: add_to_trace_list
+ * Synopsis: Add the given name to the Trace List
+ *
+ *
+ * Inputs:
+ * Parameters:
+ * trace_symb Name of the symbol to be added
+ * Local Static Variables:
+ * trace_list Pointer to the Trace List
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * trace_list Points to new entry in Trace List
+ * Memory Allocated
+ * For Trace List entry
+ * For copy of Symbol Name
+ * When Freed?
+ * Never. Well, only on termination of the program. Trace-list
+ * endures for the entire batch of tokenizations.
+ *
+ * Error Detection:
+ * Memory allocation failure is a FATAL error.
+ *
+ **************************************************************************** */
+
+void add_to_trace_list( char *trace_symb)
+{
+ trace_entry_t *new_t_l_entry = safe_malloc( sizeof( trace_entry_t),
+ "adding to trace-list");
+ new_t_l_entry->tracee = strdup( trace_symb);
+ new_t_l_entry->prev = trace_list;
+
+ trace_list = new_t_l_entry;
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: is_on_trace_list
+ * Synopsis: Indicate whether the given name is on the Trace List
+ *
+ * Inputs:
+ * Parameters:
+ * symb_name Symbol-name to test
+ * Local Static Variables:
+ * trace_list Pointer to the Trace List
+ *
+ * Outputs:
+ * Returned Value: TRUE if Symbol-name is on the Trace List
+ *
+ **************************************************************************** */
+
+bool is_on_trace_list( char *symb_name)
+{
+ bool retval = FALSE;
+ trace_entry_t *test_entry = trace_list;
+ while ( test_entry != NULL )
+ {
+ if ( strcasecmp( symb_name, test_entry->tracee) == 0 )
+ {
+ retval = TRUE;
+ break;
+ }
+ test_entry = test_entry->prev;
+ }
+ return ( retval );
+}
+
+
+/* **************************************************************************
+ *
+ * Still to be done:
+ * Implement a function -- name it show_initial_traces --
+ * that will show any pre-defined names the user asked
+ * to Trace. That is, if any of the names the user asked
+ * to Trace belongs to a pre-defined function, macro or
+ * directive, then, at the beginning of the output, issue
+ * Advisory Messages identifying the scope of those names.
+ *
+ * E.g, if the user had -T 3DUP -T SWAP the function would
+ * issue Messages like:
+ * 3DUP is pre-defined as a Macro with Global scope
+ * SWAP is pre-defined with Global scope
+ * SWAP is pre-defined in Tokenizer-Escape mode
+ *
+ * The names would, of course, remain on the Trace List and
+ * any re-definitions of them would be reported.
+ *
+ **************************************************************************** */
Added: fcode-utils/toke/tracesyms.h
===================================================================
--- fcode-utils/toke/tracesyms.h (rev 0)
+++ fcode-utils/toke/tracesyms.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,48 @@
+#ifndef _TOKE_TRACESYMS_H
+#define _TOKE_TRACESYMS_H
+
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * External/Prototype/Structure definitions for "Trace-Symbols" feature
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+#include "types.h"
+
+/* ************************************************************************** *
+ *
+ * Function Prototypes / Functions Exported:
+ *
+ **************************************************************************** */
+
+void add_to_trace_list( char *trace_symb);
+bool is_on_trace_list( char *symb_name);
+
+#endif /* _TOKE_TRACESYMS_H */
Added: fcode-utils/toke/usersymbols.c
===================================================================
--- fcode-utils/toke/usersymbols.c (rev 0)
+++ fcode-utils/toke/usersymbols.c 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,363 @@
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * General-purpose support functions for
+ * User-defined command-line compilation-control symbols
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * The syntax for user-defined command-line compilation-control symbols
+ * is <NAME>[=<VALUE>]
+ *
+ * The name is always required; the equal-sign and value is optional.
+ * If you wish the "value" to contain spaces or quotes, you can
+ * accomplish that using the shell escape conventions.
+ *
+ * The operations that can be performed upon these symbols will be
+ * described by the operators that use them as operands, but,
+ * broadly speaking, the tests will either be to simply verify
+ * the existence of a symbol, or to evaluate the defined value.
+ *
+ * Once a symbol is defined on the command-line, it stays in effect
+ * for the duration of the entire batch of tokenizations (i.e.,
+ * if there are multiple input files named on the command line).
+ * Also, there are no symbols defined at the outset. Therefore,
+ * there is no need for either an "init" or a "reset" routine.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * User-defined command-line compilation-control symbols are
+ * implemented as a String-Substitution-type vocabulary.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Functions Exported:
+ * add_user_symbol Add a user-defined symbol to the list
+ * lookup_user_symbol Look for a user-defined symbol, return
+ * the assigned value.
+ * exists_as_user_symbol Confirm whether a given name exists
+ * as a user-defined symbol.
+ * eval_user_symbol Tokenize the value assigned to a user
+ * symbol.
+ * list_user_symbols Print the list of user-defined symbols
+ * for the Logfile.
+ *
+ **************************************************************************** */
+
+/* **************************************************************************
+ *
+ * Still to be done:
+ * Convert the handling of user-defined symbols to the T.I.C.
+ * data-structure and its support routines. This should
+ * eliminate any further need of String-Substitution-type
+ * vocabularies. User-defined symbols will, however, still
+ * need to be a separate vocabulary from the Global, because
+ * they are required to stay in effect for the duration of
+ * the entire batch of tokenizations...
+ * (Afterthought: This is only true for user-defined symbols that
+ * were created on the command-line; if we ever allow symbols
+ * to be defined in the Source file, they should be as volatile
+ * as anything else that comes from a source file...
+ * Putting source-file-derived user-defined symbols into the Global
+ * Vocabulary could be a quasi-simple way to accomplish this.)
+ *
+ * Enable the definition of user-symbols from the Source file, using
+ * a syntax like: [define] symbol or [define] symbol=<value>
+ * (How to allow spaces into the <value>? Maybe make the syntax
+ * [define] symbol = <value components to end of line>
+ * delimited in a manner similar to Macro definitions.
+ * There might be a need to be able to [undefine] a user-symbol
+ * that would entail defining an unlink_tic_entry function.
+ * Not difficult; just keeping this around as a reminder...
+ *
+ **************************************************************************** */
+
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#if defined(__linux__) && ! defined(__USE_BSD)
+#define __USE_BSD
+#endif
+#include <string.h>
+
+#include "errhandler.h"
+#include "strsubvocab.h"
+#include "usersymbols.h"
+#include "scanner.h"
+
+
+/* **************************************************************************
+ *
+ * Internal Static Variables
+ * user_symbol_list Pointer to the "tail" of the list of
+ * user-defined symbols.
+ * user_symbol_count Count of how many are defined
+ *
+ **************************************************************************** */
+
+static str_sub_vocab_t *user_symbol_list = NULL;
+static int user_symbol_count = 0;
+
+/* **************************************************************************
+ *
+ * Function name: add_user_symbol
+ * Synopsis: Add a user-defined symbol to the list
+ *
+ * Inputs:
+ * Parameters:
+ * raw_symb The string as supplied on the command-line.
+ * Local Static Variables:
+ * user_symbol_list Pointer to the list of user-defined symbols.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Local Static Variables:
+ * user_symbol_list Will be updated.
+ * user_symbol_count Will be incremented
+ * Memory Allocated:
+ * for the string(s) and the new entry
+ * When Freed?
+ * Never. Well, only on termination of the program. User-defined
+ * symbols endure for the entire batch of tokenizations.
+ *
+ * Process Explanation:
+ * The string in raw_symb may or may not include the optional
+ * equal-sign and value pair. If the equal-sign is present,
+ * the remainder of the string will become the "value" that
+ * will be returned by the "lookup" routine.
+ * Memory for the name string and for the value, if there is one,
+ * will be allocated here, in one step. Memory for the data
+ * structure itself will be allocated by the support routine.
+ *
+ **************************************************************************** */
+
+void add_user_symbol(char *raw_symb)
+{
+ char *symb_nam;
+ char *symb_valu;
+
+ symb_nam = strdup(raw_symb);
+ symb_valu = strchr(symb_nam,'=');
+ if ( symb_valu != NULL )
+ {
+ *symb_valu = 0;
+ symb_valu++;
+ }
+ add_str_sub_entry(symb_nam, symb_valu, &user_symbol_list );
+ user_symbol_count++;
+}
+
+
+/* **************************************************************************
+ *
+ * Function name: lookup_user_symbol
+ * Synopsis: Look for the given name as user-defined symbol, return
+ * the assigned value.
+ *
+ * Inputs:
+ * Parameters:
+ * symb_nam The name for which to look.
+ * Local Static Variables:
+ * user_symbol_list Pointer to the list of user-defined symbols.
+ *
+ * Outputs:
+ * Returned Value: Pointer to the "value" string, or NULL
+ * pointer if the name was not found.
+ * May also be NULL if "value" is NULL.
+ *
+ **************************************************************************** */
+
+char *lookup_user_symbol(char *symb_nam)
+{
+ char *symb_valu;
+
+ symb_valu = lookup_str_sub(symb_nam, user_symbol_list );
+ return (symb_valu);
+}
+
+/* **************************************************************************
+ *
+ * Function name: exists_as_user_symbol
+ * Synopsis: Confirm whether a given name exists
+ * as a user-defined symbol.
+ *
+ * Inputs:
+ * Parameters:
+ * symb_nam The name for which to look.
+ * Local Static Variables:
+ * user_symbol_list Pointer to the list of user-defined symbols.
+ *
+ * Outputs:
+ * Returned Value: TRUE if the name is found
+ *
+ **************************************************************************** */
+
+bool exists_as_user_symbol(char *symb_nam)
+{
+ bool retval;
+
+ retval = exists_in_str_sub(symb_nam, user_symbol_list );
+ return (retval);
+}
+
+/* **************************************************************************
+ *
+ * Function name: eval_user_symbol
+ * Synopsis: Tokenize the value assigned to a user-symbol.
+ *
+ * Associated Tokenizer directive (synonyms): [DEFINED]
+ * #DEFINED
+ * [#DEFINED]
+ *
+ * Syntax Notes:
+ * (1) The User-Defined-Symbol must appear
+ * on the same line as the directive.
+ * (2) This is not (yet) implemented in contexts that
+ * directly read input from the stream, e.g.,
+ * after ['] or after H# etc.
+ *
+ * Inputs:
+ * Parameters:
+ * symbol The User-Defined-Symbol to evaluate
+ * Local Static Variables:
+ * user_symbol_list Pointer to the list of user-defined symbols.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * The assigned value will be tokenized.
+ *
+ * Error Detection:
+ * Calling routine is responsible for verifying that the user-symbol
+ * is on the same line as the directive.
+ * WARNING if the symbol is not found or has no assigned value.
+ *
+ * Process Explanation:
+ * Look up the parameter in the User Symbol List, and retrieve
+ * its associated value.
+ * If it is not found, or if it has no associated value, issue
+ * a WARNING and do nothing further. Otherwise...
+ * Interpret the associated value as though it were source.
+ *
+ * Still to be done:
+ * Hook-in this routine to the processing of: ['] F['] H# FLOAD
+ * etc., and wherever else it might be needed or useful.
+ *
+ **************************************************************************** */
+
+void eval_user_symbol(char *symbol )
+{
+ char *symb_valu;
+ symb_valu = lookup_user_symbol(symbol );
+ if ( symb_valu == NULL )
+ {
+ tokenization_error ( WARNING,
+ "No value assigned to command-line symbol %s\n", symbol );
+ }else{
+ eval_string( symb_valu );
+ }
+
+}
+/* **************************************************************************
+ *
+ * Function name: list_user_symbols
+ * Synopsis: Print the list of user symbols for the Logfile.
+ *
+ * Inputs:
+ * Parameters: NONE
+ * Local Static Variables:
+ * user_symbol_list Pointer to the list of user-defined symbols.
+ * user_symbol_count Count of user-defined symbols.
+ *
+ * Outputs:
+ * Returned Value: NONE
+ * Printout: List of user symbols and their definitions;
+ * nothing if user_symbol_list is NULL.
+ *
+ * Process Explanation:
+ * We want to display the symbols in the same order they were created.
+ * We will:
+ * Allocate a temporary array of pointers.
+ * Step backwards through the linked-list of symbols, and
+ * enter their pointers into the array.
+ * Collect the maximum length of the symbol names.
+ * Step through the array in the reverse order, printing
+ * as we go.
+ * Use the max name length to space the equal-signs evenly
+ * Free the temporary array.
+ *
+ **************************************************************************** */
+
+void list_user_symbols(void )
+{
+ str_sub_vocab_t *curr;
+
+ if ( user_symbol_list != NULL )
+ {
+ /* Collect the pointers and max length */
+ str_sub_vocab_t **symb_ptr;
+ int indx = 0;
+ int maxlen = 0;
+
+ symb_ptr = (str_sub_vocab_t **)safe_malloc(
+ (sizeof(str_sub_vocab_t *) * user_symbol_count),
+ "collecting user-symbol pointers" );
+
+ for (curr = user_symbol_list ; curr != NULL ; curr=curr->next)
+ {
+ symb_ptr[indx] = curr;
+ indx++;
+ if ( strlen(curr->name) > maxlen ) maxlen = strlen(curr->name);
+ }
+
+ /* Now print 'em out */
+ printf("\nUser-Defined Symbols:\n");
+ while ( indx > 0 )
+ {
+ indx--;
+ curr = symb_ptr[indx];
+ printf("\t%s",curr->name);
+ if ( curr->alias != NULL )
+ {
+ int strindx;
+ for ( strindx = strlen(curr->name) ;
+ strindx < maxlen ; strindx++ ) printf(" ");
+ printf(" = %s",curr->alias);
+ }
+ printf("\n");
+ }
+ free(symb_ptr);
+ }
+}
Added: fcode-utils/toke/usersymbols.h
===================================================================
--- fcode-utils/toke/usersymbols.h (rev 0)
+++ fcode-utils/toke/usersymbols.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,46 @@
+#ifndef _TOKE_USERSYMBOLS_H
+#define _TOKE_USERSYMBOLS_H
+
+
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * Prototype/External Declarations for general-purpose functions
+ * for support of User-defined command-line compilation-control
+ * symbols, as defined in usersymbols.c
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+void add_user_symbol(char *raw_symb);
+char *lookup_user_symbol(char *symb_nam);
+bool exists_as_user_symbol(char *symb_nam);
+void eval_user_symbol(char *symbol );
+void list_user_symbols(void );
+
+#endif /* _TOKE_USERSYMBOLS_H */
Added: fcode-utils/toke/vocabfuncts.h
===================================================================
--- fcode-utils/toke/vocabfuncts.h (rev 0)
+++ fcode-utils/toke/vocabfuncts.h 2006-08-18 12:47:12 UTC (rev 76)
@@ -0,0 +1,92 @@
+#ifndef _TOKE_VOCABFUNCTS_H
+#define _TOKE_VOCABFUNCTS_H
+
+/*
+ * OpenBIOS - free your system!
+ * ( FCode tokenizer )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
+
+/* **************************************************************************
+ *
+ * External/Prototype definitions for Vocabulary functions
+ * in dictionary.c for Tokenizer
+ *
+ * (C) Copyright 2005 IBM Corporation. All Rights Reserved.
+ * Module Author: David L. Paktor dlpaktor(a)us.ibm.com
+ *
+ **************************************************************************** */
+
+
+#include "types.h"
+#include "ticvocab.h"
+
+
+/* ************************************************************************** *
+ *
+ * Global Variables Exported
+ *
+ **************************************************************************** */
+
+extern bool scope_is_global;
+
+/* ************************************************************************** *
+ *
+ * Function Prototypes / Functions Exported:
+ *
+ **************************************************************************** */
+
+
+tic_hdr_t *lookup_core_word( char *tname);
+bool exists_in_core( char *name);
+bool handle_core_word( char *tname );
+bool create_core_alias( char *new_name, char *old_name);
+
+void enter_global_scope( void );
+void resume_device_scope( void );
+
+tic_hdr_t *lookup_current( char *name);
+bool exists_in_current( char *tname);
+bool handle_current( char *tname );
+tic_hdr_t *lookup_in_dev_node( char *tname);
+void add_to_current( char *name,
+ TIC_P_DEFLT_TYPE fc_token,
+ fwtoken definer,
+ bool define_token);
+void hide_last_colon ( void );
+void reveal_last_colon ( void );
+bool create_current_alias( char *new_name, char *old_name );
+
+void emit_token( const char *fc_name);
+tic_hdr_t *lookup_token( char *tname);
+bool entry_is_token( tic_hdr_t *test_entry );
+void token_entry_warning( tic_hdr_t *t_entry);
+
+tic_hdr_t *lookup_shared_word( char *tname);
+bool handle_shared_word( char *tname );
+tic_hdr_t *lookup_shared_f_exec_word( char *tname);
+
+void init_dictionary( void );
+void reset_normal_vocabs( void );
+void reset_vocabs( void );
+
+
+#endif /* _TOKE_VOCABFUNCTS_H */
1
0
Author: stepan
Date: 2006-08-18 11:45:11 +0200 (Fri, 18 Aug 2006)
New Revision: 75
Modified:
fcode-utils/romheaders/romheaders.c
Log:
add missing header
Modified: fcode-utils/romheaders/romheaders.c
===================================================================
--- fcode-utils/romheaders/romheaders.c 2006-08-18 09:07:34 UTC (rev 74)
+++ fcode-utils/romheaders/romheaders.c 2006-08-18 09:45:11 UTC (rev 75)
@@ -1,3 +1,27 @@
+/*
+ * OpenBIOS - free your system!
+ * ( romheaders utility )
+ *
+ * This program is part of a free implementation of the IEEE 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware.
+ *
+ * Copyright (C) 2001-2005 Stefan Reinauer, <stepan(a)openbios.org>
+ * Copyright (C) 2006 coresystems GmbH <info(a)coresystems.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ *
+ */
#include <stdio.h>
@@ -12,9 +36,6 @@
#define PCI_DATA_HDR (u32) ( ('R' << 24) | ('I' << 16) | ('C' << 8) | 'P' )
-char *rom=NULL;
-size_t romlen=0;
-
typedef struct {
u16 signature;
u8 reserved[0x16];
@@ -37,6 +58,8 @@
u16 reserved_2;
} pci_data_t;
+char *rom=NULL;
+size_t romlen=0;
/* make this endian safe without fancy system headers */
static u16 little_word(u16 val)
1
0
Author: stepan
Date: 2006-08-18 11:07:34 +0200 (Fri, 18 Aug 2006)
New Revision: 74
Added:
fcode-utils/
fcode-utils/detok/
fcode-utils/romheaders/
fcode-utils/toke/
Removed:
fcode-utils/toke/build.xml
Log:
moving fcode suite to an extra directory
Copied: fcode-utils/detok (from rev 71, openbios-devel/utils/detok)
Copied: fcode-utils/romheaders (from rev 71, openbios-devel/utils/romheaders)
Copied: fcode-utils/toke (from rev 71, openbios-devel/toke)
Deleted: fcode-utils/toke/build.xml
===================================================================
--- openbios-devel/toke/build.xml 2006-07-23 14:29:29 UTC (rev 71)
+++ fcode-utils/toke/build.xml 2006-08-18 09:07:34 UTC (rev 74)
@@ -1,13 +0,0 @@
-<build>
-
- <executable name="toke" target="host">
- <object source="toke.c"/>
- <object source="emit.c"/>
- <object source="dictionary.c"/>
- <object source="stack.c"/>
- <object source="stream.c"/>
- <object source="macros.c"/>
- <object source="scanner.c"/>
- </executable>
-
-</build>
1
0
>
> Subject:
>
> [OpenBIOS] [ANNOUNCE] New FCode Suite available!
>
> Date:
>
> Thu, 17 Aug 2006 14:29:14 +0200
>
> From:
>
> Stefan Reinauer <stepan(a)coresystems.de>
>
> Reply-To:
>
> The OpenBIOS Mailinglist <openbios(a)lists.openbios.org>
>
> To:
>
> openbios(a)lists.openbios.org
>
>
> Dear OpenBIOS community,
>
> today I am very glad to announce a new version of the OpenBIOS FCode
> utilities toke and detok. David Paktor, of the IBM corporation,
> contributed a couple of significant improvements over the old versions
> of those utilities.
>
> Toke and Detok now have a comprehensive regression test suite
> of over 170 tests. This test suite makes it easy to verify
> that new contributions do not break existing functionality.
>
> * among the new features:
>
> - detailed error reporting
> - local value support! See
> http://www.openbios.org/fcodesuite/Documents/TokenizerLocalValues.htm
> - much better handling of PCI option roms
> - improved compatibility to other tokenizers
> - bug fixes in flow control and string escape handling
>
> Please be sure to check the complete list of new features at:
>
http://www.openbios.org/fcodesuite/Documents/TokenizerNewFeatures.htm
>
> I want to send a big THANK YOU out to David Paktor at this point.
>
> NOTE: The contributed changes are not in the main repository yet.
> You can download the changed source code and binaries as well as the
> test suite and test results as well as documentation from:
> http://www.openbios.org/development/fcode.html
>
> Please send any feedback to this mailing list.
>
> Best regards,
>
> Stefan Reinauer
>
>
> --
> coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br.
> Tel.: +49 761 7668825 • Fax: +49 761 7664613
> Email: info(a)coresystems.de • http://www.coresystems.de/
>
> --
> OpenBIOS http://openbios.org/
> Mailinglist: http://lists.openbios.org/mailman/listinfo
> Free your System - May the Forth be with you
And thank you, Stefan, for your kind words and for the contribution you
made initiating and maintaining
this project and web-site.
I would like to make two small amendments:
The test suite contains exactly 162 tests. Still a lot, but let's not
mis-advertise even to a small degree.
Modesty prohibits me from saying much more than this, but I hope a look at
the New Features document,
and at the Test Log files, will suffice to demonstrate that "a couple of
significant improvements"
is very much an understatement... ;-}
That being said, let me again express my gratitude for the opportunity to
make this contribution to the
Open Firmware community.
My goal was to create a truly professional-grade tool; I look forward to
finding out whether I have achieved it.
-----
David L. Paktor System Firmware Developer
System and Technology Group Global Firmware Division
dlpaktor(a)us.ibm.com David L Paktor/Almaden/IBM@IBMUS
18880 Homestead Rd. Building 9945
Cupertino CA 95014 Room 1026
408-342-6110 T/L 560-6110
"The Bug Stops Here"
1
0
Dear OpenBIOS community,
today I am very glad to announce a new version of the OpenBIOS FCode
utilities toke and detok. David Paktor, of the IBM corporation,
contributed a couple of significant improvements over the old versions
of those utilities.
Toke and Detok now have a comprehensive regression test suite
of over 170 tests. This test suite makes it easy to verify
that new contributions do not break existing functionality.
* among the new features:
- detailed error reporting
- local value support! See
http://www.openbios.org/fcodesuite/Documents/TokenizerLocalValues.htm
- much better handling of PCI option roms
- improved compatibility to other tokenizers
- bug fixes in flow control and string escape handling
Please be sure to check the complete list of new features at:
http://www.openbios.org/fcodesuite/Documents/TokenizerNewFeatures.htm
I want to send a big THANK YOU out to David Paktor at this point.
NOTE: The contributed changes are not in the main repository yet.
You can download the changed source code and binaries as well as the
test suite and test results as well as documentation from:
http://www.openbios.org/development/fcode.html
Please send any feedback to this mailing list.
Best regards,
Stefan Reinauer
--
coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br.
Tel.: +49 761 7668825 • Fax: +49 761 7664613
Email: info(a)coresystems.de • http://www.coresystems.de/
1
0
Author: stepan
Date: 2006-08-12 11:52:34 +0200 (Sat, 12 Aug 2006)
New Revision: 73
Modified:
openbios-devel/drivers/esp.c
Log:
>From Paul Brook:
The ESP SCSI driver currently doesn't check whether a DMA requests has
completed before checking its status. On older qemu versions this
works ok because DMA happens instantly. On never qemu DMA can take an
indeterminate amount of time ooto complete, just like on real
hardware.
The patch waits for the controller to raise the DMA interrupt after
initiating a DMA request.
Modified: openbios-devel/drivers/esp.c
===================================================================
--- openbios-devel/drivers/esp.c 2006-07-28 21:44:07 UTC (rev 72)
+++ openbios-devel/drivers/esp.c 2006-08-12 09:52:34 UTC (rev 73)
@@ -113,6 +113,8 @@
esp->espdma.regs->cond_reg = 0;
// Set ATN, issue command
esp->ll->regs[ESP_CMD] = ESP_CMD_SELA | ESP_CMD_DMA;
+ // Wait for DMA to complete. Can this fail?
+ while ((esp->espdma.regs->cond_reg & DMA_HNDL_INTR) == 0) /* no-op */;
// Check status
status = esp->ll->regs[ESP_STATUS];
@@ -129,6 +131,8 @@
esp->espdma.regs->cond_reg = DMA_ST_WRITE;
// Transfer
esp->ll->regs[ESP_CMD] = ESP_CMD_TI | ESP_CMD_DMA;
+ // Wait for DMA to complete
+ while ((esp->espdma.regs->cond_reg & DMA_HNDL_INTR) == 0) /* no-op */;
// Check status
status = esp->ll->regs[ESP_STATUS];
1
0
The ESP SCSI driver currently doesn't check whether a DMA requests has
completed before checking its status. On older qemu versions this works ok
because DMA happens instantly. On never qemu DMA can take an indeterminate
amount of time ooto complete, just like on real hardware.
The patch below waits for the controller to raise the DMA interrupt after
initiating a DMA request.
Paul
Index: drivers/esp.c
===================================================================
--- drivers/esp.c (revision 61)
+++ drivers/esp.c (working copy)
@@ -113,6 +113,8 @@ do_command(esp_private_t *esp, sd_privat
esp->espdma.regs->cond_reg = 0;
// Set ATN, issue command
esp->ll->regs[ESP_CMD] = ESP_CMD_SELA | ESP_CMD_DMA;
+ // Wait for DMA to complete
+ while ((esp->espdma.regs->cond_reg & DMA_HNDL_INTR) == 0) /* no-op */;
// Check status
status = esp->ll->regs[ESP_STATUS];
@@ -129,6 +131,8 @@ do_command(esp_private_t *esp, sd_privat
esp->espdma.regs->cond_reg = DMA_ST_WRITE;
// Transfer
esp->ll->regs[ESP_CMD] = ESP_CMD_TI | ESP_CMD_DMA;
+ // Wait for DMA to complete
+ while ((esp->espdma.regs->cond_reg & DMA_HNDL_INTR) == 0) /* no-op */;
// Check status
status = esp->ll->regs[ESP_STATUS];
2
1
I'm currenttly converting the qemu scsi emulatin to use async IO. The main
effect of this is that DMA tranfers take an indterminate amount of guest time
to complete (just like they do on real hardware) instead of completing
instantaneously.
I've got It working in linux, but OpenBIOS dies when trying to read from the
disk/cdrom. The problem appears to be that the openbios ESP drivers isses
read commands then blindly continues without waiting for them to complete.
The code in question is the end of ecp.c:do_command and its caller.
I'm working on a fix, I just wanted to check (a) this hasn't already been
fixed, and (b) I'm not on totally the wrong track.
Paul
1
0
Author: stepan
Date: 2006-07-28 23:44:07 +0200 (Fri, 28 Jul 2006)
New Revision: 72
Modified:
openbios-devel/arch/unix/unix.c
openbios-devel/kernel/forth.c
Log:
blueswirl's latest console patches.
Modified: openbios-devel/arch/unix/unix.c
===================================================================
--- openbios-devel/arch/unix/unix.c 2006-07-23 14:29:29 UTC (rev 71)
+++ openbios-devel/arch/unix/unix.c 2006-07-28 21:44:07 UTC (rev 72)
@@ -225,22 +225,23 @@
* terminal initialization and cleanup.
*/
+static struct termios saved_termios;
+
static void init_terminal(void)
{
struct termios termios;
+ tcgetattr(0, &saved_termios);
tcgetattr(0, &termios);
termios.c_lflag &= ~(ICANON | ECHO);
+ termios.c_cc[VMIN] = 1;
+ termios.c_cc[VTIME] = 3; // 300 ms
tcsetattr(0, 0, &termios);
}
static void exit_terminal(void)
{
- struct termios termios;
-
- tcgetattr(0, &termios);
- termios.c_lflag |= (ICANON | ECHO);
- tcsetattr(0, 0, &termios);
+ tcsetattr(0, 0, &saved_termios);
}
/*
@@ -286,6 +287,21 @@
exit(1);
}
+/*
+ * Interrupt handler. linux specific?
+ * Restore terminal state on ctrl-C.
+ */
+
+static void
+int_handler(int signo __attribute__ ((unused)),
+ siginfo_t * si __attribute__ ((unused)),
+ void *context __attribute__ ((unused)))
+{
+ printk("\n");
+ exit_terminal();
+ exit(1);
+}
+
/*
* allocate memory and prepare engine for memory management.
*/
@@ -461,6 +477,18 @@
/* set terminal to do non blocking reads */
init_terminal();
+
+ if (verbose)
+ printk("Installing SIGINT handler...");
+
+ sa.sa_sigaction = int_handler;
+ sigemptyset(&sa.sa_mask);
+ sa.sa_flags = SA_SIGINFO | SA_NODEFER;
+ sigaction(SIGINT, &sa, 0);
+
+ if (verbose)
+ printk("done.\n");
+
read_dictionary(argv[optind]);
PUSH_xt( bind_noname_func(arch_init) );
Modified: openbios-devel/kernel/forth.c
===================================================================
--- openbios-devel/kernel/forth.c 2006-07-23 14:29:29 UTC (rev 71)
+++ openbios-devel/kernel/forth.c 2006-07-28 21:44:07 UTC (rev 72)
@@ -593,7 +593,7 @@
const ucell *aaddr = (ucell *)cell2pointer(POP());
const ucell x = POP();
#ifdef CONFIG_DEBUG_INTERNAL
- printf("!: %lx : %lx -> %lx\n", aaddr, read_ucell(aaddr), x);
+ printk("!: %lx : %lx -> %lx\n", aaddr, read_ucell(aaddr), x);
#endif
write_ucell(aaddr,x);
}
1
0
I'm trying to get Sparc64 unix console version work. Currently it outputs as
follows:
[unix] Booting default not supported.
panic: segmentation violation at 48c5b4
dict=0x20010 here=0x48c40(dict+0x28c30) pc=0x47358(dict+0x27348)
dstackcnt=0 rstackcnt=15 instruction=20850
Some human-readable Forth debugging tools might help.
I found (and fixed) these bugs:
Unix console feels unresponsive and pressing Control-C leaves the terminal
in bad shape.
Compiler complains if CONFIG_DEBUG_INTERNAL is defined.
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
1
0
Interesting issues have surfaced in building R69 using the tools for Slackware
by Gregg Levine 25 Jul '06
by Gregg Levine 25 Jul '06
25 Jul '06
Hello!
I downloaded the contents of the SVN contained repository using the
normal instructions for the tool and it arrived. I then proceeded to
build it. It then decided to take exception in several areas of my
choice of Linux distributions. Essentially towards the end of the
build process it tossed an exception. This was inside the portion
marked bootstrap. Similar problems happened with each of the releases,
except ones from the early sixties.
Since I do not wish to crowd the list with this litany of actual
problems I will have a webpage up detailing all of them at
http://yodathejediknight.home.att.net within the next few hours. (EDT
NY time)
--
Gregg C Levine gregg.drwho8(a)gmail.com
"This signature was once found posting rude
messages in English in the Moscow subway."
2
3
>As for the nographics patch: The decision byte is at the moment gained
>from somewhere down obio.c if I read this correctly. The decision is
>then made in romvec.c. This is a little bit nasty.
>
>It would be nicer to handle this cleanly binding the functionality to
>the device nodes/drivers.
You're right. I moved the decision point to obio.c for console device and
also to boot.c for the boot device selection.
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
2
2
Author: stepan
Date: 2006-07-23 16:29:29 +0200 (Sun, 23 Jul 2006)
New Revision: 71
Modified:
openbios-devel/arch/sparc32/aoutload.c
openbios-devel/arch/sparc32/boot.c
openbios-devel/arch/sparc32/boot.h
openbios-devel/arch/sparc32/console.c
openbios-devel/arch/sparc32/elfload.c
openbios-devel/arch/sparc32/linux_load.c
openbios-devel/arch/sparc32/romvec.c
openbios-devel/arch/sparc32/tree.fs
openbios-devel/drivers/obio.c
openbios-devel/modules/video.c
Log:
blueswirl's latest console-nographic.diff.bz2
Modified: openbios-devel/arch/sparc32/aoutload.c
===================================================================
--- openbios-devel/arch/sparc32/aoutload.c 2006-07-23 14:22:39 UTC (rev 70)
+++ openbios-devel/arch/sparc32/aoutload.c 2006-07-23 14:29:29 UTC (rev 71)
@@ -51,7 +51,8 @@
return 0;
}
-int aout_load(struct sys_info *info, const char *filename, const char *cmdline)
+int aout_load(struct sys_info *info, const char *filename, const char *cmdline,
+ const void *romvec)
{
int retval = -1;
int image_retval;
@@ -126,14 +127,8 @@
#if 1
{
- extern unsigned int qemu_mem_size;
- extern char boot_device;
- void *init_openprom(unsigned long memsize, const char *cmdline, char boot_device);
-
int (*entry)(const void *romvec, int p2, int p3, int p4, int p5);
- const void *romvec;
- romvec = init_openprom(qemu_mem_size, cmdline, boot_device);
entry = (void *) addr_fixup(start);
image_retval = entry(romvec, 0, 0, 0, 0);
}
Modified: openbios-devel/arch/sparc32/boot.c
===================================================================
--- openbios-devel/arch/sparc32/boot.c 2006-07-23 14:22:39 UTC (rev 70)
+++ openbios-devel/arch/sparc32/boot.c 2006-07-23 14:29:29 UTC (rev 71)
@@ -8,10 +8,11 @@
#include "openbios/nvram.h"
#include "libc/diskio.h"
#include "sys_info.h"
+#include "openprom.h"
-int elf_load(struct sys_info *, const char *filename, const char *cmdline);
-int aout_load(struct sys_info *, const char *filename, const char *cmdline);
-int linux_load(struct sys_info *, const char *filename, const char *cmdline);
+int elf_load(struct sys_info *, const char *filename, const char *cmdline, const void *romvec);
+int aout_load(struct sys_info *, const char *filename, const char *cmdline, const void *romvec);
+int linux_load(struct sys_info *, const char *filename, const char *cmdline, const void *romvec);
void boot(void);
@@ -21,43 +22,54 @@
uint32_t cmdline;
uint32_t cmdline_size;
char boot_device;
+extern unsigned int qemu_mem_size;
+void *init_openprom(unsigned long memsize);
+extern struct linux_arguments_v0 obp_arg;
void boot(void)
{
- char *path=pop_fstr_copy(), *param;
+ char *path = pop_fstr_copy(), *param, *oldpath;
char altpath[256];
-
- if (kernel_size) {
- extern unsigned int qemu_mem_size;
- void *init_openprom(unsigned long memsize, const char *cmdline, char boot_device);
+ int unit;
+ const void *romvec;
- int (*entry)(const void *romvec, int p2, int p3, int p4, int p5);
- const void *romvec;
-
- printk("[sparc] Kernel already loaded\n");
- romvec = init_openprom(qemu_mem_size, (void *)cmdline, boot_device);
- entry = (void *) kernel_image;
- entry(romvec, 0, 0, 0, 0);
- }
-
if(!path) {
switch(boot_device) {
case 'a':
path = "/obio/SUNW,fdtwo";
+ oldpath = "fd()";
+ unit = 0;
break;
case 'c':
path = "disk";
+ oldpath = "sd(0,0,0):d";
+ unit = 0;
break;
default:
case 'd':
path = "cdrom";
+ // FIXME: hardcoding this looks almost definitely wrong.
+ // With sd(0,2,0):b we get to see the solaris kernel though
+ //oldpath = "sd(0,2,0):d";
+ oldpath = "sd(0,2,0):b";
+ unit = 2;
break;
case 'n':
path = "net";
+ oldpath = "le()";
+ unit = 0;
break;
}
}
+ obp_arg.boot_dev_ctrl = 0;
+ obp_arg.boot_dev_unit = unit;
+ obp_arg.dev_partition = 0;
+ obp_arg.boot_dev[0] = oldpath[0];
+ obp_arg.boot_dev[1] = oldpath[1];
+ obp_arg.argv[0] = oldpath;
+ obp_arg.argv[1] = cmdline;
+
param = strchr(path, ' ');
if(param) {
*param = '\0';
@@ -66,22 +78,31 @@
param = (char *)cmdline;
}
+ romvec = init_openprom(qemu_mem_size);
+
+ if (kernel_size) {
+ int (*entry)(const void *romvec, int p2, int p3, int p4, int p5);
+
+ printk("[sparc] Kernel already loaded\n");
+ entry = (void *) kernel_image;
+ entry(romvec, 0, 0, 0, 0);
+ }
+
printk("[sparc] Booting file '%s' ", path);
if(param)
printk("with parameters '%s'\n", param);
else
printk("without parameters.\n");
+ if (elf_load(&sys_info, path, param, romvec) == LOADER_NOT_SUPPORT)
+ if (linux_load(&sys_info, path, param, romvec) == LOADER_NOT_SUPPORT)
+ if (aout_load(&sys_info, path, param, romvec) == LOADER_NOT_SUPPORT) {
- if (elf_load(&sys_info, path, param) == LOADER_NOT_SUPPORT)
- if (linux_load(&sys_info, path, param) == LOADER_NOT_SUPPORT)
- if (aout_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) {
-
sprintf(altpath, "%s:d", path);
- if (elf_load(&sys_info, altpath, param) == LOADER_NOT_SUPPORT)
- if (linux_load(&sys_info, altpath, param) == LOADER_NOT_SUPPORT)
- if (aout_load(&sys_info, altpath, param) == LOADER_NOT_SUPPORT)
+ if (elf_load(&sys_info, altpath, param, romvec) == LOADER_NOT_SUPPORT)
+ if (linux_load(&sys_info, altpath, param, romvec) == LOADER_NOT_SUPPORT)
+ if (aout_load(&sys_info, altpath, param, romvec) == LOADER_NOT_SUPPORT)
printk("Unsupported image format\n");
}
Modified: openbios-devel/arch/sparc32/boot.h
===================================================================
--- openbios-devel/arch/sparc32/boot.h 2006-07-23 14:22:39 UTC (rev 70)
+++ openbios-devel/arch/sparc32/boot.h 2006-07-23 14:29:29 UTC (rev 71)
@@ -7,8 +7,11 @@
*/
int forth_load(struct sys_info *info, const char *filename, const char *cmdline);
-int elf_load(struct sys_info *info, const char *filename, const char *cmdline);
-int linux_load(struct sys_info *info, const char *file, const char *cmdline);
+int elf_load(struct sys_info *, const char *filename, const char *cmdline,
+ const void *romvec);
+int aout_load(struct sys_info *, const char *filename, const char *cmdline,
+ const void *romvec);
+int linux_load(struct sys_info *, const char *filename, const char *cmdline,
+ const void *romvec);
unsigned int start_elf(unsigned long entry_point, unsigned long param);
-
Modified: openbios-devel/arch/sparc32/console.c
===================================================================
--- openbios-devel/arch/sparc32/console.c 2006-07-23 14:22:39 UTC (rev 70)
+++ openbios-devel/arch/sparc32/console.c 2006-07-23 14:29:29 UTC (rev 71)
@@ -192,13 +192,13 @@
static int shiftstate;
-static int
+int
keyboard_dataready(void)
{
return ((inb(KBD_BASE) & 1) == 1);
}
-static unsigned char
+unsigned char
keyboard_readdata(void)
{
unsigned char ch;
Modified: openbios-devel/arch/sparc32/elfload.c
===================================================================
--- openbios-devel/arch/sparc32/elfload.c 2006-07-23 14:22:39 UTC (rev 70)
+++ openbios-devel/arch/sparc32/elfload.c 2006-07-23 14:29:29 UTC (rev 71)
@@ -302,7 +302,8 @@
return bhdr;
}
-int elf_load(struct sys_info *info, const char *filename, const char *cmdline)
+int elf_load(struct sys_info *info, const char *filename, const char *cmdline,
+ const void *romvec)
{
Elf_ehdr ehdr;
Elf_phdr *phdr = NULL;
@@ -383,14 +384,8 @@
#if 1
{
- extern unsigned int qemu_mem_size;
- extern char boot_device;
- void *init_openprom(unsigned long memsize, const char *cmdline, char boot_device);
-
int (*entry)(const void *romvec, int p2, int p3, int p4, int p5);
- const void *romvec;
- romvec = init_openprom(qemu_mem_size, cmdline, boot_device);
entry = (void *) addr_fixup(ehdr.e_entry);
image_retval = entry(romvec, 0, 0, 0, 0);
}
Modified: openbios-devel/arch/sparc32/linux_load.c
===================================================================
--- openbios-devel/arch/sparc32/linux_load.c 2006-07-23 14:22:39 UTC (rev 70)
+++ openbios-devel/arch/sparc32/linux_load.c 2006-07-23 14:29:29 UTC (rev 71)
@@ -578,7 +578,8 @@
return ctx->regs[REG_O0];
}
-int linux_load(struct sys_info *info, const char *file, const char *cmdline)
+int linux_load(struct sys_info *info, const char *file, const char *cmdline,
+ const void *romvec)
{
struct linux_header hdr;
struct linux_params *params;
Modified: openbios-devel/arch/sparc32/romvec.c
===================================================================
--- openbios-devel/arch/sparc32/romvec.c 2006-07-23 14:22:39 UTC (rev 70)
+++ openbios-devel/arch/sparc32/romvec.c 2006-07-23 14:29:29 UTC (rev 71)
@@ -33,8 +33,9 @@
static struct linux_mlist_v0 *ptphys;
static struct linux_mlist_v0 *ptmap;
static struct linux_mlist_v0 *ptavail;
-static char obp_stdin, obp_stdout;
+char obp_stdin, obp_stdout;
static int obp_fd_stdin, obp_fd_stdout;
+const char *obp_stdin_path, *obp_stdout_path;
static int obp_nextnode(int node);
static int obp_child(int node);
@@ -45,7 +46,7 @@
static int obp_devread(int dev_desc, char *buf, int nbytes);
static int obp_devseek(int dev_desc, int hi, int lo);
-static struct linux_arguments_v0 obp_arg;
+struct linux_arguments_v0 obp_arg;
static const struct linux_arguments_v0 * const obp_argp = &obp_arg;
static void (*sync_hook)(void);
@@ -444,7 +445,7 @@
}
void *
-init_openprom(unsigned long memsize, const char *cmdline, char boot_device)
+init_openprom(unsigned long memsize)
{
free_ram = va2pa((int)&_data) - PAGE_SIZE;
@@ -503,50 +504,17 @@
romvec0.pv_v2devops.v2_dev_read = obp_devread;
romvec0.pv_v2devops.v2_dev_write = obp_devwrite;
romvec0.pv_v2devops.v2_dev_seek = obp_devseek;
- obp_arg.boot_dev_ctrl = 0;
- obp_arg.boot_dev_unit = 0;
- obp_arg.dev_partition = 0;
- obp_arg.argv[0] = "sd(0,0,0):d";
-
- switch(boot_device) {
- default:
- case 'a':
- obp_arg.argv[0] = "fd()";
- obp_arg.boot_dev[0] = 'f';
- obp_arg.boot_dev[1] = 'd';
- break;
- case 'd':
- obp_arg.boot_dev_unit = 2;
- // FIXME: hardcoding this looks almost definitely wrong.
- // With sd(0,2,0):b we get to see the solaris kernel though
- //obp_arg.argv[0] = "sd(0,2,0):d";
- obp_arg.argv[0] = "sd(0,2,0):b";
- // Fall through
- case 'c':
- obp_arg.boot_dev[0] = 's';
- obp_arg.boot_dev[1] = 'd';
- break;
- case 'n':
- obp_arg.argv[0] = "le()";
- obp_arg.boot_dev[0] = 'l';
- obp_arg.boot_dev[1] = 'e';
- break;
- }
- obp_arg.argv[1] = cmdline;
romvec0.pv_v2bootargs.bootpath = &obp_arg.argv[0];
romvec0.pv_v2bootargs.bootargs = &obp_arg.argv[1];
romvec0.pv_v2bootargs.fd_stdin = &obp_fd_stdin;
romvec0.pv_v2bootargs.fd_stdout = &obp_fd_stdout;
- push_str("/builtin/console");
+ push_str(obp_stdin_path);
fword("open-dev");
obp_fd_stdin = POP();
- push_str("/builtin/console");
+ push_str(obp_stdout_path);
fword("open-dev");
obp_fd_stdout = POP();
-
- obp_stdin = PROMDEV_TTYA;
- obp_stdout = PROMDEV_TTYA;
romvec0.v3_cpustart = obp_cpustart;
romvec0.v3_cpustop = obp_cpustop;
Modified: openbios-devel/arch/sparc32/tree.fs
===================================================================
--- openbios-devel/arch/sparc32/tree.fs 2006-07-23 14:22:39 UTC (rev 70)
+++ openbios-devel/arch/sparc32/tree.fs 2006-07-23 14:29:29 UTC (rev 71)
@@ -9,10 +9,6 @@
" SUNW,501-3059" encode-string " model" property
h# 0a21fe80 encode-int " clock-frequency" property
- " /obio/zs@0,100000:a" encode-string " stdin-path" property
- " /obio/zs@0,100000:a" encode-string " stdout-path" property
-
-
: encode-unit encode-unit-sbus ;
: decode-unit decode-unit-sbus ;
Modified: openbios-devel/drivers/obio.c
===================================================================
--- openbios-devel/drivers/obio.c 2006-07-23 14:22:39 UTC (rev 70)
+++ openbios-devel/drivers/obio.c 2006-07-23 14:29:29 UTC (rev 71)
@@ -25,7 +25,18 @@
path, name##_m, sizeof(name##_m)/sizeof(method_t)); \
} while(0)
+#define REGISTER_NODE_METHODS( name, path ) do { \
+ const char *paths[1]; \
+ \
+ paths[0] = path; \
+ bind_node( name##_flags_, name##_size_, \
+ paths, 1, name##_m, sizeof(name##_m)/sizeof(method_t)); \
+ } while(0)
+#define PROMDEV_KBD 0 /* input from keyboard */
+#define PROMDEV_SCREEN 0 /* output to screen */
+#define PROMDEV_TTYA 1 /* in/out to ttya */
+
/* DECLARE data structures for the nodes. */
DECLARE_UNNAMED_NODE( ob_obio, INSTALL_OPEN, sizeof(int) );
@@ -88,10 +99,145 @@
fword("property");
}
+// XXX move all arch/sparc32/console.c stuff here
+#define CTRL(addr) (*(char *)(addr))
+#define DATA(addr) (*(char *)(addr + 2))
+/* Read Register 0 */
+#define Rx_CH_AV 0x1 /* Rx Character Available */
+#define Tx_BUF_EMP 0x4 /* Tx Buffer empty */
+
+static int uart_charav(int port)
+{
+ return (CTRL(port) & Rx_CH_AV) != 0;
+}
+
+static char uart_getchar(int port)
+{
+ while (!uart_charav(port));
+
+ return DATA(port) & 0177;
+}
+
+static void uart_putchar(int port, unsigned char c)
+{
+ if (c == '\n')
+ uart_putchar(port, '\r');
+ while (!(CTRL(port) & Tx_BUF_EMP));
+
+ DATA(port) = c;
+}
+
+/* ( addr len -- actual ) */
static void
+zs_read(unsigned long *address)
+{
+ char *addr;
+ int len;
+
+ len = POP();
+ addr = (char *)POP();
+
+ if (len != 1)
+ printk("zs_read: bad len, addr %x len %x\n", (unsigned int)addr, len);
+
+ if (uart_charav(*address)) {
+ *addr = (char)uart_getchar(*address);
+ PUSH(1);
+ } else {
+ PUSH(0);
+ }
+}
+
+int keyboard_dataready(void);
+unsigned char keyboard_readdata(void);
+
+/* ( addr len -- actual ) */
+static void
+zs_read_keyboard(unsigned long *address)
+{
+ unsigned char *addr;
+ int len;
+
+ len = POP();
+ addr = (unsigned char *)POP();
+
+ if (len != 1)
+ printk("zs_read: bad len, addr %x len %x\n", (unsigned int)addr, len);
+
+ if (keyboard_dataready()) {
+ *addr = keyboard_readdata();
+ PUSH(1);
+ } else {
+ PUSH(0);
+ }
+}
+
+/* ( addr len -- actual ) */
+static void
+zs_write(unsigned long *address)
+{
+ unsigned char *addr;
+ int i, len;
+
+ len = POP();
+ addr = (unsigned char *)POP();
+
+ for (i = 0; i < len; i++) {
+ uart_putchar(*address, addr[i]);
+ }
+ PUSH(len);
+}
+
+static void
+zs_close(void)
+{
+}
+
+static void
+zs_open(unsigned long *address)
+{
+ int len;
+ phandle_t ph;
+ unsigned long *prop;
+ char *args;
+
+ fword("my-self");
+ fword("ihandle>phandle");
+ ph = (phandle_t)POP();
+ prop = (unsigned long *)get_property(ph, "address", &len);
+ *address = *prop;
+ fword("my-args");
+ args = pop_fstr_copy();
+ if (args && args[0] == 'a')
+ *address += 4;
+
+ //printk("zs_open: address %lx, args %s\n", *address, args);
+ RET ( -1 );
+}
+
+DECLARE_UNNAMED_NODE(zs, INSTALL_OPEN, sizeof(unsigned long));
+
+NODE_METHODS(zs) = {
+ { "open", zs_open },
+ { "close", zs_close },
+ { "read", zs_read },
+ { "write", zs_write },
+};
+
+DECLARE_UNNAMED_NODE(zs_keyboard, INSTALL_OPEN, sizeof(unsigned long));
+
+NODE_METHODS(zs_keyboard) = {
+ { "open", zs_open },
+ { "close", zs_close },
+ { "read", zs_read_keyboard },
+};
+
+static void
ob_zs_init(unsigned long base, unsigned long offset, int intr, int slave, int keyboard)
{
+ char nodebuff[256];
+
ob_new_obio_device("zs", "serial");
ob_reg(base, offset, ZS_REGS, 1);
@@ -116,6 +262,13 @@
ob_intr(intr);
fword("finish-device");
+
+ sprintf(nodebuff, "/obio/zs@0,%x", offset);
+ if (keyboard) {
+ REGISTER_NODE_METHODS(zs_keyboard, nodebuff);
+ } else {
+ REGISTER_NODE_METHODS(zs, nodebuff);
+ }
}
static char *nvram;
@@ -147,8 +300,12 @@
extern uint32_t cmdline;
extern uint32_t cmdline_size;
extern char boot_device;
+ extern char obp_stdin, obp_stdout;
+ extern const char *obp_stdin_path, *obp_stdout_path;
+ const char *stdin, *stdout;
unsigned int i;
+ char nographic;
ob_new_obio_device("eeprom", NULL);
@@ -171,6 +328,7 @@
cmdline = nv_info.cmdline;
cmdline_size = nv_info.cmdline_size;
boot_device = nv_info.boot_device;
+ nographic = nv_info.nographic;
push_str("mk48t08");
fword("model");
@@ -301,6 +459,35 @@
fword("finish-device");
}
+
+ if (nographic) {
+ obp_stdin = PROMDEV_TTYA;
+ obp_stdout = PROMDEV_TTYA;
+ stdin = "/obio/zs@0,100000:a";
+ stdout = "/obio/zs@0,100000:a";
+ } else {
+ obp_stdin = PROMDEV_KBD;
+ obp_stdout = PROMDEV_SCREEN;
+ stdin = "/obio/zs@0,0:a";
+ stdout = "/iommu/sbus/SUNW,tcx";
+ }
+
+ push_str("/");
+ fword("find-device");
+ push_str(stdin);
+ fword("encode-string");
+ push_str("stdin-path");
+ fword("encode-string");
+ fword("property");
+
+ push_str(stdout);
+ fword("encode-string");
+ push_str("stdout-path");
+ fword("encode-string");
+ fword("property");
+
+ obp_stdin_path = stdin;
+ obp_stdout_path = stdout;
}
static void
Modified: openbios-devel/modules/video.c
===================================================================
--- openbios-devel/modules/video.c 2006-07-23 14:22:39 UTC (rev 70)
+++ openbios-devel/modules/video.c 2006-07-23 14:29:29 UTC (rev 71)
@@ -242,11 +242,32 @@
fill_rect( color_ind, x, y, w, h );
}
+/* ( addr len -- actual ) */
+static void
+video_write(void)
+{
+ char *addr;
+ int i, len;
+
+ len = GETTOS();
+ addr = pop_fstr_copy();
+
+ console_draw_str(addr);
+ PUSH(len);
+}
+
+static void
+video_open(void)
+{
+}
+
NODE_METHODS( video ) = {
+ {"open", video_open },
{"dimensions", video_dimensions },
{"set-colors", video_set_colors },
{"fill-rectangle", video_fill_rect },
{"color!", video_color_bang },
+ {"write", video_write },
};
1
0
Author: stepan
Date: 2006-07-23 16:22:39 +0200 (Sun, 23 Jul 2006)
New Revision: 70
Removed:
openbios-devel/config.xml
openbios-devel/rules.xml
Modified:
openbios-devel/Makefile
openbios-devel/config/scripts/switch-arch
Log:
workaround for wrong viewvc permissions, Makefile bugfixes
Modified: openbios-devel/Makefile
===================================================================
--- openbios-devel/Makefile 2006-07-18 21:48:00 UTC (rev 69)
+++ openbios-devel/Makefile 2006-07-23 14:22:39 UTC (rev 70)
@@ -1,10 +1,18 @@
-ARCH= $(shell cat rules.xml |grep "^ARCH" |cut -d\= -f2|tr -d \ )
+ARCH= $(shell test -r rules.xml && cat rules.xml |grep "^ARCH" |cut -d\= -f2|tr -d \ )
HOSTARCH=$(shell config/scripts/archname)
CROSSCFLAGS=$(shell config/scripts/crosscflags $(HOSTARCH) $(ARCH))
ODIR=obj-$(ARCH)
-all: info build
+all: archtest info build
+archtest: prepare
+ @test -r config.xml -a -r rules.xml || \
+ ( echo ; echo "Please run the following command first:"; echo ; \
+ echo " $$ config/scripts/switch-arch <arch>"; \
+ echo; echo "<arch> can be one out of x86, amd64, cross-ppc, ppc"; \
+ echo " cross-sparc32, sparc32, cross-sparc64, sparc64"; \
+ echo; exit 1 )
+
info:
@echo "Building OpenBIOS on $(HOSTARCH) for $(ARCH)"
@@ -41,6 +49,14 @@
@#ln -s $(PWD)/include/$(HOSTARCH) $(ODIR)/host/include/asm
@echo "ok."
+# This is needed because viewvc messes with the permissions of executables:
+prepare:
+ @chmod 755 utils/dist/debian/rules
+ @chmod 755 config/scripts/switch-arch
+ @chmod 755 config/scripts/archname
+ @chmod 755 config/scripts/reldir
+ @chmod 755 config/scripts/crosscflags
+
xml: directories
@printf "Creating target Makefile..."
@xsltproc config/xml/xinclude.xsl build.xml > $(ODIR)/build-full.xml
@@ -54,7 +70,7 @@
build: xml
@printf "Building..."
- @( $(MAKE) -f $(ODIR)/Makefile CROSSCFLAGS=$(CROSSCFLAGS) > $(ODIR)/build.log 2>&1 && echo "ok." ) || \
+ @( $(MAKE) -f $(ODIR)/Makefile "CROSSCFLAGS=$(CROSSCFLAGS)" > $(ODIR)/build.log 2>&1 && echo "ok." ) || \
( echo "error:"; tail -15 $(ODIR)/build.log )
build-verbose:
Modified: openbios-devel/config/scripts/switch-arch
===================================================================
--- openbios-devel/config/scripts/switch-arch 2006-07-18 21:48:00 UTC (rev 69)
+++ openbios-devel/config/scripts/switch-arch 2006-07-23 14:22:39 UTC (rev 70)
@@ -8,8 +8,8 @@
ARCH=$1
-rm rules.xml
-rm config.xml
+rm -f rules.xml
+rm -f config.xml
ln -s config/examples/${ARCH}_rules.xml rules.xml
ln -s config/examples/${ARCH}_config.xml config.xml
Deleted: openbios-devel/config.xml
===================================================================
--- openbios-devel/config.xml 2006-07-18 21:48:00 UTC (rev 69)
+++ openbios-devel/config.xml 2006-07-23 14:22:39 UTC (rev 70)
@@ -1 +0,0 @@
-link config/examples/x86_config.xml
\ No newline at end of file
Deleted: openbios-devel/rules.xml
===================================================================
--- openbios-devel/rules.xml 2006-07-18 21:48:00 UTC (rev 69)
+++ openbios-devel/rules.xml 2006-07-23 14:22:39 UTC (rev 70)
@@ -1 +0,0 @@
-link config/examples/x86_rules.xml
\ No newline at end of file
1
0
Re: [OpenBIOS] Interesting issues have surfaced in building R69 usingthe tools f
by Blue Swirl 23 Jul '06
by Blue Swirl 23 Jul '06
23 Jul '06
>Since I do not wish to crowd the list with this litany of actual
>problems I will have a webpage up detailing all of them at
>http://yodathejediknight.home.att.net within the next few hours. (EDT
>NY time)
The relevant parts are:
make: execvp: config/scripts/crosscflags: Permission denied
and
kernel/bootstrap.c:795: error: syntax error before "FMT_CELL_x"
The first one means that crosscflags is not executable. Please run 'chmod +x
config/scripts/crosscflags'. SVN repo should be updated to correct this. The
second one is linked to the first one.
The attached patch fixes problems with 'make build'.
_________________________________________________________________
Don't just search. Find. Check out the new MSN Search!
http://search.msn.com/
1
0
Hi,
I updated the patches a bit. Any chance of committing them, or are there
problems that need fixing?
_________________________________________________________________
FREE pop-up blocking with the new MSN Toolbar - get it now!
http://toolbar.msn.click-url.com/go/onm00200415ave/direct/01/
2
1
r69 - in openbios-devel: arch/sparc64 config/examples drivers include modules
by svn＠openbios.org 18 Jul '06
by svn＠openbios.org 18 Jul '06
18 Jul '06
Author: stepan
Date: 2006-07-18 23:48:00 +0200 (Tue, 18 Jul 2006)
New Revision: 69
Added:
openbios-devel/drivers/vga.h
openbios-devel/drivers/vga_load_regs.c
openbios-devel/drivers/vga_set_mode.c
openbios-devel/include/video_subr.h
openbios-devel/modules/font_8x16.c
Modified:
openbios-devel/arch/sparc64/console.c
openbios-devel/config/examples/cross-sparc64_config.xml
openbios-devel/config/examples/sparc64_config.xml
openbios-devel/drivers/build.xml
Log:
VGA for Sparc64
Added 8x16 font, low-level VGA register programming and mode switching
functions from LinuxBIOS.
Fixed incorrect VGA_BASE.
Modified: openbios-devel/arch/sparc64/console.c
===================================================================
--- openbios-devel/arch/sparc64/console.c 2006-07-18 21:42:16 UTC (rev 68)
+++ openbios-devel/arch/sparc64/console.c 2006-07-18 21:48:00 UTC (rev 69)
@@ -8,6 +8,7 @@
#include "openbios/config.h"
#include "openbios/kernel.h"
#include "openbios.h"
+#include "video_subr.h"
#ifdef CONFIG_DEBUG_CONSOLE
@@ -122,7 +123,8 @@
#define ATTRIBUTE 7 /* The attribute of an character. */
#define APB_MEM_BASE 0x1ff00000000ULL
-#define VGA_BASE (APB_MEM_BASE + 0x4b8000ULL) /* The video memory address. */
+#define VGA_BASE (APB_MEM_BASE + 0x4a0000ULL) /* Beginning of video memory address. */
+#define TEXT_BASE (VGA_BASE + 0x18000ULL) /* The text memory address. */
/* VGA Index and Data Registers */
#define VGA_REG_INDEX 0x03D4 /* VGA index register */
@@ -137,7 +139,7 @@
/* Save the X and Y position. */
static int xpos, ypos;
/* Point to the video memory. */
-static volatile unsigned char *video = (unsigned char *) VGA_BASE;
+static unsigned char *video = (unsigned char *) TEXT_BASE;
static void video_initcursor(void)
{
@@ -236,9 +238,19 @@
video_poscursor(xpos, ypos);
}
+#ifdef CONFIG_DRIVER_VGA
+#include "../../modules/font_8x16.c"
+#endif
+
void video_init(void)
{
- video=(unsigned char *)VGA_BASE;
+ video=(unsigned char *)TEXT_BASE;
+
+#ifdef CONFIG_DRIVER_VGA
+ vga_load_regs();
+ vga_font_load((unsigned char *)VGA_BASE, fontdata_8x16, 16, 256);
+ vga_set_amode();
+#endif
}
/*
Modified: openbios-devel/config/examples/cross-sparc64_config.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc64_config.xml 2006-07-18 21:42:16 UTC (rev 68)
+++ openbios-devel/config/examples/cross-sparc64_config.xml 2006-07-18 21:48:00 UTC (rev 69)
@@ -71,6 +71,7 @@
<option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/>
<option name="CONFIG_DEBUG_IDE" type="boolean" value="true"/>
<option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/>
+ <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/>
</config>
Modified: openbios-devel/config/examples/sparc64_config.xml
===================================================================
--- openbios-devel/config/examples/sparc64_config.xml 2006-07-18 21:42:16 UTC (rev 68)
+++ openbios-devel/config/examples/sparc64_config.xml 2006-07-18 21:48:00 UTC (rev 69)
@@ -71,6 +71,7 @@
<option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/>
<option name="CONFIG_DEBUG_IDE" type="boolean" value="true"/>
<option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/>
+ <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/>
</config>
Modified: openbios-devel/drivers/build.xml
===================================================================
--- openbios-devel/drivers/build.xml 2006-07-18 21:42:16 UTC (rev 68)
+++ openbios-devel/drivers/build.xml 2006-07-18 21:48:00 UTC (rev 69)
@@ -12,6 +12,8 @@
<object source="sbus.c" condition="DRIVER_SBUS"/>
<object source="esp.c" condition="DRIVER_ESP"/>
<object source="obio.c" condition="DRIVER_OBIO"/>
+ <object source="vga_load_regs.c" condition="DRIVER_VGA"/>
+ <object source="vga_set_mode.c" condition="DRIVER_VGA"/>
</library>
<dictionary name="openbios" target="forth">
Added: openbios-devel/drivers/vga.h
===================================================================
--- openbios-devel/drivers/vga.h (rev 0)
+++ openbios-devel/drivers/vga.h 2006-07-18 21:48:00 UTC (rev 69)
@@ -0,0 +1,228 @@
+/*
+ *
+ * modified
+ * by Steve M. Gehlbach <steve(a)kesa.com>
+ *
+ * Originally from linux/drivers/video/vga16.c by
+ * Ben Pfaff <pfaffben(a)debian.org> and Petr Vandrovec <VANDROVE(a)vc.cvut.cz>
+ * Copyright 1999 Ben Pfaff <pfaffben(a)debian.org> and Petr Vandrovec <VANDROVE(a)vc.cvut.cz>
+ * Based on VGA info at http://www.goodnet.com/~tinara/FreeVGA/home.htm
+ * Based on VESA framebuffer (c) 1998 Gerd Knorr <kraxel(a)goldbach.in-berlin.de>
+ *
+ */
+
+#ifndef VGA_H_INCL
+#define VGA_H_INCL 1
+
+//#include <cpu/p5/io.h>
+
+#define u8 unsigned char
+#define u16 unsigned short
+#define u32 unsigned int
+#define __u32 u32
+
+#define VERROR -1
+#define CHAR_HEIGHT 16
+#define LINES 25
+#define COLS 80
+
+// macros for writing to vga regs
+#define write_crtc(data,addr) outb(addr,CRT_IC); outb(data,CRT_DC)
+#define write_att(data,addr) inb(IS1_RC); inb(0x80); outb(addr,ATT_IW); inb(0x80); outb(data,ATT_IW); inb(0x80)
+#define write_seq(data,addr) outb(addr,SEQ_I); outb(data,SEQ_D)
+#define write_gra(data,addr) outb(addr,GRA_I); outb(data,GRA_D)
+u8 read_seq_b(u16 addr);
+u8 read_gra_b(u16 addr);
+u8 read_crtc_b(u16 addr);
+u8 read_att_b(u16 addr);
+
+
+#ifdef VGA_HARDWARE_FIXUP
+void vga_hardware_fixup(void);
+#else
+#define vga_hardware_fixup() do{} while(0)
+#endif
+
+#define SYNC_HOR_HIGH_ACT 1 /* horizontal sync high active */
+#define SYNC_VERT_HIGH_ACT 2 /* vertical sync high active */
+#define SYNC_EXT 4 /* external sync */
+#define SYNC_COMP_HIGH_ACT 8 /* composite sync high active */
+#define SYNC_BROADCAST 16 /* broadcast video timings */
+ /* vtotal = 144d/288n/576i => PAL */
+ /* vtotal = 121d/242n/484i => NTSC */
+
+#define SYNC_ON_GREEN 32 /* sync on green */
+
+#define VMODE_NONINTERLACED 0 /* non interlaced */
+#define VMODE_INTERLACED 1 /* interlaced */
+#define VMODE_DOUBLE 2 /* double scan */
+#define VMODE_MASK 255
+
+#define VMODE_YWRAP 256 /* ywrap instead of panning */
+#define VMODE_SMOOTH_XPAN 512 /* smooth xpan possible (internally used) */
+#define VMODE_CONUPDATE 512 /* don't update x/yoffset */
+
+/* VGA data register ports */
+#define CRT_DC 0x3D5 /* CRT Controller Data Register - color emulation */
+#define CRT_DM 0x3B5 /* CRT Controller Data Register - mono emulation */
+#define ATT_R 0x3C1 /* Attribute Controller Data Read Register */
+#define GRA_D 0x3CF /* Graphics Controller Data Register */
+#define SEQ_D 0x3C5 /* Sequencer Data Register */
+
+#define MIS_R 0x3CC // Misc Output Read Register
+#define MIS_W 0x3C2 // Misc Output Write Register
+
+#define IS1_RC 0x3DA /* Input Status Register 1 - color emulation */
+#define IS1_RM 0x3BA /* Input Status Register 1 - mono emulation */
+#define PEL_D 0x3C9 /* PEL Data Register */
+#define PEL_MSK 0x3C6 /* PEL mask register */
+
+/* EGA-specific registers */
+#define GRA_E0 0x3CC /* Graphics enable processor 0 */
+#define GRA_E1 0x3CA /* Graphics enable processor 1 */
+
+
+/* VGA index register ports */
+#define CRT_IC 0x3D4 /* CRT Controller Index - color emulation */
+#define CRT_IM 0x3B4 /* CRT Controller Index - mono emulation */
+#define ATT_IW 0x3C0 /* Attribute Controller Index & Data Write Register */
+#define GRA_I 0x3CE /* Graphics Controller Index */
+#define SEQ_I 0x3C4 /* Sequencer Index */
+#define PEL_IW 0x3C8 /* PEL Write Index */
+#define PEL_IR 0x3C7 /* PEL Read Index */
+
+/* standard VGA indexes max counts */
+#define CRTC_C 25 /* 25 CRT Controller Registers sequentially set*/
+ // the remainder are not in the par array
+#define ATT_C 21 /* 21 Attribute Controller Registers */
+#define GRA_C 9 /* 9 Graphics Controller Registers */
+#define SEQ_C 5 /* 5 Sequencer Registers */
+#define MIS_C 1 /* 1 Misc Output Register */
+
+#define CRTC_H_TOTAL 0
+#define CRTC_H_DISP 1
+#define CRTC_H_BLANK_START 2
+#define CRTC_H_BLANK_END 3
+#define CRTC_H_SYNC_START 4
+#define CRTC_H_SYNC_END 5
+#define CRTC_V_TOTAL 6
+#define CRTC_OVERFLOW 7
+#define CRTC_PRESET_ROW 8
+#define CRTC_MAX_SCAN 9
+#define CRTC_CURSOR_START 0x0A
+#define CRTC_CURSOR_END 0x0B
+#define CRTC_START_HI 0x0C
+#define CRTC_START_LO 0x0D
+#define CRTC_CURSOR_HI 0x0E
+#define CRTC_CURSOR_LO 0x0F
+#define CRTC_V_SYNC_START 0x10
+#define CRTC_V_SYNC_END 0x11
+#define CRTC_V_DISP_END 0x12
+#define CRTC_OFFSET 0x13
+#define CRTC_UNDERLINE 0x14
+#define CRTC_V_BLANK_START 0x15
+#define CRTC_V_BLANK_END 0x16
+#define CRTC_MODE 0x17
+#define CRTC_LINE_COMPARE 0x18
+
+#define ATC_MODE 0x10
+#define ATC_OVERSCAN 0x11
+#define ATC_PLANE_ENABLE 0x12
+#define ATC_PEL 0x13
+#define ATC_COLOR_PAGE 0x14
+
+#define SEQ_CLOCK_MODE 0x01
+#define SEQ_PLANE_WRITE 0x02
+#define SEQ_CHARACTER_MAP 0x03
+#define SEQ_MEMORY_MODE 0x04
+
+#define GDC_SR_VALUE 0x00
+#define GDC_SR_ENABLE 0x01
+#define GDC_COMPARE_VALUE 0x02
+#define GDC_DATA_ROTATE 0x03
+#define GDC_PLANE_READ 0x04
+#define GDC_MODE 0x05
+#define GDC_MISC 0x06
+#define GDC_COMPARE_MASK 0x07
+#define GDC_BIT_MASK 0x08
+
+// text attributes
+#define VGA_ATTR_CLR_RED 0x4
+#define VGA_ATTR_CLR_GRN 0x2
+#define VGA_ATTR_CLR_BLU 0x1
+#define VGA_ATTR_CLR_YEL (VGA_ATTR_CLR_RED | VGA_ATTR_CLR_GRN)
+#define VGA_ATTR_CLR_CYN (VGA_ATTR_CLR_GRN | VGA_ATTR_CLR_BLU)
+#define VGA_ATTR_CLR_MAG (VGA_ATTR_CLR_BLU | VGA_ATTR_CLR_RED)
+#define VGA_ATTR_CLR_BLK 0
+#define VGA_ATTR_CLR_WHT (VGA_ATTR_CLR_RED | VGA_ATTR_CLR_GRN | VGA_ATTR_CLR_BLU)
+#define VGA_ATTR_BNK 0x80
+#define VGA_ATTR_ITN 0x08
+
+/*
+ * vga register parameters
+ * these are copied to the
+ * registers.
+ *
+ */
+struct vga_par {
+ u8 crtc[CRTC_C];
+ u8 atc[ATT_C];
+ u8 gdc[GRA_C];
+ u8 seq[SEQ_C];
+ u8 misc; // the misc register, MIS_W
+ u8 vss;
+};
+
+
+/* Interpretation of offset for color fields: All offsets are from the right,
+ * inside a "pixel" value, which is exactly 'bits_per_pixel' wide (means: you
+ * can use the offset as right argument to <<). A pixel afterwards is a bit
+ * stream and is written to video memory as that unmodified. This implies
+ * big-endian byte order if bits_per_pixel is greater than 8.
+ */
+struct fb_bitfield {
+ __u32 offset; /* beginning of bitfield */
+ __u32 length; /* length of bitfield */
+ __u32 msb_right; /* != 0 : Most significant bit is */
+ /* right */
+};
+
+struct screeninfo {
+ __u32 xres; /* visible resolution */
+ __u32 yres;
+ __u32 xres_virtual; /* virtual resolution */
+ __u32 yres_virtual;
+ __u32 xoffset; /* offset from virtual to visible */
+ __u32 yoffset; /* resolution */
+
+ __u32 bits_per_pixel; /* guess what */
+ __u32 grayscale; /* != 0 Graylevels instead of colors */
+
+ struct fb_bitfield red; /* bitfield in fb mem if true color, */
+ struct fb_bitfield green; /* else only length is significant */
+ struct fb_bitfield blue;
+ struct fb_bitfield transp; /* transparency */
+
+ __u32 nonstd; /* != 0 Non standard pixel format */
+
+ __u32 activate; /* see FB_ACTIVATE_* */
+
+ __u32 height; /* height of picture in mm */
+ __u32 width; /* width of picture in mm */
+
+ __u32 accel_flags; /* acceleration flags (hints) */
+
+ /* Timing: All values in pixclocks, except pixclock (of course) */
+ __u32 pixclock; /* pixel clock in ps (pico seconds) */
+ __u32 left_margin; /* time from sync to picture */
+ __u32 right_margin; /* time from picture to sync */
+ __u32 upper_margin; /* time from sync to picture */
+ __u32 lower_margin;
+ __u32 hsync_len; /* length of horizontal sync */
+ __u32 vsync_len; /* length of vertical sync */
+ __u32 sync; /* sync polarity */
+ __u32 vmode; /* interlaced etc */
+ __u32 reserved[6]; /* Reserved for future compatibility */
+};
+
+#endif
Added: openbios-devel/drivers/vga_load_regs.c
===================================================================
--- openbios-devel/drivers/vga_load_regs.c (rev 0)
+++ openbios-devel/drivers/vga_load_regs.c 2006-07-18 21:48:00 UTC (rev 69)
@@ -0,0 +1,427 @@
+#include "asm/io.h"
+#include "video_subr.h"
+#include "string.h"
+#include "vga.h"
+
+/*
+ * $Id$
+ * $Source$
+ *
+ * from the Linux kernel code base.
+ * orig by Ben Pfaff and Petr Vandrovec.
+ *
+ * modified by
+ * Steve M. Gehlbach <steve(a)kesa.com>
+ *
+ * NOTE: to change the horiz and vertical pixels,
+ * change the xres,yres,xres_virt,yres_virt setting
+ * in the screeninfo structure below. You may also need
+ * to change the border settings as well.
+ *
+ * Convert the screeninfo structure to data for
+ * writing to the vga registers
+ *
+ */
+
+// prototypes
+static int vga_decode_var(const struct screeninfo *var, struct vga_par *par);
+static int vga_set_regs(const struct vga_par *par);
+
+extern const u8 VgaLookupTable[];
+
+u8 read_seq_b(u16 addr) {
+ outb(addr,SEQ_I);
+ return inb(SEQ_D);
+}
+u8 read_gra_b(u16 addr) {
+ outb(addr,GRA_I);
+ return inb(GRA_D);
+}
+u8 read_crtc_b(u16 addr) {
+ outb(addr,CRT_IC);
+ return inb(CRT_DC);
+}
+u8 read_att_b(u16 addr) {
+ inb(IS1_RC);
+ inb(0x80);
+ outb(addr,ATT_IW);
+ return inb(ATT_R);
+}
+
+
+/*
+From: The Frame Buffer Device
+by Geert Uytterhoeven <geert(a)linux-m68k.org>
+in the linux kernel docs.
+
+The following picture summarizes all timings. The horizontal retrace time is
+the sum of the left margin, the right margin and the hsync length, while the
+vertical retrace time is the sum of the upper margin, the lower margin and the
+vsync length.
+
+ +----------+---------------------------------------------+----------+-------+
+ | | ^ | | |
+ | | |upper_margin | | |
+ | | | | | |
+ +----------###############################################----------+-------+
+ | # ^ # | |
+ | # | # | |
+ | # | # | |
+ | # | # | |
+ | left # | # right | hsync |
+ | margin # | xres # margin | len |
+ |<-------->#<---------------+--------------------------->#<-------->|<----->|
+ | # | # | |
+ | # | # | |
+ | # | # | |
+ | # |yres # | |
+ | # | # | |
+ | # | # | |
+ | # | # | |
+ | # | # | |
+ | # | # | |
+ | # | # | |
+ | # | # | |
+ | # | # | |
+ | # | # | |
+ +----------###############################################----------+-------+
+ | | ^ | | |
+ | | |lower_margin | | |
+ | | | | | |
+ +----------+---------------------------------------------+----------+-------+
+ | | ^ | | |
+ | | |vsync_len | | |
+ | | | | | |
+ +----------+---------------------------------------------+----------+-------+
+
+All horizontal timings are in number of dotclocks
+(in picoseconds, 1E-12 s), and vertical timings in number of scanlines.
+
+The vga uses the following fields:
+
+ - pixclock: pixel clock in ps (pico seconds)
+ - xres,yres,xres_v,yres_v
+ - left_margin: time from sync to picture
+ - right_margin: time from picture to sync
+ - upper_margin: time from sync to picture
+ - lower_margin: time from picture to sync
+ - hsync_len: length of horizontal sync
+ - vsync_len: length of vertical sync
+
+*/
+
+/* our display parameters per the above */
+
+static const struct screeninfo vga_settings = {
+ 640,400,640,400,/* xres,yres,xres_virt,yres_virt */
+ 0,0, /* xoffset,yoffset */
+ 4, /* bits_per_pixel NOT USED*/
+ 0, /* greyscale ? */
+ {0,0,0}, /* R */
+ {0,0,0}, /* G */
+ {0,0,0}, /* B */
+ {0,0,0}, /* transparency */
+ 0, /* standard pixel format */
+ 0, // activate now
+ -1,-1, // height and width in mm
+ 0, // accel flags
+ 39721, // pixclock: 79442 -> 12.587 Mhz (NOT USED)
+ // 70616 -> 14.161
+ // 39721 -> 25.175
+ // 35308 -> 28.322
+
+ 48, 16, 39, 8, // margins left,right,upper,lower
+ 96, // hsync length
+ 2, // vsync length
+ 0, // sync polarity
+ 0, // non interlaced, single mode
+ {0,0,0,0,0,0} // compatibility
+};
+
+// ALPHA-MODE
+// Hard coded to BIOS VGA mode 3 (alpha color text)
+// screen size settable in screeninfo structure
+
+static int vga_decode_var(const struct screeninfo *var,
+ struct vga_par *par)
+{
+ u8 VgaAttributeTable[16] =
+ { 0x000, 0x001, 0x002, 0x003, 0x004, 0x005, 0x014, 0x007, 0x038, 0x039, 0x03A, 0x03B, 0x03C, 0x03D, 0x03E, 0x03F};
+
+ u32 xres, right, hslen, left, xtotal;
+ u32 yres, lower, vslen, upper, ytotal;
+ u32 vxres, xoffset, vyres, yoffset;
+ u32 pos;
+ u8 r7, rMode;
+ int i;
+
+ xres = (var->xres + 7) & ~7;
+ vxres = (var->xres_virtual + 0xF) & ~0xF;
+ xoffset = (var->xoffset + 7) & ~7;
+ left = (var->left_margin + 7) & ~7;
+ right = (var->right_margin + 7) & ~7;
+ hslen = (var->hsync_len + 7) & ~7;
+
+ if (vxres < xres)
+ vxres = xres;
+ if (xres + xoffset > vxres)
+ xoffset = vxres - xres;
+
+ xres >>= 3;
+ right >>= 3;
+ hslen >>= 3;
+ left >>= 3;
+ vxres >>= 3;
+ xtotal = xres + right + hslen + left;
+ if (xtotal >= 256)
+ return VERROR; //xtotal too big
+ if (hslen > 32)
+ return VERROR; //hslen too big
+ if (right + hslen + left > 64)
+ return VERROR; //hblank too big
+ par->crtc[CRTC_H_TOTAL] = xtotal - 5;
+ par->crtc[CRTC_H_BLANK_START] = xres - 1;
+ par->crtc[CRTC_H_DISP] = xres - 1;
+ pos = xres + right;
+ par->crtc[CRTC_H_SYNC_START] = pos;
+ pos += hslen;
+ par->crtc[CRTC_H_SYNC_END] = (pos & 0x1F) | 0x20 ; //<--- stpc text mode p178
+ pos += left - 2; /* blank_end + 2 <= total + 5 */
+ par->crtc[CRTC_H_BLANK_END] = (pos & 0x1F) | 0x80;
+ if (pos & 0x20)
+ par->crtc[CRTC_H_SYNC_END] |= 0x80;
+
+ yres = var->yres;
+ lower = var->lower_margin;
+ vslen = var->vsync_len;
+ upper = var->upper_margin;
+ vyres = var->yres_virtual;
+ yoffset = var->yoffset;
+
+ if (yres > vyres)
+ vyres = yres;
+ if (vxres * vyres > 65536) {
+ vyres = 65536 / vxres;
+ if (vyres < yres)
+ return VERROR; // out of memory
+ }
+ if (yoffset + yres > vyres)
+ yoffset = vyres - yres;
+
+ if (var->vmode & VMODE_DOUBLE) {
+ yres <<= 1;
+ lower <<= 1;
+ vslen <<= 1;
+ upper <<= 1;
+ }
+ ytotal = yres + lower + vslen + upper;
+ if (ytotal > 1024) {
+ ytotal >>= 1;
+ yres >>= 1;
+ lower >>= 1;
+ vslen >>= 1;
+ upper >>= 1;
+ rMode = 0x04;
+ } else
+ rMode = 0x00;
+ if (ytotal > 1024)
+ return VERROR; //ytotal too big
+ if (vslen > 16)
+ return VERROR; //vslen too big
+ par->crtc[CRTC_V_TOTAL] = ytotal - 2;
+ r7 = 0x10; /* disable linecompare */
+ if (ytotal & 0x100) r7 |= 0x01;
+ if (ytotal & 0x200) r7 |= 0x20;
+ par->crtc[CRTC_PRESET_ROW] = 0;
+
+
+// GMODE <--> ALPHA-MODE
+// default using alpha mode so we need to set char rows= CHAR_HEIGHT-1
+ par->crtc[CRTC_MAX_SCAN] = 0x40 | (CHAR_HEIGHT-1); /* 16 scanlines, linecmp max*/
+
+ if (var->vmode & VMODE_DOUBLE)
+ par->crtc[CRTC_MAX_SCAN] |= 0x80;
+ par->crtc[CRTC_CURSOR_START] = 0x00; // curs enabled, start line = 0
+ par->crtc[CRTC_CURSOR_END] = CHAR_HEIGHT-1; // end line = 12
+ pos = yoffset * vxres + (xoffset >> 3);
+ par->crtc[CRTC_START_HI] = pos >> 8;
+ par->crtc[CRTC_START_LO] = pos & 0xFF;
+ par->crtc[CRTC_CURSOR_HI] = 0x00;
+ par->crtc[CRTC_CURSOR_LO] = 0x00;
+ pos = yres - 1;
+ par->crtc[CRTC_V_DISP_END] = pos & 0xFF;
+ par->crtc[CRTC_V_BLANK_START] = pos & 0xFF;
+ if (pos & 0x100)
+ r7 |= 0x0A; /* 0x02 -> DISP_END, 0x08 -> BLANK_START */
+ if (pos & 0x200) {
+ r7 |= 0x40; /* 0x40 -> DISP_END */
+ par->crtc[CRTC_MAX_SCAN] |= 0x20; /* BLANK_START */
+ }
+ pos += lower;
+ par->crtc[CRTC_V_SYNC_START] = pos & 0xFF;
+ if (pos & 0x100)
+ r7 |= 0x04;
+ if (pos & 0x200)
+ r7 |= 0x80;
+ pos += vslen;
+ par->crtc[CRTC_V_SYNC_END] = (pos & 0x0F) & ~0x10; /* disabled reg write prot, IRQ */
+ pos += upper - 1; /* blank_end + 1 <= ytotal + 2 */
+ par->crtc[CRTC_V_BLANK_END] = pos & 0xFF; /* 0x7F for original VGA,
+ but some SVGA chips requires all 8 bits to set */
+ if (vxres >= 512)
+ return VERROR; //vxres too long
+ par->crtc[CRTC_OFFSET] = vxres >> 1;
+
+ // put the underline off of the character, necessary in alpha color mode
+ par->crtc[CRTC_UNDERLINE] = 0x1f;
+
+ par->crtc[CRTC_MODE] = rMode | 0xA3; // word mode
+ par->crtc[CRTC_LINE_COMPARE] = 0xFF;
+ par->crtc[CRTC_OVERFLOW] = r7;
+
+
+ // not used ??
+ par->vss = 0x00; /* 3DA */
+
+ for (i = 0x00; i < 0x10; i++) {
+ par->atc[i] = VgaAttributeTable[i];
+ }
+ // GMODE <--> ALPHA-MODE
+ par->atc[ATC_MODE] = 0x0c; // text mode
+
+ par->atc[ATC_OVERSCAN] = 0x00; // no border
+ par->atc[ATC_PLANE_ENABLE] = 0x0F;
+ par->atc[ATC_PEL] = xoffset & 7;
+ par->atc[ATC_COLOR_PAGE] = 0x00;
+
+ par->misc = 0x67; /* enable CPU, ports 0x3Dx, positive sync*/
+ if (var->sync & SYNC_HOR_HIGH_ACT)
+ par->misc &= ~0x40;
+ if (var->sync & SYNC_VERT_HIGH_ACT)
+ par->misc &= ~0x80;
+
+ par->seq[SEQ_CLOCK_MODE] = 0x01; //8-bit char; 0x01=alpha mode
+ par->seq[SEQ_PLANE_WRITE] = 0x03; // just char/attr plane
+ par->seq[SEQ_CHARACTER_MAP] = 0x00;
+ par->seq[SEQ_MEMORY_MODE] = 0x02; // A/G bit not used in stpc; O/E on, C4 off
+
+ par->gdc[GDC_SR_VALUE] = 0x00;
+ // bits set in the SR_EN regs will enable set/reset action
+ // based on the bit settings in the SR_VAL register
+ par->gdc[GDC_SR_ENABLE] = 0x00;
+ par->gdc[GDC_COMPARE_VALUE] = 0x00;
+ par->gdc[GDC_DATA_ROTATE] = 0x00;
+ par->gdc[GDC_PLANE_READ] = 0;
+ par->gdc[GDC_MODE] = 0x10; //Okay
+
+ // GMODE <--> ALPHA-MMODE
+ par->gdc[GDC_MISC] = 0x0e; // b0=0 ->alpha mode; memory at 0xb8000
+
+ par->gdc[GDC_COMPARE_MASK] = 0x00;
+ par->gdc[GDC_BIT_MASK] = 0xFF;
+
+ return 0;
+}
+
+/*
+ * From the Linux kernel.
+ * orig by Ben Pfaff and Petr Vandrovec.
+ * see the note in the vga.h for attribution.
+ *
+ * modified by
+ * Steve M. Gehlbach <steve(a)kesa.com>
+ * for the linuxbios project
+ *
+ * Write the data in the vga parameter structure
+ * to the vga registers, along with other default
+ * settings.
+ *
+ */
+static int vga_set_regs(const struct vga_par *par)
+{
+ int i;
+
+ /* update misc output register */
+ outb(par->misc, MIS_W);
+
+ /* synchronous reset on */
+ outb(0x00, SEQ_I);
+ outb(0x00, SEQ_D);
+
+ /* write sequencer registers */
+ outb(1, SEQ_I);
+ outb(par->seq[1] | 0x20, SEQ_D); // blank display
+ for (i = 2; i < SEQ_C; i++) {
+ outb(i, SEQ_I);
+ outb(par->seq[i], SEQ_D);
+ }
+
+ /* synchronous reset off */
+ outb(0x00, SEQ_I);
+ outb(0x03, SEQ_D);
+
+ /* deprotect CRT registers 0-7 */
+ outb(0x11, CRT_IC);
+ outb(par->crtc[0x11], CRT_DC);
+
+ /* write CRT registers */
+ for (i = 0; i < CRTC_C; i++) {
+ outb(i, CRT_IC);
+ outb(par->crtc[i], CRT_DC);
+ }
+ /* write graphics controller registers */
+ for (i = 0; i < GRA_C; i++) {
+ outb(i, GRA_I);
+ outb(par->gdc[i], GRA_D);
+ }
+
+ /* write attribute controller registers */
+ for (i = 0; i < ATT_C; i++) {
+ inb(IS1_RC); /* reset flip-flop */
+ inb(0x80); //delay
+ outb(i, ATT_IW);
+ inb(0x80); //delay
+
+ outb(par->atc[i], ATT_IW);
+ inb(0x80); //delay
+ }
+
+ // initialize the color table
+ outb(0, PEL_IW);
+ i = 0;
+ // length is a magic number right now
+ while ( i < (0x3f*3 + 3) ) {
+ outb(VgaLookupTable[i++], PEL_D);
+ outb(VgaLookupTable[i++], PEL_D);
+ outb(VgaLookupTable[i++], PEL_D);
+ }
+
+ outb(0x0ff, PEL_MSK); // palette mask
+
+ // very important
+ // turn on video, disable palette access
+ inb(IS1_RC); /* reset flip-flop */
+ inb(0x80); //delay
+ outb(0x20, ATT_IW);
+
+ /* Wait for screen to stabilize. */
+ //for(i=0;i<1000;i++) { inb(0x80); }
+
+ outb(0x01, SEQ_I); // unblank display
+ outb(par->seq[1], SEQ_D);
+
+// turn on display, disable access to attr palette
+ inb(IS1_RC);
+ outb(0x20, ATT_IW);
+
+return 0;
+}
+
+void
+vga_load_regs(void)
+{
+ struct vga_par par;
+
+ vga_decode_var(&vga_settings, &par);
+ vga_set_regs(&par);
+}
Added: openbios-devel/drivers/vga_set_mode.c
===================================================================
--- openbios-devel/drivers/vga_set_mode.c (rev 0)
+++ openbios-devel/drivers/vga_set_mode.c 2006-07-18 21:48:00 UTC (rev 69)
@@ -0,0 +1,148 @@
+/*
+ * $Id$
+ * $Source$
+ *
+ * by
+ * Steve M. Gehlbach <steve(a)kesa.com>
+ *
+ * These routines set graphics mode and alpha mode
+ * for switching back and forth.
+ *
+ * Register settings are
+ * more or less as follows:
+ *
+ * Register Graphics Alpha
+ * 16 color
+ * ------------------------------------------------
+ * GDC_MODE 0x00 0x10
+ * GDC_MISC 0x05 0x0e
+ * SEQ_MEMORY_MODE 0x06 0x02
+ * SEQ_PLANE_WRITE 0x0f 0x03
+ * CRTC_CURSOR_START 0x20 0x00
+ * CRTC_CURSOR_END 0x00 CHAR_HEIGHT-1
+ * CRTC_MODE 0xe3 0xa3
+ * CRTC_MAX_SCAN 0x40 0x40 | CHAR_HEIGHT-1
+ * ATC_MODE 0x01 0x0c
+ *
+ */
+
+#include "asm/io.h"
+#include "vga.h"
+
+void vga_set_gmode (void) {
+ u8 byte;
+
+ byte = read_att_b(ATC_MODE) & ~0x0f;
+ write_att(byte|0x1, ATC_MODE);
+//
+// display is off at this point
+
+ byte = read_seq_b(SEQ_PLANE_WRITE) & ~0xf;
+ write_seq(byte|0xf,SEQ_PLANE_WRITE); // all planes
+ byte = read_seq_b(SEQ_MEMORY_MODE);
+ write_seq(byte|4,SEQ_MEMORY_MODE);
+
+ byte = read_gra_b(GDC_MODE) & ~0x10;
+ write_gra(byte,GDC_MODE);
+ write_gra(0x05, GDC_MISC);
+
+ write_crtc(0x20, CRTC_CURSOR_START);
+ write_crtc(0x00, CRTC_CURSOR_END);
+ byte = read_crtc_b(CRTC_MODE) & ~0xe0;
+ write_crtc(byte|0xe0, CRTC_MODE);
+ byte = read_crtc_b(CRTC_MAX_SCAN) & ~0x01f;
+ write_crtc(byte, CRTC_MAX_SCAN);
+
+ byte = inb(MIS_R); // get 3c2 value by reading 3cc
+ outb(byte & ~0xc,MIS_W); // clear last bits to set 25Mhz clock and low page
+
+
+// turn on display, disable access to attr palette
+ inb(IS1_RC);
+ outb(0x20, ATT_IW);
+}
+
+void vga_set_amode (void) {
+ u8 byte;
+ write_att(0x0c, ATC_MODE);
+
+ //reset palette to normal in the case it was changed
+ write_att(0x0, ATC_COLOR_PAGE);
+//
+// display is off at this point
+
+ write_seq(0x3,SEQ_PLANE_WRITE); // planes 0 & 1
+ byte = read_seq_b(SEQ_MEMORY_MODE) & ~0x04;
+ write_seq(byte,SEQ_MEMORY_MODE);
+
+ byte = read_gra_b(GDC_MODE) & ~0x60;
+ write_gra(byte|0x10,GDC_MODE);
+
+ write_gra(0x0e, GDC_MISC);
+
+ write_crtc(0x00, CRTC_CURSOR_START);
+ write_crtc(CHAR_HEIGHT-1, CRTC_CURSOR_END);
+
+ byte = read_crtc_b(CRTC_MODE) & ~0xe0;
+ write_crtc(byte|0xa0, CRTC_MODE);
+ byte = read_crtc_b(CRTC_MAX_SCAN) & ~0x01f;
+ write_crtc(byte | (CHAR_HEIGHT-1), CRTC_MAX_SCAN);
+
+
+// turn on display, disable access to attr palette
+ inb(IS1_RC);
+ outb(0x20, ATT_IW);
+}
+
+/*
+ * by Steve M. Gehlbach, Ph.D. <steve(a)kesa.com>
+ *
+ * vga_font_load loads a font into font memory. It
+ * assumes alpha mode has been set.
+ *
+ * The font load code follows technique used
+ * in the tiara project, which came from
+ * the Universal Talkware Boot Loader,
+ * http://www.talkware.net.
+ */
+
+void vga_font_load(unsigned char *vidmem, const unsigned char *font, int height, int num_chars) {
+
+/* Note: the font table is 'height' long but the font storage area
+ * is 32 bytes long.
+ */
+
+ int i,j;
+ u8 byte;
+
+ // set sequencer map 2, odd/even off
+ byte = read_seq_b(SEQ_PLANE_WRITE) & ~0xf;
+ write_seq(byte|4,SEQ_PLANE_WRITE);
+ byte = read_seq_b(SEQ_MEMORY_MODE);
+ write_seq(byte|4,SEQ_MEMORY_MODE);
+
+ // select graphics map 2, odd/even off, map starts at 0xa0000
+ write_gra(2,GDC_PLANE_READ);
+ byte = read_gra_b(GDC_MODE) & ~0x10;
+ write_gra(byte,GDC_MODE);
+ write_gra(0,GDC_MISC);
+
+ for (i = 0 ; i < num_chars ; i++) {
+ for (j = 0 ; j < height ; j++) {
+ vidmem[i*32+j] = font[i*16+j];
+ }
+ }
+
+ // set sequencer back to maps 0,1, odd/even on
+ byte = read_seq_b(SEQ_PLANE_WRITE) & ~0xf;
+ write_seq(byte|3,SEQ_PLANE_WRITE);
+ byte = read_seq_b(SEQ_MEMORY_MODE) & ~0x4;
+ write_seq(byte,SEQ_MEMORY_MODE);
+
+ // select graphics back to map 0,1, odd/even on
+ write_gra(0,GDC_PLANE_READ);
+ byte = read_gra_b(GDC_MODE);
+ write_gra(byte|0x10,GDC_MODE);
+ write_gra(0xe,GDC_MISC);
+
+}
Added: openbios-devel/include/video_subr.h
===================================================================
--- openbios-devel/include/video_subr.h (rev 0)
+++ openbios-devel/include/video_subr.h 2006-07-18 21:48:00 UTC (rev 69)
@@ -0,0 +1,11 @@
+#ifndef VIDEO_SUBR_H
+#define VIDEO_SUBR_H
+
+void video_tx_byte(unsigned char byte);
+void vga_load_regs(void);
+void vga_set_amode (void);
+void vga_set_gmode (void);
+void vga_font_load(unsigned char *vidmem, const unsigned char *font, int height, int num_chars);
+extern const unsigned char fontdata_8x16[];
+
+#endif /* VIDEO_SUBR_H */
Added: openbios-devel/modules/font_8x16.c
===================================================================
--- openbios-devel/modules/font_8x16.c (rev 0)
+++ openbios-devel/modules/font_8x16.c 2006-07-18 21:48:00 UTC (rev 69)
@@ -0,0 +1,4693 @@
+/**********************************************/
+/* */
+/* Font file generated by cpi2fnt */
+/* *
+ * *
+ * originally from the Linux distribution *
+ * *
+ **********************************************/
+
+
+#define FONTDATAMAX 4096
+
+const unsigned char fontdata_8x16[FONTDATAMAX] = {
+
+ /* 0 0x00 '^@' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 1 0x01 '^A' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7e, /* 01111110 */
+ 0x81, /* 10000001 */
+ 0xa5, /* 10100101 */
+ 0x81, /* 10000001 */
+ 0x81, /* 10000001 */
+ 0xbd, /* 10111101 */
+ 0x99, /* 10011001 */
+ 0x81, /* 10000001 */
+ 0x81, /* 10000001 */
+ 0x7e, /* 01111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 2 0x02 '^B' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7e, /* 01111110 */
+ 0xff, /* 11111111 */
+ 0xdb, /* 11011011 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xc3, /* 11000011 */
+ 0xe7, /* 11100111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0x7e, /* 01111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 3 0x03 '^C' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x6c, /* 01101100 */
+ 0xfe, /* 11111110 */
+ 0xfe, /* 11111110 */
+ 0xfe, /* 11111110 */
+ 0xfe, /* 11111110 */
+ 0x7c, /* 01111100 */
+ 0x38, /* 00111000 */
+ 0x10, /* 00010000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 4 0x04 '^D' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x10, /* 00010000 */
+ 0x38, /* 00111000 */
+ 0x7c, /* 01111100 */
+ 0xfe, /* 11111110 */
+ 0x7c, /* 01111100 */
+ 0x38, /* 00111000 */
+ 0x10, /* 00010000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 5 0x05 '^E' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x3c, /* 00111100 */
+ 0x3c, /* 00111100 */
+ 0xe7, /* 11100111 */
+ 0xe7, /* 11100111 */
+ 0xe7, /* 11100111 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x3c, /* 00111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 6 0x06 '^F' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x3c, /* 00111100 */
+ 0x7e, /* 01111110 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0x7e, /* 01111110 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x3c, /* 00111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 7 0x07 '^G' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x3c, /* 00111100 */
+ 0x3c, /* 00111100 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 8 0x08 '^H' */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xe7, /* 11100111 */
+ 0xc3, /* 11000011 */
+ 0xc3, /* 11000011 */
+ 0xe7, /* 11100111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+
+ /* 9 0x09 '^I' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x3c, /* 00111100 */
+ 0x66, /* 01100110 */
+ 0x42, /* 01000010 */
+ 0x42, /* 01000010 */
+ 0x66, /* 01100110 */
+ 0x3c, /* 00111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 10 0x0a '^J' */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xc3, /* 11000011 */
+ 0x99, /* 10011001 */
+ 0xbd, /* 10111101 */
+ 0xbd, /* 10111101 */
+ 0x99, /* 10011001 */
+ 0xc3, /* 11000011 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+
+ /* 11 0x0b '^K' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x1e, /* 00011110 */
+ 0x0e, /* 00001110 */
+ 0x1a, /* 00011010 */
+ 0x32, /* 00110010 */
+ 0x78, /* 01111000 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0x78, /* 01111000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 12 0x0c '^L' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x3c, /* 00111100 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x3c, /* 00111100 */
+ 0x18, /* 00011000 */
+ 0x7e, /* 01111110 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 13 0x0d '^M' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x3f, /* 00111111 */
+ 0x33, /* 00110011 */
+ 0x3f, /* 00111111 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x70, /* 01110000 */
+ 0xf0, /* 11110000 */
+ 0xe0, /* 11100000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 14 0x0e '^N' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7f, /* 01111111 */
+ 0x63, /* 01100011 */
+ 0x7f, /* 01111111 */
+ 0x63, /* 01100011 */
+ 0x63, /* 01100011 */
+ 0x63, /* 01100011 */
+ 0x63, /* 01100011 */
+ 0x67, /* 01100111 */
+ 0xe7, /* 11100111 */
+ 0xe6, /* 11100110 */
+ 0xc0, /* 11000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 15 0x0f '^O' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0xdb, /* 11011011 */
+ 0x3c, /* 00111100 */
+ 0xe7, /* 11100111 */
+ 0x3c, /* 00111100 */
+ 0xdb, /* 11011011 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 16 0x10 '^P' */
+ 0x00, /* 00000000 */
+ 0x80, /* 10000000 */
+ 0xc0, /* 11000000 */
+ 0xe0, /* 11100000 */
+ 0xf0, /* 11110000 */
+ 0xf8, /* 11111000 */
+ 0xfe, /* 11111110 */
+ 0xf8, /* 11111000 */
+ 0xf0, /* 11110000 */
+ 0xe0, /* 11100000 */
+ 0xc0, /* 11000000 */
+ 0x80, /* 10000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 17 0x11 '^Q' */
+ 0x00, /* 00000000 */
+ 0x02, /* 00000010 */
+ 0x06, /* 00000110 */
+ 0x0e, /* 00001110 */
+ 0x1e, /* 00011110 */
+ 0x3e, /* 00111110 */
+ 0xfe, /* 11111110 */
+ 0x3e, /* 00111110 */
+ 0x1e, /* 00011110 */
+ 0x0e, /* 00001110 */
+ 0x06, /* 00000110 */
+ 0x02, /* 00000010 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 18 0x12 '^R' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x3c, /* 00111100 */
+ 0x7e, /* 01111110 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x7e, /* 01111110 */
+ 0x3c, /* 00111100 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 19 0x13 '^S' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x00, /* 00000000 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 20 0x14 '^T' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7f, /* 01111111 */
+ 0xdb, /* 11011011 */
+ 0xdb, /* 11011011 */
+ 0xdb, /* 11011011 */
+ 0x7b, /* 01111011 */
+ 0x1b, /* 00011011 */
+ 0x1b, /* 00011011 */
+ 0x1b, /* 00011011 */
+ 0x1b, /* 00011011 */
+ 0x1b, /* 00011011 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 21 0x15 '^U' */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0x60, /* 01100000 */
+ 0x38, /* 00111000 */
+ 0x6c, /* 01101100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x6c, /* 01101100 */
+ 0x38, /* 00111000 */
+ 0x0c, /* 00001100 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 22 0x16 '^V' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfe, /* 11111110 */
+ 0xfe, /* 11111110 */
+ 0xfe, /* 11111110 */
+ 0xfe, /* 11111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 23 0x17 '^W' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x3c, /* 00111100 */
+ 0x7e, /* 01111110 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x7e, /* 01111110 */
+ 0x3c, /* 00111100 */
+ 0x18, /* 00011000 */
+ 0x7e, /* 01111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 24 0x18 '^X' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x3c, /* 00111100 */
+ 0x7e, /* 01111110 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 25 0x19 '^Y' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x7e, /* 01111110 */
+ 0x3c, /* 00111100 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 26 0x1a '^Z' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x0c, /* 00001100 */
+ 0xfe, /* 11111110 */
+ 0x0c, /* 00001100 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 27 0x1b '^[' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x30, /* 00110000 */
+ 0x60, /* 01100000 */
+ 0xfe, /* 11111110 */
+ 0x60, /* 01100000 */
+ 0x30, /* 00110000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 28 0x1c '^\' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xfe, /* 11111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 29 0x1d '^]' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x28, /* 00101000 */
+ 0x6c, /* 01101100 */
+ 0xfe, /* 11111110 */
+ 0x6c, /* 01101100 */
+ 0x28, /* 00101000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 30 0x1e '^^' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x10, /* 00010000 */
+ 0x38, /* 00111000 */
+ 0x38, /* 00111000 */
+ 0x7c, /* 01111100 */
+ 0x7c, /* 01111100 */
+ 0xfe, /* 11111110 */
+ 0xfe, /* 11111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 31 0x1f '^_' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfe, /* 11111110 */
+ 0xfe, /* 11111110 */
+ 0x7c, /* 01111100 */
+ 0x7c, /* 01111100 */
+ 0x38, /* 00111000 */
+ 0x38, /* 00111000 */
+ 0x10, /* 00010000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 32 0x20 ' ' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 33 0x21 '!' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x3c, /* 00111100 */
+ 0x3c, /* 00111100 */
+ 0x3c, /* 00111100 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 34 0x22 '"' */
+ 0x00, /* 00000000 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x24, /* 00100100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 35 0x23 '#' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x6c, /* 01101100 */
+ 0x6c, /* 01101100 */
+ 0xfe, /* 11111110 */
+ 0x6c, /* 01101100 */
+ 0x6c, /* 01101100 */
+ 0x6c, /* 01101100 */
+ 0xfe, /* 11111110 */
+ 0x6c, /* 01101100 */
+ 0x6c, /* 01101100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 36 0x24 '$' */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xc2, /* 11000010 */
+ 0xc0, /* 11000000 */
+ 0x7c, /* 01111100 */
+ 0x06, /* 00000110 */
+ 0x06, /* 00000110 */
+ 0x86, /* 10000110 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 37 0x25 '%' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xc2, /* 11000010 */
+ 0xc6, /* 11000110 */
+ 0x0c, /* 00001100 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x60, /* 01100000 */
+ 0xc6, /* 11000110 */
+ 0x86, /* 10000110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 38 0x26 '&' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x38, /* 00111000 */
+ 0x6c, /* 01101100 */
+ 0x6c, /* 01101100 */
+ 0x38, /* 00111000 */
+ 0x76, /* 01110110 */
+ 0xdc, /* 11011100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0x76, /* 01110110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 39 0x27 ''' */
+ 0x00, /* 00000000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x60, /* 01100000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 40 0x28 '(' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x0c, /* 00001100 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x18, /* 00011000 */
+ 0x0c, /* 00001100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 41 0x29 ')' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x30, /* 00110000 */
+ 0x18, /* 00011000 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 42 0x2a '*' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x66, /* 01100110 */
+ 0x3c, /* 00111100 */
+ 0xff, /* 11111111 */
+ 0x3c, /* 00111100 */
+ 0x66, /* 01100110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 43 0x2b '+' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x7e, /* 01111110 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 44 0x2c ',' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 45 0x2d '-' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfe, /* 11111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 46 0x2e '.' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 47 0x2f '/' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x02, /* 00000010 */
+ 0x06, /* 00000110 */
+ 0x0c, /* 00001100 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x60, /* 01100000 */
+ 0xc0, /* 11000000 */
+ 0x80, /* 10000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 48 0x30 '0' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x38, /* 00111000 */
+ 0x6c, /* 01101100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xd6, /* 11010110 */
+ 0xd6, /* 11010110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x6c, /* 01101100 */
+ 0x38, /* 00111000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 49 0x31 '1' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x38, /* 00111000 */
+ 0x78, /* 01111000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x7e, /* 01111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 50 0x32 '2' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0x06, /* 00000110 */
+ 0x0c, /* 00001100 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x60, /* 01100000 */
+ 0xc0, /* 11000000 */
+ 0xc6, /* 11000110 */
+ 0xfe, /* 11111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 51 0x33 '3' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0x06, /* 00000110 */
+ 0x06, /* 00000110 */
+ 0x3c, /* 00111100 */
+ 0x06, /* 00000110 */
+ 0x06, /* 00000110 */
+ 0x06, /* 00000110 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 52 0x34 '4' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x0c, /* 00001100 */
+ 0x1c, /* 00011100 */
+ 0x3c, /* 00111100 */
+ 0x6c, /* 01101100 */
+ 0xcc, /* 11001100 */
+ 0xfe, /* 11111110 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x1e, /* 00011110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 53 0x35 '5' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfe, /* 11111110 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xfc, /* 11111100 */
+ 0x06, /* 00000110 */
+ 0x06, /* 00000110 */
+ 0x06, /* 00000110 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 54 0x36 '6' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x38, /* 00111000 */
+ 0x60, /* 01100000 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xfc, /* 11111100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 55 0x37 '7' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfe, /* 11111110 */
+ 0xc6, /* 11000110 */
+ 0x06, /* 00000110 */
+ 0x06, /* 00000110 */
+ 0x0c, /* 00001100 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 56 0x38 '8' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 57 0x39 '9' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x7e, /* 01111110 */
+ 0x06, /* 00000110 */
+ 0x06, /* 00000110 */
+ 0x06, /* 00000110 */
+ 0x0c, /* 00001100 */
+ 0x78, /* 01111000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 58 0x3a ':' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 59 0x3b ';' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 60 0x3c '<' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x06, /* 00000110 */
+ 0x0c, /* 00001100 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x60, /* 01100000 */
+ 0x30, /* 00110000 */
+ 0x18, /* 00011000 */
+ 0x0c, /* 00001100 */
+ 0x06, /* 00000110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 61 0x3d '=' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7e, /* 01111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7e, /* 01111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 62 0x3e '>' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x60, /* 01100000 */
+ 0x30, /* 00110000 */
+ 0x18, /* 00011000 */
+ 0x0c, /* 00001100 */
+ 0x06, /* 00000110 */
+ 0x0c, /* 00001100 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x60, /* 01100000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 63 0x3f '?' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x0c, /* 00001100 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 64 0x40 '@' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xde, /* 11011110 */
+ 0xde, /* 11011110 */
+ 0xde, /* 11011110 */
+ 0xdc, /* 11011100 */
+ 0xc0, /* 11000000 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 65 0x41 'A' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x10, /* 00010000 */
+ 0x38, /* 00111000 */
+ 0x6c, /* 01101100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xfe, /* 11111110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 66 0x42 'B' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfc, /* 11111100 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x7c, /* 01111100 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0xfc, /* 11111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 67 0x43 'C' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x3c, /* 00111100 */
+ 0x66, /* 01100110 */
+ 0xc2, /* 11000010 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc2, /* 11000010 */
+ 0x66, /* 01100110 */
+ 0x3c, /* 00111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 68 0x44 'D' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xf8, /* 11111000 */
+ 0x6c, /* 01101100 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x6c, /* 01101100 */
+ 0xf8, /* 11111000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 69 0x45 'E' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfe, /* 11111110 */
+ 0x66, /* 01100110 */
+ 0x62, /* 01100010 */
+ 0x68, /* 01101000 */
+ 0x78, /* 01111000 */
+ 0x68, /* 01101000 */
+ 0x60, /* 01100000 */
+ 0x62, /* 01100010 */
+ 0x66, /* 01100110 */
+ 0xfe, /* 11111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 70 0x46 'F' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfe, /* 11111110 */
+ 0x66, /* 01100110 */
+ 0x62, /* 01100010 */
+ 0x68, /* 01101000 */
+ 0x78, /* 01111000 */
+ 0x68, /* 01101000 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0xf0, /* 11110000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 71 0x47 'G' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x3c, /* 00111100 */
+ 0x66, /* 01100110 */
+ 0xc2, /* 11000010 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xde, /* 11011110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x66, /* 01100110 */
+ 0x3a, /* 00111010 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 72 0x48 'H' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xfe, /* 11111110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 73 0x49 'I' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x3c, /* 00111100 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x3c, /* 00111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 74 0x4a 'J' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x1e, /* 00011110 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0x78, /* 01111000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 75 0x4b 'K' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xe6, /* 11100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x6c, /* 01101100 */
+ 0x78, /* 01111000 */
+ 0x78, /* 01111000 */
+ 0x6c, /* 01101100 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0xe6, /* 11100110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 76 0x4c 'L' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xf0, /* 11110000 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0x62, /* 01100010 */
+ 0x66, /* 01100110 */
+ 0xfe, /* 11111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 77 0x4d 'M' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xc6, /* 11000110 */
+ 0xee, /* 11101110 */
+ 0xfe, /* 11111110 */
+ 0xfe, /* 11111110 */
+ 0xd6, /* 11010110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 78 0x4e 'N' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xc6, /* 11000110 */
+ 0xe6, /* 11100110 */
+ 0xf6, /* 11110110 */
+ 0xfe, /* 11111110 */
+ 0xde, /* 11011110 */
+ 0xce, /* 11001110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 79 0x4f 'O' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 80 0x50 'P' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfc, /* 11111100 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x7c, /* 01111100 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0xf0, /* 11110000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 81 0x51 'Q' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xd6, /* 11010110 */
+ 0xde, /* 11011110 */
+ 0x7c, /* 01111100 */
+ 0x0c, /* 00001100 */
+ 0x0e, /* 00001110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 82 0x52 'R' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfc, /* 11111100 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x7c, /* 01111100 */
+ 0x6c, /* 01101100 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0xe6, /* 11100110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 83 0x53 'S' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x60, /* 01100000 */
+ 0x38, /* 00111000 */
+ 0x0c, /* 00001100 */
+ 0x06, /* 00000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 84 0x54 'T' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7e, /* 01111110 */
+ 0x7e, /* 01111110 */
+ 0x5a, /* 01011010 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x3c, /* 00111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 85 0x55 'U' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 86 0x56 'V' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x6c, /* 01101100 */
+ 0x38, /* 00111000 */
+ 0x10, /* 00010000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 87 0x57 'W' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xd6, /* 11010110 */
+ 0xd6, /* 11010110 */
+ 0xd6, /* 11010110 */
+ 0xfe, /* 11111110 */
+ 0xee, /* 11101110 */
+ 0x6c, /* 01101100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 88 0x58 'X' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x6c, /* 01101100 */
+ 0x7c, /* 01111100 */
+ 0x38, /* 00111000 */
+ 0x38, /* 00111000 */
+ 0x7c, /* 01111100 */
+ 0x6c, /* 01101100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 89 0x59 'Y' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x3c, /* 00111100 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x3c, /* 00111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 90 0x5a 'Z' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfe, /* 11111110 */
+ 0xc6, /* 11000110 */
+ 0x86, /* 10000110 */
+ 0x0c, /* 00001100 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x60, /* 01100000 */
+ 0xc2, /* 11000010 */
+ 0xc6, /* 11000110 */
+ 0xfe, /* 11111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 91 0x5b '[' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x3c, /* 00111100 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x3c, /* 00111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 92 0x5c '\' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x80, /* 10000000 */
+ 0xc0, /* 11000000 */
+ 0xe0, /* 11100000 */
+ 0x70, /* 01110000 */
+ 0x38, /* 00111000 */
+ 0x1c, /* 00011100 */
+ 0x0e, /* 00001110 */
+ 0x06, /* 00000110 */
+ 0x02, /* 00000010 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 93 0x5d ']' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x3c, /* 00111100 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x3c, /* 00111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 94 0x5e '^' */
+ 0x10, /* 00010000 */
+ 0x38, /* 00111000 */
+ 0x6c, /* 01101100 */
+ 0xc6, /* 11000110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 95 0x5f '_' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xff, /* 11111111 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 96 0x60 '`' */
+ 0x00, /* 00000000 */
+ 0x30, /* 00110000 */
+ 0x18, /* 00011000 */
+ 0x0c, /* 00001100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 97 0x61 'a' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x78, /* 01111000 */
+ 0x0c, /* 00001100 */
+ 0x7c, /* 01111100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0x76, /* 01110110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 98 0x62 'b' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xe0, /* 11100000 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0x78, /* 01111000 */
+ 0x6c, /* 01101100 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 99 0x63 'c' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 100 0x64 'd' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x1c, /* 00011100 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x3c, /* 00111100 */
+ 0x6c, /* 01101100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0x76, /* 01110110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 101 0x65 'e' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xfe, /* 11111110 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 102 0x66 'f' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x1c, /* 00011100 */
+ 0x36, /* 00110110 */
+ 0x32, /* 00110010 */
+ 0x30, /* 00110000 */
+ 0x78, /* 01111000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x78, /* 01111000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 103 0x67 'g' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x76, /* 01110110 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0x7c, /* 01111100 */
+ 0x0c, /* 00001100 */
+ 0xcc, /* 11001100 */
+ 0x78, /* 01111000 */
+ 0x00, /* 00000000 */
+
+ /* 104 0x68 'h' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xe0, /* 11100000 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0x6c, /* 01101100 */
+ 0x76, /* 01110110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0xe6, /* 11100110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 105 0x69 'i' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x38, /* 00111000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x3c, /* 00111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 106 0x6a 'j' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x06, /* 00000110 */
+ 0x06, /* 00000110 */
+ 0x00, /* 00000000 */
+ 0x0e, /* 00001110 */
+ 0x06, /* 00000110 */
+ 0x06, /* 00000110 */
+ 0x06, /* 00000110 */
+ 0x06, /* 00000110 */
+ 0x06, /* 00000110 */
+ 0x06, /* 00000110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x3c, /* 00111100 */
+ 0x00, /* 00000000 */
+
+ /* 107 0x6b 'k' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xe0, /* 11100000 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0x66, /* 01100110 */
+ 0x6c, /* 01101100 */
+ 0x78, /* 01111000 */
+ 0x78, /* 01111000 */
+ 0x6c, /* 01101100 */
+ 0x66, /* 01100110 */
+ 0xe6, /* 11100110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 108 0x6c 'l' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x38, /* 00111000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x3c, /* 00111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 109 0x6d 'm' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xec, /* 11101100 */
+ 0xfe, /* 11111110 */
+ 0xd6, /* 11010110 */
+ 0xd6, /* 11010110 */
+ 0xd6, /* 11010110 */
+ 0xd6, /* 11010110 */
+ 0xc6, /* 11000110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 110 0x6e 'n' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xdc, /* 11011100 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 111 0x6f 'o' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 112 0x70 'p' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xdc, /* 11011100 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x7c, /* 01111100 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0xf0, /* 11110000 */
+ 0x00, /* 00000000 */
+
+ /* 113 0x71 'q' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x76, /* 01110110 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0x7c, /* 01111100 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x1e, /* 00011110 */
+ 0x00, /* 00000000 */
+
+ /* 114 0x72 'r' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xdc, /* 11011100 */
+ 0x76, /* 01110110 */
+ 0x66, /* 01100110 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0xf0, /* 11110000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 115 0x73 's' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0x60, /* 01100000 */
+ 0x38, /* 00111000 */
+ 0x0c, /* 00001100 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 116 0x74 't' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x10, /* 00010000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0xfc, /* 11111100 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x36, /* 00110110 */
+ 0x1c, /* 00011100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 117 0x75 'u' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0x76, /* 01110110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 118 0x76 'v' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x6c, /* 01101100 */
+ 0x38, /* 00111000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 119 0x77 'w' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xd6, /* 11010110 */
+ 0xd6, /* 11010110 */
+ 0xd6, /* 11010110 */
+ 0xfe, /* 11111110 */
+ 0x6c, /* 01101100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 120 0x78 'x' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xc6, /* 11000110 */
+ 0x6c, /* 01101100 */
+ 0x38, /* 00111000 */
+ 0x38, /* 00111000 */
+ 0x38, /* 00111000 */
+ 0x6c, /* 01101100 */
+ 0xc6, /* 11000110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 121 0x79 'y' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x7e, /* 01111110 */
+ 0x06, /* 00000110 */
+ 0x0c, /* 00001100 */
+ 0xf8, /* 11111000 */
+ 0x00, /* 00000000 */
+
+ /* 122 0x7a 'z' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfe, /* 11111110 */
+ 0xcc, /* 11001100 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x60, /* 01100000 */
+ 0xc6, /* 11000110 */
+ 0xfe, /* 11111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 123 0x7b '{' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x0e, /* 00001110 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x70, /* 01110000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x0e, /* 00001110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 124 0x7c '|' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 125 0x7d '}' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x70, /* 01110000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x0e, /* 00001110 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x70, /* 01110000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 126 0x7e '~' */
+ 0x00, /* 00000000 */
+ 0x76, /* 01110110 */
+ 0xdc, /* 11011100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 127 0x7f '' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x10, /* 00010000 */
+ 0x38, /* 00111000 */
+ 0x6c, /* 01101100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xfe, /* 11111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 128 0x80 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x3c, /* 00111100 */
+ 0x66, /* 01100110 */
+ 0xc2, /* 11000010 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc2, /* 11000010 */
+ 0x66, /* 01100110 */
+ 0x3c, /* 00111100 */
+ 0x18, /* 00011000 */
+ 0x70, /* 01110000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 129 0x81 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xcc, /* 11001100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0x76, /* 01110110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 130 0x82 '�' */
+ 0x00, /* 00000000 */
+ 0x0c, /* 00001100 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xfe, /* 11111110 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 131 0x83 '�' */
+ 0x00, /* 00000000 */
+ 0x10, /* 00010000 */
+ 0x38, /* 00111000 */
+ 0x6c, /* 01101100 */
+ 0x00, /* 00000000 */
+ 0x78, /* 01111000 */
+ 0x0c, /* 00001100 */
+ 0x7c, /* 01111100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0x76, /* 01110110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 132 0x84 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xcc, /* 11001100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x78, /* 01111000 */
+ 0x0c, /* 00001100 */
+ 0x7c, /* 01111100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0x76, /* 01110110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 133 0x85 '�' */
+ 0x00, /* 00000000 */
+ 0x60, /* 01100000 */
+ 0x30, /* 00110000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x78, /* 01111000 */
+ 0x0c, /* 00001100 */
+ 0x7c, /* 01111100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0x76, /* 01110110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 134 0x86 '�' */
+ 0x00, /* 00000000 */
+ 0x38, /* 00111000 */
+ 0x6c, /* 01101100 */
+ 0x38, /* 00111000 */
+ 0x00, /* 00000000 */
+ 0x78, /* 01111000 */
+ 0x0c, /* 00001100 */
+ 0x7c, /* 01111100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0x76, /* 01110110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 135 0x87 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x18, /* 00011000 */
+ 0x70, /* 01110000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 136 0x88 '�' */
+ 0x00, /* 00000000 */
+ 0x10, /* 00010000 */
+ 0x38, /* 00111000 */
+ 0x6c, /* 01101100 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xfe, /* 11111110 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 137 0x89 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xc6, /* 11000110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xfe, /* 11111110 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 138 0x8a '�' */
+ 0x00, /* 00000000 */
+ 0x60, /* 01100000 */
+ 0x30, /* 00110000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xfe, /* 11111110 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 139 0x8b '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x66, /* 01100110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x38, /* 00111000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x3c, /* 00111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 140 0x8c '�' */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x3c, /* 00111100 */
+ 0x66, /* 01100110 */
+ 0x00, /* 00000000 */
+ 0x38, /* 00111000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x3c, /* 00111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 141 0x8d '�' */
+ 0x00, /* 00000000 */
+ 0x60, /* 01100000 */
+ 0x30, /* 00110000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x38, /* 00111000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x3c, /* 00111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 142 0x8e '�' */
+ 0x00, /* 00000000 */
+ 0xc6, /* 11000110 */
+ 0x00, /* 00000000 */
+ 0x10, /* 00010000 */
+ 0x38, /* 00111000 */
+ 0x6c, /* 01101100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xfe, /* 11111110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 143 0x8f '�' */
+ 0x38, /* 00111000 */
+ 0x6c, /* 01101100 */
+ 0x38, /* 00111000 */
+ 0x10, /* 00010000 */
+ 0x38, /* 00111000 */
+ 0x6c, /* 01101100 */
+ 0xc6, /* 11000110 */
+ 0xfe, /* 11111110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 144 0x90 '�' */
+ 0x0c, /* 00001100 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0xfe, /* 11111110 */
+ 0x66, /* 01100110 */
+ 0x62, /* 01100010 */
+ 0x68, /* 01101000 */
+ 0x78, /* 01111000 */
+ 0x68, /* 01101000 */
+ 0x62, /* 01100010 */
+ 0x66, /* 01100110 */
+ 0xfe, /* 11111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 145 0x91 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xec, /* 11101100 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x7e, /* 01111110 */
+ 0xd8, /* 11011000 */
+ 0xd8, /* 11011000 */
+ 0x6e, /* 01101110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 146 0x92 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x3e, /* 00111110 */
+ 0x6c, /* 01101100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xfe, /* 11111110 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xce, /* 11001110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 147 0x93 '�' */
+ 0x00, /* 00000000 */
+ 0x10, /* 00010000 */
+ 0x38, /* 00111000 */
+ 0x6c, /* 01101100 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 148 0x94 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xc6, /* 11000110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 149 0x95 '�' */
+ 0x00, /* 00000000 */
+ 0x60, /* 01100000 */
+ 0x30, /* 00110000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 150 0x96 '�' */
+ 0x00, /* 00000000 */
+ 0x30, /* 00110000 */
+ 0x78, /* 01111000 */
+ 0xcc, /* 11001100 */
+ 0x00, /* 00000000 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0x76, /* 01110110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 151 0x97 '�' */
+ 0x00, /* 00000000 */
+ 0x60, /* 01100000 */
+ 0x30, /* 00110000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0x76, /* 01110110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 152 0x98 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xc6, /* 11000110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x7e, /* 01111110 */
+ 0x06, /* 00000110 */
+ 0x0c, /* 00001100 */
+ 0x78, /* 01111000 */
+ 0x00, /* 00000000 */
+
+ /* 153 0x99 '�' */
+ 0x00, /* 00000000 */
+ 0xc6, /* 11000110 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 154 0x9a '�' */
+ 0x00, /* 00000000 */
+ 0xc6, /* 11000110 */
+ 0x00, /* 00000000 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 155 0x9b '�' */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 156 0x9c '�' */
+ 0x00, /* 00000000 */
+ 0x38, /* 00111000 */
+ 0x6c, /* 01101100 */
+ 0x64, /* 01100100 */
+ 0x60, /* 01100000 */
+ 0xf0, /* 11110000 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0xe6, /* 11100110 */
+ 0xfc, /* 11111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 157 0x9d '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x3c, /* 00111100 */
+ 0x18, /* 00011000 */
+ 0x7e, /* 01111110 */
+ 0x18, /* 00011000 */
+ 0x7e, /* 01111110 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 158 0x9e '�' */
+ 0x00, /* 00000000 */
+ 0xf8, /* 11111000 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xf8, /* 11111000 */
+ 0xc4, /* 11000100 */
+ 0xcc, /* 11001100 */
+ 0xde, /* 11011110 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xc6, /* 11000110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 159 0x9f '�' */
+ 0x00, /* 00000000 */
+ 0x0e, /* 00001110 */
+ 0x1b, /* 00011011 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x7e, /* 01111110 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0xd8, /* 11011000 */
+ 0x70, /* 01110000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 160 0xa0 '�' */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x60, /* 01100000 */
+ 0x00, /* 00000000 */
+ 0x78, /* 01111000 */
+ 0x0c, /* 00001100 */
+ 0x7c, /* 01111100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0x76, /* 01110110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 161 0xa1 '�' */
+ 0x00, /* 00000000 */
+ 0x0c, /* 00001100 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x00, /* 00000000 */
+ 0x38, /* 00111000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x3c, /* 00111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 162 0xa2 '�' */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x60, /* 01100000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 163 0xa3 '�' */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x60, /* 01100000 */
+ 0x00, /* 00000000 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0x76, /* 01110110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 164 0xa4 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x76, /* 01110110 */
+ 0xdc, /* 11011100 */
+ 0x00, /* 00000000 */
+ 0xdc, /* 11011100 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 165 0xa5 '�' */
+ 0x76, /* 01110110 */
+ 0xdc, /* 11011100 */
+ 0x00, /* 00000000 */
+ 0xc6, /* 11000110 */
+ 0xe6, /* 11100110 */
+ 0xf6, /* 11110110 */
+ 0xfe, /* 11111110 */
+ 0xde, /* 11011110 */
+ 0xce, /* 11001110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 166 0xa6 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x3c, /* 00111100 */
+ 0x6c, /* 01101100 */
+ 0x6c, /* 01101100 */
+ 0x3e, /* 00111110 */
+ 0x00, /* 00000000 */
+ 0x7e, /* 01111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 167 0xa7 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x38, /* 00111000 */
+ 0x6c, /* 01101100 */
+ 0x6c, /* 01101100 */
+ 0x38, /* 00111000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 168 0xa8 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x00, /* 00000000 */
+ 0x30, /* 00110000 */
+ 0x30, /* 00110000 */
+ 0x60, /* 01100000 */
+ 0xc0, /* 11000000 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x7c, /* 01111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 169 0xa9 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfe, /* 11111110 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 170 0xaa '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfe, /* 11111110 */
+ 0x06, /* 00000110 */
+ 0x06, /* 00000110 */
+ 0x06, /* 00000110 */
+ 0x06, /* 00000110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 171 0xab '�' */
+ 0x00, /* 00000000 */
+ 0x60, /* 01100000 */
+ 0xe0, /* 11100000 */
+ 0x62, /* 01100010 */
+ 0x66, /* 01100110 */
+ 0x6c, /* 01101100 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x60, /* 01100000 */
+ 0xdc, /* 11011100 */
+ 0x86, /* 10000110 */
+ 0x0c, /* 00001100 */
+ 0x18, /* 00011000 */
+ 0x3e, /* 00111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 172 0xac '�' */
+ 0x00, /* 00000000 */
+ 0x60, /* 01100000 */
+ 0xe0, /* 11100000 */
+ 0x62, /* 01100010 */
+ 0x66, /* 01100110 */
+ 0x6c, /* 01101100 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x66, /* 01100110 */
+ 0xce, /* 11001110 */
+ 0x9a, /* 10011010 */
+ 0x3f, /* 00111111 */
+ 0x06, /* 00000110 */
+ 0x06, /* 00000110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 173 0xad '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x3c, /* 00111100 */
+ 0x3c, /* 00111100 */
+ 0x3c, /* 00111100 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 174 0xae '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x36, /* 00110110 */
+ 0x6c, /* 01101100 */
+ 0xd8, /* 11011000 */
+ 0x6c, /* 01101100 */
+ 0x36, /* 00110110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 175 0xaf '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xd8, /* 11011000 */
+ 0x6c, /* 01101100 */
+ 0x36, /* 00110110 */
+ 0x6c, /* 01101100 */
+ 0xd8, /* 11011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 176 0xb0 '�' */
+ 0x11, /* 00010001 */
+ 0x44, /* 01000100 */
+ 0x11, /* 00010001 */
+ 0x44, /* 01000100 */
+ 0x11, /* 00010001 */
+ 0x44, /* 01000100 */
+ 0x11, /* 00010001 */
+ 0x44, /* 01000100 */
+ 0x11, /* 00010001 */
+ 0x44, /* 01000100 */
+ 0x11, /* 00010001 */
+ 0x44, /* 01000100 */
+ 0x11, /* 00010001 */
+ 0x44, /* 01000100 */
+ 0x11, /* 00010001 */
+ 0x44, /* 01000100 */
+
+ /* 177 0xb1 '�' */
+ 0x55, /* 01010101 */
+ 0xaa, /* 10101010 */
+ 0x55, /* 01010101 */
+ 0xaa, /* 10101010 */
+ 0x55, /* 01010101 */
+ 0xaa, /* 10101010 */
+ 0x55, /* 01010101 */
+ 0xaa, /* 10101010 */
+ 0x55, /* 01010101 */
+ 0xaa, /* 10101010 */
+ 0x55, /* 01010101 */
+ 0xaa, /* 10101010 */
+ 0x55, /* 01010101 */
+ 0xaa, /* 10101010 */
+ 0x55, /* 01010101 */
+ 0xaa, /* 10101010 */
+
+ /* 178 0xb2 '�' */
+ 0xdd, /* 11011101 */
+ 0x77, /* 01110111 */
+ 0xdd, /* 11011101 */
+ 0x77, /* 01110111 */
+ 0xdd, /* 11011101 */
+ 0x77, /* 01110111 */
+ 0xdd, /* 11011101 */
+ 0x77, /* 01110111 */
+ 0xdd, /* 11011101 */
+ 0x77, /* 01110111 */
+ 0xdd, /* 11011101 */
+ 0x77, /* 01110111 */
+ 0xdd, /* 11011101 */
+ 0x77, /* 01110111 */
+ 0xdd, /* 11011101 */
+ 0x77, /* 01110111 */
+
+ /* 179 0xb3 '�' */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+
+ /* 180 0xb4 '�' */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0xf8, /* 11111000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+
+ /* 181 0xb5 '�' */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0xf8, /* 11111000 */
+ 0x18, /* 00011000 */
+ 0xf8, /* 11111000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+
+ /* 182 0xb6 '�' */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0xf6, /* 11110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+
+ /* 183 0xb7 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfe, /* 11111110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+
+ /* 184 0xb8 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xf8, /* 11111000 */
+ 0x18, /* 00011000 */
+ 0xf8, /* 11111000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+
+ /* 185 0xb9 '�' */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0xf6, /* 11110110 */
+ 0x06, /* 00000110 */
+ 0xf6, /* 11110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+
+ /* 186 0xba '�' */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+
+ /* 187 0xbb '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfe, /* 11111110 */
+ 0x06, /* 00000110 */
+ 0xf6, /* 11110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+
+ /* 188 0xbc '�' */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0xf6, /* 11110110 */
+ 0x06, /* 00000110 */
+ 0xfe, /* 11111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 189 0xbd '�' */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0xfe, /* 11111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 190 0xbe '�' */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0xf8, /* 11111000 */
+ 0x18, /* 00011000 */
+ 0xf8, /* 11111000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 191 0xbf '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xf8, /* 11111000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+
+ /* 192 0xc0 '�' */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x1f, /* 00011111 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 193 0xc1 '�' */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0xff, /* 11111111 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 194 0xc2 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xff, /* 11111111 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+
+ /* 195 0xc3 '�' */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x1f, /* 00011111 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+
+ /* 196 0xc4 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xff, /* 11111111 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 197 0xc5 '�' */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0xff, /* 11111111 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+
+ /* 198 0xc6 '�' */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x1f, /* 00011111 */
+ 0x18, /* 00011000 */
+ 0x1f, /* 00011111 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+
+ /* 199 0xc7 '�' */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x37, /* 00110111 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+
+ /* 200 0xc8 '�' */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x37, /* 00110111 */
+ 0x30, /* 00110000 */
+ 0x3f, /* 00111111 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 201 0xc9 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x3f, /* 00111111 */
+ 0x30, /* 00110000 */
+ 0x37, /* 00110111 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+
+ /* 202 0xca '�' */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0xf7, /* 11110111 */
+ 0x00, /* 00000000 */
+ 0xff, /* 11111111 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 203 0xcb '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xff, /* 11111111 */
+ 0x00, /* 00000000 */
+ 0xf7, /* 11110111 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+
+ /* 204 0xcc '�' */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x37, /* 00110111 */
+ 0x30, /* 00110000 */
+ 0x37, /* 00110111 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+
+ /* 205 0xcd '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xff, /* 11111111 */
+ 0x00, /* 00000000 */
+ 0xff, /* 11111111 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 206 0xce '�' */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0xf7, /* 11110111 */
+ 0x00, /* 00000000 */
+ 0xf7, /* 11110111 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+
+ /* 207 0xcf '�' */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0xff, /* 11111111 */
+ 0x00, /* 00000000 */
+ 0xff, /* 11111111 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 208 0xd0 '�' */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0xff, /* 11111111 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 209 0xd1 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xff, /* 11111111 */
+ 0x00, /* 00000000 */
+ 0xff, /* 11111111 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+
+ /* 210 0xd2 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xff, /* 11111111 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+
+ /* 211 0xd3 '�' */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x3f, /* 00111111 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 212 0xd4 '�' */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x1f, /* 00011111 */
+ 0x18, /* 00011000 */
+ 0x1f, /* 00011111 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 213 0xd5 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x1f, /* 00011111 */
+ 0x18, /* 00011000 */
+ 0x1f, /* 00011111 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+
+ /* 214 0xd6 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x3f, /* 00111111 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+
+ /* 215 0xd7 '�' */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0xff, /* 11111111 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+
+ /* 216 0xd8 '�' */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0xff, /* 11111111 */
+ 0x18, /* 00011000 */
+ 0xff, /* 11111111 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+
+ /* 217 0xd9 '�' */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0xf8, /* 11111000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 218 0xda '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x1f, /* 00011111 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+
+ /* 219 0xdb '�' */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+
+ /* 220 0xdc '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+
+ /* 221 0xdd '�' */
+ 0xf0, /* 11110000 */
+ 0xf0, /* 11110000 */
+ 0xf0, /* 11110000 */
+ 0xf0, /* 11110000 */
+ 0xf0, /* 11110000 */
+ 0xf0, /* 11110000 */
+ 0xf0, /* 11110000 */
+ 0xf0, /* 11110000 */
+ 0xf0, /* 11110000 */
+ 0xf0, /* 11110000 */
+ 0xf0, /* 11110000 */
+ 0xf0, /* 11110000 */
+ 0xf0, /* 11110000 */
+ 0xf0, /* 11110000 */
+ 0xf0, /* 11110000 */
+ 0xf0, /* 11110000 */
+
+ /* 222 0xde '�' */
+ 0x0f, /* 00001111 */
+ 0x0f, /* 00001111 */
+ 0x0f, /* 00001111 */
+ 0x0f, /* 00001111 */
+ 0x0f, /* 00001111 */
+ 0x0f, /* 00001111 */
+ 0x0f, /* 00001111 */
+ 0x0f, /* 00001111 */
+ 0x0f, /* 00001111 */
+ 0x0f, /* 00001111 */
+ 0x0f, /* 00001111 */
+ 0x0f, /* 00001111 */
+ 0x0f, /* 00001111 */
+ 0x0f, /* 00001111 */
+ 0x0f, /* 00001111 */
+ 0x0f, /* 00001111 */
+
+ /* 223 0xdf '�' */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0xff, /* 11111111 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 224 0xe0 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x76, /* 01110110 */
+ 0xdc, /* 11011100 */
+ 0xd8, /* 11011000 */
+ 0xd8, /* 11011000 */
+ 0xd8, /* 11011000 */
+ 0xdc, /* 11011100 */
+ 0x76, /* 01110110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 225 0xe1 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x78, /* 01111000 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xcc, /* 11001100 */
+ 0xd8, /* 11011000 */
+ 0xcc, /* 11001100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xcc, /* 11001100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 226 0xe2 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfe, /* 11111110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0xc0, /* 11000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 227 0xe3 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfe, /* 11111110 */
+ 0x6c, /* 01101100 */
+ 0x6c, /* 01101100 */
+ 0x6c, /* 01101100 */
+ 0x6c, /* 01101100 */
+ 0x6c, /* 01101100 */
+ 0x6c, /* 01101100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 228 0xe4 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfe, /* 11111110 */
+ 0xc6, /* 11000110 */
+ 0x60, /* 01100000 */
+ 0x30, /* 00110000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x60, /* 01100000 */
+ 0xc6, /* 11000110 */
+ 0xfe, /* 11111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 229 0xe5 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7e, /* 01111110 */
+ 0xd8, /* 11011000 */
+ 0xd8, /* 11011000 */
+ 0xd8, /* 11011000 */
+ 0xd8, /* 11011000 */
+ 0xd8, /* 11011000 */
+ 0x70, /* 01110000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 230 0xe6 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x7c, /* 01111100 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0xc0, /* 11000000 */
+ 0x00, /* 00000000 */
+
+ /* 231 0xe7 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x76, /* 01110110 */
+ 0xdc, /* 11011100 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 232 0xe8 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7e, /* 01111110 */
+ 0x18, /* 00011000 */
+ 0x3c, /* 00111100 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x3c, /* 00111100 */
+ 0x18, /* 00011000 */
+ 0x7e, /* 01111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 233 0xe9 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x38, /* 00111000 */
+ 0x6c, /* 01101100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xfe, /* 11111110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x6c, /* 01101100 */
+ 0x38, /* 00111000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 234 0xea '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x38, /* 00111000 */
+ 0x6c, /* 01101100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x6c, /* 01101100 */
+ 0x6c, /* 01101100 */
+ 0x6c, /* 01101100 */
+ 0x6c, /* 01101100 */
+ 0xee, /* 11101110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 235 0xeb '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x1e, /* 00011110 */
+ 0x30, /* 00110000 */
+ 0x18, /* 00011000 */
+ 0x0c, /* 00001100 */
+ 0x3e, /* 00111110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x66, /* 01100110 */
+ 0x3c, /* 00111100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 236 0xec '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7e, /* 01111110 */
+ 0xdb, /* 11011011 */
+ 0xdb, /* 11011011 */
+ 0xdb, /* 11011011 */
+ 0x7e, /* 01111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 237 0xed '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x03, /* 00000011 */
+ 0x06, /* 00000110 */
+ 0x7e, /* 01111110 */
+ 0xdb, /* 11011011 */
+ 0xdb, /* 11011011 */
+ 0xf3, /* 11110011 */
+ 0x7e, /* 01111110 */
+ 0x60, /* 01100000 */
+ 0xc0, /* 11000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 238 0xee '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x1c, /* 00011100 */
+ 0x30, /* 00110000 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0x7c, /* 01111100 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0x60, /* 01100000 */
+ 0x30, /* 00110000 */
+ 0x1c, /* 00011100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 239 0xef '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7c, /* 01111100 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 240 0xf0 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfe, /* 11111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfe, /* 11111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xfe, /* 11111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 241 0xf1 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x7e, /* 01111110 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7e, /* 01111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 242 0xf2 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x30, /* 00110000 */
+ 0x18, /* 00011000 */
+ 0x0c, /* 00001100 */
+ 0x06, /* 00000110 */
+ 0x0c, /* 00001100 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x00, /* 00000000 */
+ 0x7e, /* 01111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 243 0xf3 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x0c, /* 00001100 */
+ 0x18, /* 00011000 */
+ 0x30, /* 00110000 */
+ 0x60, /* 01100000 */
+ 0x30, /* 00110000 */
+ 0x18, /* 00011000 */
+ 0x0c, /* 00001100 */
+ 0x00, /* 00000000 */
+ 0x7e, /* 01111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 244 0xf4 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x0e, /* 00001110 */
+ 0x1b, /* 00011011 */
+ 0x1b, /* 00011011 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+
+ /* 245 0xf5 '�' */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0xd8, /* 11011000 */
+ 0xd8, /* 11011000 */
+ 0xd8, /* 11011000 */
+ 0x70, /* 01110000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 246 0xf6 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x7e, /* 01111110 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 247 0xf7 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x76, /* 01110110 */
+ 0xdc, /* 11011100 */
+ 0x00, /* 00000000 */
+ 0x76, /* 01110110 */
+ 0xdc, /* 11011100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 248 0xf8 '�' */
+ 0x00, /* 00000000 */
+ 0x38, /* 00111000 */
+ 0x6c, /* 01101100 */
+ 0x6c, /* 01101100 */
+ 0x38, /* 00111000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 249 0xf9 '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 250 0xfa '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x18, /* 00011000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 251 0xfb '�' */
+ 0x00, /* 00000000 */
+ 0x0f, /* 00001111 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0x0c, /* 00001100 */
+ 0xec, /* 11101100 */
+ 0x6c, /* 01101100 */
+ 0x6c, /* 01101100 */
+ 0x3c, /* 00111100 */
+ 0x1c, /* 00011100 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 252 0xfc '�' */
+ 0x00, /* 00000000 */
+ 0x6c, /* 01101100 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x36, /* 00110110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 253 0xfd '�' */
+ 0x00, /* 00000000 */
+ 0x3c, /* 00111100 */
+ 0x66, /* 01100110 */
+ 0x0c, /* 00001100 */
+ 0x18, /* 00011000 */
+ 0x32, /* 00110010 */
+ 0x7e, /* 01111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 254 0xfe '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x7e, /* 01111110 */
+ 0x7e, /* 01111110 */
+ 0x7e, /* 01111110 */
+ 0x7e, /* 01111110 */
+ 0x7e, /* 01111110 */
+ 0x7e, /* 01111110 */
+ 0x7e, /* 01111110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+ /* 255 0xff '�' */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+
+};
+//
+// originally from the stpc web site
+//
+const unsigned char VgaLookupTable[3 * 0x3f + 3] = {
+ // Red Green Blue
+ 0x000, 0x000, 0x000, // 00h
+ 0x000, 0x000, 0x02A, // 01h
+ 0x000, 0x02A, 0x000, // 02h
+ 0x000, 0x02A, 0x02A, // 03h
+ 0x02A, 0x000, 0x000, // 04h
+ 0x02A, 0x000, 0x02A, // 05h
+ 0x02A, 0x02A, 0x000, // 06h
+ 0x02A, 0x02A, 0x02A, // 07h
+ 0x000, 0x000, 0x015, // 08h
+ 0x000, 0x000, 0x03F, // 09h
+ 0x000, 0x02A, 0x015, // 0Ah
+ 0x000, 0x02A, 0x03F, // 0Bh
+ 0x02A, 0x000, 0x015, // 0Ch
+ 0x02A, 0x000, 0x03F, // 0Dh
+ 0x02A, 0x02A, 0x015, // 0Eh
+ 0x02A, 0x02A, 0x03F, // 0Fh
+ 0x000, 0x015, 0x000, // 10h
+ 0x000, 0x015, 0x02A, // 11h
+ 0x000, 0x03F, 0x000, // 12h
+ 0x000, 0x03F, 0x02A, // 13h
+ 0x02A, 0x015, 0x000, // 14h
+ 0x02A, 0x015, 0x02A, // 15h
+ 0x02A, 0x03F, 0x000, // 16h
+ 0x02A, 0x03F, 0x02A, // 17h
+ 0x000, 0x015, 0x015, // 18h
+ 0x000, 0x015, 0x03F, // 19h
+ 0x000, 0x03F, 0x015, // 1Ah
+ 0x000, 0x03F, 0x03F, // 1Bh
+ 0x02A, 0x015, 0x015, // 1Ch
+ 0x02A, 0x015, 0x03F, // 1Dh
+ 0x02A, 0x03F, 0x015, // 1Eh
+ 0x02A, 0x03F, 0x03F, // 1Fh
+ 0x015, 0x000, 0x000, // 20h
+ 0x015, 0x000, 0x02A, // 21h
+ 0x015, 0x02A, 0x000, // 22h
+ 0x015, 0x02A, 0x02A, // 23h
+ 0x03F, 0x000, 0x000, // 24h
+ 0x03F, 0x000, 0x02A, // 25h
+ 0x03F, 0x02A, 0x000, // 26h
+ 0x03F, 0x02A, 0x02A, // 27h
+ 0x015, 0x000, 0x015, // 28h
+ 0x015, 0x000, 0x03F, // 29h
+ 0x015, 0x02A, 0x015, // 2Ah
+ 0x015, 0x02A, 0x03F, // 2Bh
+ 0x03F, 0x000, 0x015, // 2Ch
+ 0x03F, 0x000, 0x03F, // 2Dh
+ 0x03F, 0x02A, 0x015, // 2Eh
+ 0x03F, 0x02A, 0x03F, // 2Fh
+ 0x015, 0x015, 0x000, // 30h
+ 0x015, 0x015, 0x02A, // 31h
+ 0x015, 0x03F, 0x000, // 32h
+ 0x015, 0x03F, 0x02A, // 33h
+ 0x03F, 0x015, 0x000, // 34h
+ 0x03F, 0x015, 0x02A, // 35h
+ 0x03F, 0x03F, 0x000, // 36h
+ 0x03F, 0x03F, 0x02A, // 37h
+ 0x015, 0x015, 0x015, // 38h
+ 0x015, 0x015, 0x03F, // 39h
+ 0x015, 0x03F, 0x015, // 3Ah
+ 0x015, 0x03F, 0x03F, // 3Bh
+ 0x03F, 0x015, 0x015, // 3Ch
+ 0x03F, 0x015, 0x03F, // 3Dh
+ 0x03F, 0x03F, 0x015, // 3Eh
+ 0x03F, 0x03F, 0x03F, // 3Fh
+};
1
0
r68 - in openbios-devel: arch/sparc64 config/examples include/openbios include/sparc64 kernel
by svn＠openbios.org 18 Jul '06
by svn＠openbios.org 18 Jul '06
18 Jul '06
Author: stepan
Date: 2006-07-18 23:42:16 +0200 (Tue, 18 Jul 2006)
New Revision: 68
Modified:
openbios-devel/arch/sparc64/entry.S
openbios-devel/arch/sparc64/openbios.c
openbios-devel/config/examples/sparc64_rules.xml
openbios-devel/include/openbios/stack.h
openbios-devel/include/sparc64/io.h
openbios-devel/include/sparc64/pci.h
openbios-devel/include/sparc64/types.h
openbios-devel/kernel/bootstrap.c
openbios-devel/kernel/cross.h
openbios-devel/kernel/dict.c
openbios-devel/kernel/forth.c
openbios-devel/kernel/stack.c
Log:
64-bit fixes
General 64-bit fixes and a hack for x86 to Sparc64 crosscompiling problem,
where x86 misses 128-bit types.
Modified: openbios-devel/arch/sparc64/entry.S
===================================================================
--- openbios-devel/arch/sparc64/entry.S 2006-07-18 21:38:42 UTC (rev 67)
+++ openbios-devel/arch/sparc64/entry.S 2006-07-18 21:42:16 UTC (rev 68)
@@ -35,6 +35,7 @@
! Extract NWINDOWS from %ver
rdpr %ver, %g1
and %g1, 0xf, %g1
+ dec %g1
wrpr %g1, 0, %cleanwin
wrpr %g1, 0, %cansave
wrpr %g0, 0, %canrestore
@@ -102,9 +103,9 @@
bne 1b
nop
- ! setup .rodata
+ ! setup .rodata, also make .text readable
setx _data, %g7, %g5
- setx _rodata, %g7, %g4
+ setx _start, %g7, %g4
sub %g5, %g4, %g5
srlx %g5, 16, %g6 ! %g6 = # of 64k .rodata pages
set 48, %g7
Modified: openbios-devel/arch/sparc64/openbios.c
===================================================================
--- openbios-devel/arch/sparc64/openbios.c 2006-07-18 21:38:42 UTC (rev 67)
+++ openbios-devel/arch/sparc64/openbios.c 2006-07-18 21:42:16 UTC (rev 68)
@@ -49,8 +49,8 @@
* than that we have serious bloat.
*/
- PUSH((unsigned int)&_heap);
- PUSH((unsigned int)&_eheap);
+ PUSH((ucell)&_heap);
+ PUSH((ucell)&_eheap);
}
static void
@@ -128,6 +128,5 @@
#endif
enterforth((xt_t)PC);
-
return 0;
}
Modified: openbios-devel/config/examples/sparc64_rules.xml
===================================================================
--- openbios-devel/config/examples/sparc64_rules.xml 2006-07-18 21:38:42 UTC (rev 67)
+++ openbios-devel/config/examples/sparc64_rules.xml 2006-07-18 21:42:16 UTC (rev 68)
@@ -10,6 +10,9 @@
ODIR := obj-$(ARCH)
HOSTCC := gcc
HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS)
+HOSTCFLAGS+= -Wa,-xarch=v9 -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany
+HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations
+HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing
HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
CC := gcc
Modified: openbios-devel/include/openbios/stack.h
===================================================================
--- openbios-devel/include/openbios/stack.h 2006-07-18 21:38:42 UTC (rev 67)
+++ openbios-devel/include/openbios/stack.h 2006-07-18 21:42:16 UTC (rev 68)
@@ -52,15 +52,27 @@
}
static inline void DPUSH(ducell value) {
+#ifdef NEED_FAKE_INT128_T
+ dstack[++dstackcnt] = (cell) value.lo;
+ dstack[++dstackcnt] = (cell) value.hi;
+#else
dstack[++dstackcnt] = (cell) value;
dstack[++dstackcnt] = (cell) (value >> bitspercell);
+#endif
}
static inline ducell DPOP(void) {
+#ifdef NEED_FAKE_INT128_T
ducell du;
+ du.hi = (ucell) dstack[dstackcnt--];
+ du.lo = (ucell) dstack[dstackcnt--];
+ return du;
+#else
+ ducell du;
du = ((ducell) ((ucell) dstack[dstackcnt--]) << bitspercell);
du |= (ucell) dstack[dstackcnt--];
return du;
+#endif
}
static inline ucell GETTOS(void) {
Modified: openbios-devel/include/sparc64/io.h
===================================================================
--- openbios-devel/include/sparc64/io.h 2006-07-18 21:38:42 UTC (rev 67)
+++ openbios-devel/include/sparc64/io.h 2006-07-18 21:42:16 UTC (rev 68)
@@ -74,13 +74,15 @@
static inline int in_le16(volatile unsigned short *addr)
{
- int ret;
+ int ret, tmp;
// XXX
__asm__ __volatile__("lduha [%1] 0x15, %0\n\t"
:"=r"(ret):"r"(addr):"memory");
- return ret;
+ tmp = (ret << 8) & 0xff00;
+ tmp |= (ret >> 8) & 0xff;
+ return tmp;
}
static inline int in_be16(volatile unsigned short *addr)
@@ -95,9 +97,13 @@
static inline void out_le16(volatile unsigned short *addr, int val)
{
+ unsigned tmp;
+
// XXX
+ tmp = (val << 8) & 0xff00;
+ tmp |= (val >> 8) & 0xff;
__asm__ __volatile__("stha %0, [%1] 0x15\n\t"
- : : "r"(val), "r"(addr):"memory");
+ : : "r"(tmp), "r"(addr):"memory");
}
static inline void out_be16(volatile unsigned short *addr, int val)
@@ -108,13 +114,17 @@
static inline unsigned in_le32(volatile unsigned *addr)
{
- unsigned ret;
+ unsigned ret, tmp;
// XXX
__asm__ __volatile__("lduwa [%1] 0x15, %0\n\t"
:"=r"(ret):"r"(addr):"memory");
- return ret;
+ tmp = ret << 24;
+ tmp |= (ret << 8) & 0xff0000;
+ tmp |= (ret >> 8) & 0xff00;
+ tmp |= (ret >> 24) & 0xff;
+ return tmp;
}
static inline unsigned in_be32(volatile unsigned *addr)
@@ -129,9 +139,14 @@
static inline void out_le32(volatile unsigned *addr, int val)
{
+ unsigned tmp;
// XXX
+ tmp = val << 24;
+ tmp |= (val << 8) & 0xff0000;
+ tmp |= (val >> 8) & 0xff00;
+ tmp |= (val >> 24) & 0xff;
__asm__ __volatile__("stwa %0, [%1] 0x15\n\t"
- : : "r"(val), "r"(addr):"memory");
+ : : "r"(tmp), "r"(addr):"memory");
}
static inline void out_be32(volatile unsigned *addr, int val)
Modified: openbios-devel/include/sparc64/pci.h
===================================================================
--- openbios-devel/include/sparc64/pci.h 2006-07-18 21:38:42 UTC (rev 67)
+++ openbios-devel/include/sparc64/pci.h 2006-07-18 21:42:16 UTC (rev 68)
@@ -24,42 +24,43 @@
#define PCI_FN(pcidev) ((uint8_t) ((pcidev) >> 8) & 7)
#define APB_SPECIAL_BASE 0x1fe00000000ULL
-#define PCI_CONFIG (APB_SPECIAL_BASE + 0x2000)
+#define PCI_CONFIG (APB_SPECIAL_BASE + 0x1000000ULL)
+#define APB_MEM_BASE 0x1ff00000000ULL
static inline uint8_t pci_config_read8(pci_addr dev, uint8_t reg)
{
- out_be32((void *)PCI_CONFIG, dev | (reg & ~3));
- return in_8((void *)(PCI_CONFIG | (reg & 3)));
+ out_le32((void *)PCI_CONFIG, dev | (reg & ~3));
+ return in_8((void *)(APB_MEM_BASE | (reg & 3)));
}
static inline uint16_t pci_config_read16(pci_addr dev, uint8_t reg)
{
- out_be32((void *)PCI_CONFIG, dev | (reg & ~3));
- return in_be16((void *)(PCI_CONFIG | (reg & 2)));
+ out_le32((void *)PCI_CONFIG, dev | (reg & ~3));
+ return in_le16((void *)(APB_MEM_BASE | (reg & 2)));
}
static inline uint32_t pci_config_read32(pci_addr dev, uint8_t reg)
{
- out_be32((void *)PCI_CONFIG, dev | reg);
- return in_be32((void *)(PCI_CONFIG | reg));
+ out_le32((void *)PCI_CONFIG, dev | reg);
+ return in_le32((void *)(APB_MEM_BASE | reg));
}
static inline void pci_config_write8(pci_addr dev, uint8_t reg, uint8_t val)
{
- out_be32((void *)PCI_CONFIG, dev | (reg & ~3));
- out_8((void *)(PCI_CONFIG | (reg & 3)), val);
+ out_le32((void *)PCI_CONFIG, dev | (reg & ~3));
+ out_8((void *)(APB_MEM_BASE | (reg & 3)), val);
}
static inline void pci_config_write16(pci_addr dev, uint8_t reg, uint16_t val)
{
- out_be32((void *)PCI_CONFIG, dev | (reg & ~3));
- out_be16((void *)(PCI_CONFIG | (reg & 2)), val);
+ out_le32((void *)PCI_CONFIG, dev | (reg & ~3));
+ out_le16((void *)(APB_MEM_BASE | (reg & 2)), val);
}
static inline void pci_config_write32(pci_addr dev, uint8_t reg, uint32_t val)
{
- out_be32((void *)PCI_CONFIG, dev | reg);
- out_be32((void *)(PCI_CONFIG | reg), val);
+ out_le32((void *)PCI_CONFIG, dev | reg);
+ out_le32((void *)(APB_MEM_BASE | reg), val);
}
#else /* !PCI_CONFIG_1 */
Modified: openbios-devel/include/sparc64/types.h
===================================================================
--- openbios-devel/include/sparc64/types.h 2006-07-18 21:38:42 UTC (rev 67)
+++ openbios-devel/include/sparc64/types.h 2006-07-18 21:42:16 UTC (rev 68)
@@ -13,6 +13,16 @@
#include <stdint.h>
+#ifdef NEED_FAKE_INT128_T
+typedef struct {
+ uint64_t hi;
+ uint64_t lo;
+} blob_128_t;
+
+typedef blob_128_t __int128_t;
+typedef blob_128_t __uint128_t;
+#endif
+
/* cell based types */
typedef int64_t cell;
typedef uint64_t ucell;
Modified: openbios-devel/kernel/bootstrap.c
===================================================================
--- openbios-devel/kernel/bootstrap.c 2006-07-18 21:38:42 UTC (rev 67)
+++ openbios-devel/kernel/bootstrap.c 2006-07-18 21:42:16 UTC (rev 68)
@@ -43,11 +43,11 @@
static int segfault = 0;
int verbose = 0;
-static FILE *srcfiles[64];
+static FILE *srcfiles[128];
static unsigned int cursrc = 0;
#ifdef NATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH
-unsigned long base_address;
+ucell base_address;
#endif
/* include path handling */
@@ -116,7 +116,7 @@
bit=i&~(-BITS);
if(d1[i]==d2[i]) {
- reloc_table[pos] &= target_ucell(~(1UL<<bit));
+ reloc_table[pos] &= target_ucell(~((ucell)1UL<<bit));
// This check might bring false positives in data.
//if(d1[i] >= pointer2cell(dict_one) &&
@@ -124,7 +124,7 @@
// printk("\nWARNING: inconsistent relocation (%x:%x)!\n", d1[i], d2[i]);
} else {
/* This is a pointer, it needs relocation, d2==dict */
- reloc_table[pos] |= target_ucell(1UL<<bit);
+ reloc_table[pos] |= target_ucell((ucell)1UL<<bit);
d2[i] = target_ucell(target_ucell(d2[i]) - pointer2cell(d2));
}
}
@@ -792,9 +792,9 @@
addr = read_cell(cell2pointer(PC));
printk("panic: segmentation violation at %p\n", (char *)si->si_addr);
- printk("dict=%p here=%p(dict+0x%x) pc=0x%x(dict+0x%x)\n",
+ printk("dict=%p here=%p(dict+0x%" FMT_CELL_x ") pc=0x%" FMT_CELL_x "(dict+0x%" FMT_CELL_x ")\n",
dict, dict + dicthead, dicthead, PC, PC - pointer2cell(dict));
- printk("dstackcnt=%d rstackcnt=%d instruction=%x\n",
+ printk("dstackcnt=%d rstackcnt=%d instruction=%" FMT_CELL_x "\n",
dstackcnt, rstackcnt, addr);
printdstack();
@@ -833,7 +833,7 @@
printk(" undefined word.\n");
break;
default:
- printk("\nError %d occured.\n", no);
+ printk("\nError %" FMT_CELL_d " occured.\n", no);
}
exit(1);
}
Modified: openbios-devel/kernel/cross.h
===================================================================
--- openbios-devel/kernel/cross.h 2006-07-18 21:38:42 UTC (rev 67)
+++ openbios-devel/kernel/cross.h 2006-07-18 21:42:16 UTC (rev 68)
@@ -46,10 +46,15 @@
#define target_ucell(value) (target_long(value))
#define target_cell(value) (target_long(value))
#elif BITS==64
+#ifdef NATIVE_BITWIDTH_LARGER_THAN_HOST_BITWIDTH
+#define target_ucell(value) ( ((ucell)target_long((value)&0xffffffff))<<32 )
+#define target_cell(value) ( ((cell)target_long((value)&0xffffffff))<<32 )
+#else
#define target_ucell(value) ( ((ucell)target_long((value)&0xffffffff))<<32 | \
((ucell)target_long((value)>>32)) )
#define target_cell(value) ( ((cell)target_long((value)&0xffffffff))<<32 | \
((cell)target_long((value)>>32)) )
+#endif
#else
#error "Endianness not supported. Please report."
#endif
@@ -103,17 +108,23 @@
#ifdef NATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH
#define pointer2cell(x) ((ucell)(x))
#define cell2pointer(x) ((u8 *)(x))
+#define FMT_CELL_x "x"
+#define FMT_CELL_d "d"
#endif
#ifdef NATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH
-extern unsigned long base_address;
-#define pointer2cell(x) ((ucell)(((unsigned long)x)-base_address))
-#define cell2pointer(x) ((u8 *)(((unsigned long)x)+base_address))
+extern ucell base_address;
+#define pointer2cell(x) ((ucell)(((unsigned long)(x))-base_address))
+#define cell2pointer(x) ((u8 *)(((unsigned long)(x))+base_address))
+#define FMT_CELL_x "x"
+#define FMT_CELL_d "d"
#endif
#ifdef NATIVE_BITWIDTH_LARGER_THAN_HOST_BITWIDTH
-#define pointer2cell(x) ((ucell)(x))
-#define cell2pointer(x) ((u8 *)((unsigned long)x&0xFFFFFFFFUL))
+#define pointer2cell(x) ((ucell)(unsigned long)(x))
+#define cell2pointer(x) ((u8 *)((unsigned long)(x)&0xFFFFFFFFUL))
+#define FMT_CELL_x "llx"
+#define FMT_CELL_d "lld"
#endif
#endif
Modified: openbios-devel/kernel/dict.c
===================================================================
--- openbios-devel/kernel/dict.c 2006-07-18 21:38:42 UTC (rev 67)
+++ openbios-devel/kernel/dict.c 2006-07-18 21:42:16 UTC (rev 68)
@@ -119,7 +119,7 @@
printk(" relocation: %s\n", header->relocation?"yes":"no");
printk(" checksum: %08x\n", target_long(header->checksum));
printk(" length: %08x\n", target_long(header->length));
- printk(" last: %08x\n", target_cell(header->last));
+ printk(" last: %0" FMT_CELL_x "\n", target_cell(header->last));
}
ucell load_dictionary(const char *data, ucell len)
Modified: openbios-devel/kernel/forth.c
===================================================================
--- openbios-devel/kernel/forth.c 2006-07-18 21:38:42 UTC (rev 67)
+++ openbios-devel/kernel/forth.c 2006-07-18 21:42:16 UTC (rev 68)
@@ -330,8 +330,13 @@
{
const ucell b = POP();
const ducell a = DPOP();
+#ifdef NEED_FAKE_INT128_T
+ fprintf(stderr, "mudivmode called\n");
+ exit(-1);
+#else
PUSH(a % b);
DPUSH(a / b);
+#endif
}
@@ -475,7 +480,12 @@
{
const dcell d2 = DPOP();
const dcell d1 = DPOP();
+#ifdef NEED_FAKE_INT128_T
+ fprintf(stderr, "dplus called\n");
+ exit(-1);
+#else
DPUSH(d1 + d2);
+#endif
}
@@ -487,7 +497,12 @@
{
const dcell d2 = DPOP();
const dcell d1 = DPOP();
+#ifdef NEED_FAKE_INT128_T
+ fprintf(stderr, "dminus called\n");
+ exit(-1);
+#else
DPUSH(d1 - d2);
+#endif
}
@@ -499,7 +514,12 @@
{
const cell u2 = POP();
const cell u1 = POP();
+#ifdef NEED_FAKE_INT128_T
+ fprintf(stderr, "mmult called\n");
+ exit(-1);
+#else
DPUSH((dcell) u1 * u2);
+#endif
}
@@ -511,7 +531,12 @@
{
const ucell u2 = POP();
const ucell u1 = POP();
+#ifdef NEED_FAKE_INT128_T
+ fprintf(stderr, "ummult called\n");
+ exit(-1);
+#else
DPUSH((ducell) u1 * u2);
+#endif
}
Modified: openbios-devel/kernel/stack.c
===================================================================
--- openbios-devel/kernel/stack.c 2006-07-18 21:38:42 UTC (rev 67)
+++ openbios-devel/kernel/stack.c 2006-07-18 21:42:16 UTC (rev 68)
@@ -9,6 +9,7 @@
#include "openbios/config.h"
#include "openbios/stack.h"
+#include "cross.h"
#define dstacksize 512
int dstackcnt = 0;
@@ -24,7 +25,7 @@
int i;
printk("dstack:");
for (i = 0; i <= dstackcnt; i++) {
- printk(" 0x%x", dstack[i]);
+ printk(" 0x%" FMT_CELL_x , dstack[i]);
}
printk("\n");
}
@@ -35,7 +36,7 @@
int i;
printk("rstack:");
for (i = 0; i <= rstackcnt; i++) {
- printk(" 0x%x", rstack[i]);
+ printk(" 0x%" FMT_CELL_x , rstack[i]);
}
printk("\n");
}
1
0
r67 - in openbios-devel: arch/sparc64 arch/unix config/examples config/scripts kernel modules
by svn＠openbios.org 18 Jul '06
by svn＠openbios.org 18 Jul '06
18 Jul '06
Author: stepan
Date: 2006-07-18 23:38:42 +0200 (Tue, 18 Jul 2006)
New Revision: 67
Added:
openbios-devel/config/scripts/crosscflags
Modified:
openbios-devel/arch/sparc64/build.xml
openbios-devel/arch/sparc64/context.c
openbios-devel/arch/unix/blk.c
openbios-devel/arch/unix/unix.c
openbios-devel/config/examples/sparc64_rules.xml
openbios-devel/kernel/internal.c
openbios-devel/modules/disk-label.c
openbios-devel/modules/nvram.c
Log:
- Cleanup compiler warnings etc.
- add crosscflags from previous patch ;)
Modified: openbios-devel/arch/sparc64/build.xml
===================================================================
--- openbios-devel/arch/sparc64/build.xml 2006-07-18 21:35:55 UTC (rev 66)
+++ openbios-devel/arch/sparc64/build.xml 2006-07-18 21:38:42 UTC (rev 67)
@@ -61,7 +61,6 @@
<executable name="target/arch/sparc64/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED">
<rule><![CDATA[ arch/sparc64/builtin.c
$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule>
- <external-object source="target/include/static-dict.h"/>
</executable>
<!-- END OF HACK ALERT -->
Modified: openbios-devel/arch/sparc64/context.c
===================================================================
--- openbios-devel/arch/sparc64/context.c 2006-07-18 21:35:55 UTC (rev 66)
+++ openbios-devel/arch/sparc64/context.c 2006-07-18 21:38:42 UTC (rev 67)
@@ -20,7 +20,7 @@
* It is placed at the bottom of our stack, and loaded by assembly routine
* to start us up.
*/
-struct context main_ctx = {
+const struct context main_ctx = {
.regs[REG_SP] = (uint64_t) &_estack - 96,
.pc = (uint64_t) start_main,
.npc = (uint64_t) start_main + 4,
Modified: openbios-devel/arch/unix/blk.c
===================================================================
--- openbios-devel/arch/unix/blk.c 2006-07-18 21:35:55 UTC (rev 66)
+++ openbios-devel/arch/unix/blk.c 2006-07-18 21:38:42 UTC (rev 67)
@@ -47,7 +47,7 @@
}
static void
-blk_close( blk_data_t *pb )
+blk_close( __attribute__((unused)) blk_data_t *pb )
{
selfword("close-deblocker");
}
@@ -80,20 +80,20 @@
/* ( -- bs ) */
static void
-blk_block_size( blk_data_t *pb )
+blk_block_size( __attribute__((unused)) blk_data_t *pb )
{
PUSH( 512 );
}
/* ( -- maxbytes ) */
static void
-blk_max_transfer( blk_data_t *pb )
+blk_max_transfer( __attribute__((unused)) blk_data_t *pb )
{
PUSH( 1024*1024 );
}
static void
-blk_initialize( blk_data_t *pb )
+blk_initialize( __attribute__((unused)) blk_data_t *pb )
{
fword("is-deblocker");
}
Modified: openbios-devel/arch/unix/unix.c
===================================================================
--- openbios-devel/arch/unix/unix.c 2006-07-18 21:35:55 UTC (rev 66)
+++ openbios-devel/arch/unix/unix.c 2006-07-18 21:38:42 UTC (rev 67)
@@ -309,7 +309,7 @@
PUSH((ucell) memory + MEMORY_SIZE);
}
-void exception(cell no)
+void exception(__attribute__((unused)) cell no)
{
/*
* this is a noop since the dictionary has to take care
Modified: openbios-devel/config/examples/sparc64_rules.xml
===================================================================
--- openbios-devel/config/examples/sparc64_rules.xml 2006-07-18 21:35:55 UTC (rev 66)
+++ openbios-devel/config/examples/sparc64_rules.xml 2006-07-18 21:38:42 UTC (rev 67)
@@ -26,7 +26,7 @@
endif
CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g
-CFLAGS+= -Wa,-xarch=v9 -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany
+CFLAGS+= -Wa,-xarch=v9 -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany
CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations
CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing
INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
Added: openbios-devel/config/scripts/crosscflags
===================================================================
--- openbios-devel/config/scripts/crosscflags (rev 0)
+++ openbios-devel/config/scripts/crosscflags 2006-07-18 21:38:42 UTC (rev 67)
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+host=$1
+target=$2
+
+if test "$host" = "sparc"; then
+ host="sparc32"
+fi
+
+if test "$host" = "powerpc" -o "$host" = "mips" -o "$host" = "s390" -o "$host" = "sparc32" -o "$host" = "sparc64" -o "$host" = "m68k" -o "$host" = "armv4b"; then
+ hostbigendian="yes"
+else
+ hostbigendian="no"
+fi
+
+# host long bits test
+if test "$host" = "sparc64" -o "$host" = "ia64" -o "$host" = "x86_64" -o "$host" = "alpha"; then
+ hostlongbits="64"
+else
+ hostlongbits="32"
+fi
+
+if test "$target" = "powerpc" -o "$target" = "mips" -o "$target" = "s390" -o "$target" = "sparc32" -o "$target" = "sparc64" -o "$target" = "m68k" -o "$target" = "armv4b"; then
+ targetbigendian="yes"
+else
+ targetbigendian="no"
+fi
+
+# target long bits test
+if test "$target" = "sparc64" -o "$target" = "ia64" -o "$target" = "x86_64" -o "$target" = "alpha"; then
+ targetlongbits="64"
+else
+ targetlongbits="32"
+fi
+
+if test "$targetbigendian" = "$hostbigendian"; then
+ cflags="-USWAP_ENDIANNESS"
+else
+ cflags="-DSWAP_ENDIANNESS"
+fi
+
+if test "$targetlongbits" = "$hostlongbits"; then
+ cflags="$cflags -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH"
+elif test "$targetlongbits" -lt "$hostlongbits"; then
+ cflags="$cflags -DNATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH"
+else
+ cflags="$cflags -DNATIVE_BITWIDTH_LARGER_THAN_HOST_BITWIDTH"
+fi
+
+if test "$host" = "x86" -a "$targetlongbits" = "64"; then
+ cflags="$cflags -DNEED_FAKE_INT128_T"
+fi
+
+echo "$cflags"
Modified: openbios-devel/kernel/internal.c
===================================================================
--- openbios-devel/kernel/internal.c 2006-07-18 21:35:55 UTC (rev 66)
+++ openbios-devel/kernel/internal.c 2006-07-18 21:38:42 UTC (rev 67)
@@ -178,9 +178,11 @@
static void sysdebug(void)
{
+#ifdef FCOMPILER
cell errorno=POP();
-#ifdef FCOMPILER
exception(errorno);
+#else
+ (void) POP();
#endif
}
Modified: openbios-devel/modules/disk-label.c
===================================================================
--- openbios-devel/modules/disk-label.c 2006-07-18 21:35:55 UTC (rev 66)
+++ openbios-devel/modules/disk-label.c 2006-07-18 21:38:42 UTC (rev 67)
@@ -168,7 +168,7 @@
/* ( addr len -- actual ) */
static void
-dlabel_write( dlabel_info_t *di )
+dlabel_write( __attribute__((unused)) dlabel_info_t *di )
{
DDROP();
PUSH( -1 );
@@ -185,7 +185,7 @@
/* ( addr -- size ) */
static void
-dlabel_load( dlabel_info_t *di )
+dlabel_load( __attribute__((unused)) dlabel_info_t *di )
{
/* XXX: try the load method of the part package */
Modified: openbios-devel/modules/nvram.c
===================================================================
--- openbios-devel/modules/nvram.c 2006-07-18 21:35:55 UTC (rev 66)
+++ openbios-devel/modules/nvram.c 2006-07-18 21:38:42 UTC (rev 67)
@@ -275,7 +275,7 @@
/* ( -- size ) */
static void
-nvram_size( nvram_ibuf_t *nd )
+nvram_size( __attribute__((unused)) nvram_ibuf_t *nd )
{
PUSH( nvram.size );
}
1
0
Author: stepan
Date: 2006-07-18 23:35:55 +0200 (Tue, 18 Jul 2006)
New Revision: 66
Modified:
openbios-devel/Makefile
openbios-devel/config/examples/amd64_rules.xml
openbios-devel/config/examples/cross-ppc_rules.xml
openbios-devel/config/examples/cross-sparc32_rules.xml
openbios-devel/config/examples/cross-sparc64_rules.xml
openbios-devel/config/examples/sparc32_rules.xml
openbios-devel/config/examples/sparc64_rules.xml
openbios-devel/config/examples/x86_rules.xml
openbios-devel/kernel/cross.h
Log:
Automatic cross-compiler flags
Detect cross-compiling flags (CROSSCFLAGS) automatically based on endian
and word size differences.
Modified: openbios-devel/Makefile
===================================================================
--- openbios-devel/Makefile 2006-06-13 15:34:53 UTC (rev 65)
+++ openbios-devel/Makefile 2006-07-18 21:35:55 UTC (rev 66)
@@ -1,5 +1,6 @@
ARCH= $(shell cat rules.xml |grep "^ARCH" |cut -d\= -f2|tr -d \ )
HOSTARCH=$(shell config/scripts/archname)
+CROSSCFLAGS=$(shell config/scripts/crosscflags $(HOSTARCH) $(ARCH))
ODIR=obj-$(ARCH)
all: info build
@@ -53,12 +54,12 @@
build: xml
@printf "Building..."
- @( $(MAKE) -f $(ODIR)/Makefile > $(ODIR)/build.log 2>&1 && echo "ok." ) || \
+ @( $(MAKE) -f $(ODIR)/Makefile CROSSCFLAGS=$(CROSSCFLAGS) > $(ODIR)/build.log 2>&1 && echo "ok." ) || \
( echo "error:"; tail -15 $(ODIR)/build.log )
build-verbose:
@echo "Building..."
- $(MAKE) -f $(ODIR)/Makefile
+ $(MAKE) -f $(ODIR)/Makefile "CROSSCFLAGS=$(CROSSCFLAGS)"
run:
@echo "Running..."
Modified: openbios-devel/config/examples/amd64_rules.xml
===================================================================
--- openbios-devel/config/examples/amd64_rules.xml 2006-06-13 15:34:53 UTC (rev 65)
+++ openbios-devel/config/examples/amd64_rules.xml 2006-07-18 21:35:55 UTC (rev 66)
@@ -9,7 +9,6 @@
ARCH := amd64
ODIR := obj-$(ARCH)
HOSTCC := gcc
-CROSSCFLAGS := -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS
HOSTCFLAGS := -O -g -fprofile-arcs -ftest-coverage -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS)
HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
Modified: openbios-devel/config/examples/cross-ppc_rules.xml
===================================================================
--- openbios-devel/config/examples/cross-ppc_rules.xml 2006-06-13 15:34:53 UTC (rev 65)
+++ openbios-devel/config/examples/cross-ppc_rules.xml 2006-07-18 21:35:55 UTC (rev 66)
@@ -9,7 +9,6 @@
ARCH := ppc
ODIR := obj-$(ARCH)
HOSTCC := gcc
-CROSSCFLAGS := -DNATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH -DSWAP_ENDIANNESS
HOSTCFLAGS := -Os -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS)
HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
#
Modified: openbios-devel/config/examples/cross-sparc32_rules.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc32_rules.xml 2006-06-13 15:34:53 UTC (rev 65)
+++ openbios-devel/config/examples/cross-sparc32_rules.xml 2006-07-18 21:35:55 UTC (rev 66)
@@ -9,7 +9,6 @@
ARCH := sparc32
ODIR := obj-$(ARCH)
HOSTCC := gcc
-CROSSCFLAGS := -DNATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH -DSWAP_ENDIANNESS
HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS)
HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
Modified: openbios-devel/config/examples/cross-sparc64_rules.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc64_rules.xml 2006-06-13 15:34:53 UTC (rev 65)
+++ openbios-devel/config/examples/cross-sparc64_rules.xml 2006-07-18 21:35:55 UTC (rev 66)
@@ -9,7 +9,6 @@
ARCH := sparc64
ODIR := obj-$(ARCH)
HOSTCC := gcc
-CROSSCFLAGS := -DNATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH -DSWAP_ENDIANNESS
HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS)
HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
Modified: openbios-devel/config/examples/sparc32_rules.xml
===================================================================
--- openbios-devel/config/examples/sparc32_rules.xml 2006-06-13 15:34:53 UTC (rev 65)
+++ openbios-devel/config/examples/sparc32_rules.xml 2006-07-18 21:35:55 UTC (rev 66)
@@ -9,7 +9,6 @@
ARCH := sparc32
ODIR := obj-$(ARCH)
HOSTCC := gcc
-CROSSCFLAGS := -DNATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH -USWAP_ENDIANNESS
HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS)
HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
Modified: openbios-devel/config/examples/sparc64_rules.xml
===================================================================
--- openbios-devel/config/examples/sparc64_rules.xml 2006-06-13 15:34:53 UTC (rev 65)
+++ openbios-devel/config/examples/sparc64_rules.xml 2006-07-18 21:35:55 UTC (rev 66)
@@ -9,7 +9,6 @@
ARCH := sparc64
ODIR := obj-$(ARCH)
HOSTCC := gcc
-CROSSCFLAGS := -DNATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH -USWAP_ENDIANNESS
HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS)
HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
Modified: openbios-devel/config/examples/x86_rules.xml
===================================================================
--- openbios-devel/config/examples/x86_rules.xml 2006-06-13 15:34:53 UTC (rev 65)
+++ openbios-devel/config/examples/x86_rules.xml 2006-07-18 21:35:55 UTC (rev 66)
@@ -9,7 +9,6 @@
ARCH := x86
ODIR := obj-$(ARCH)
HOSTCC := gcc
-CROSSCFLAGS := -DNATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH -USWAP_ENDIANNESS
HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) -Wno-unused
HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
Modified: openbios-devel/kernel/cross.h
===================================================================
--- openbios-devel/kernel/cross.h 2006-06-13 15:34:53 UTC (rev 65)
+++ openbios-devel/kernel/cross.h 2006-07-18 21:35:55 UTC (rev 66)
@@ -14,30 +14,6 @@
* unchanged memory access for performance.
*/
-#if 0
-// This is being moved to rules.xml for now.
-
-#ifdef FCOMPILER
-
-/* FIXME these should be automatically determinded.
- * Manually setting them here is a PITA.
- */
-
-#define NATIVE_BITWIDTH_LARGER_THAN_HOST_BITWIDTH
-//#define NATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH
-//#define NATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH
-
-//#define SWAP_ENDIANNESS
-#undef SWAP_ENDIANNESS
-
-#else /* FCOMPILER */
-
-#define NATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH
-#undef SWAP_ENDIANNESS
-
-#endif
-#endif
-
/* byte swapping */
#ifndef SWAP_ENDIANNESS
1
0
Hello
I have serious problem with my BIOS. I'm not able to go to BIOS set up page
at start up though I have tried all possible keys on my keyboard. At startup
if I press Pause key it gives message - "INVALID MACHINE NAME AND NUMBER.
PLESSE UPDATE YOUR BIOS".
I don't know which BIOS I'm using. I tried to update my BIOS with INTEL and
AMIBIOS flash files but it didn't worked out.
Please help me to solve this problem.
--
View this message in context: http://www.nabble.com/INVALID-MACHINE-NAME-AND-NUMBER-tf1924358.html#a52691…
Sent from the OpenBIOS forum at Nabble.com.
1
0
Can openbios be used as a replacement bios without the use of linux bios?
Is there any good documentation on openbios? I want to beable to use
openbios in a flash chip that boots the MBR of a floppy disk but I can't
find any good documetation on openbios. Can someone help please?
1
0
I implemented missing methods etc. to make OpenBIOS obey Qemu's -nographic
flag. This means that Linux can automatically select the correct console
device, screen or serial.
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
1
0
Hi,
I finally learnt how to use Quilt to manage patches. The previous patch is
now in several parts, which should be easier to handle.
The order of applying should be:
autocrosscflags.diff
vga.diff
cleanup.diff
console-nographic.diff
64_bit_fixes.diff
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
1
0
* Wessel, Jason <jason.wessel(a)windriver.com> [060616 00:08]:
>
> I started porting the OpenBIOS to the PPC qemu, and I was curious of the state
> of the PearPC portion of the OpenBIOS. I thought I check and ask if there is
> another branch or if someone was already working in this area or had it
> working.
Very cool!
PearPC pretty much stayed unsupported since I never got the ADB portion
of the code to work properly. PearPC uses "PC style serial ports" as
well..
Stefan
--
coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br.
Tel.: +49 761 7668825 • Fax: +49 761 7664613
Email: info(a)coresystems.de • http://www.coresystems.de/
1
0
Take a look at the briq code. I hand crafted the device tree, but I
was able to get to the point of booting Linux from an IDE drive.
Things failed at that point because I didn't have the interrupts set
up correctly. There should not be any serious problems getting PPC to
work.
Greg
On Jun 15, 2006, at 4:08 PM, Wessel, Jason wrote:
>
> I started porting the OpenBIOS to the PPC qemu, and I was curious
> of the state of the PearPC portion of the OpenBIOS. I thought I
> check and ask if there is another branch or if someone was already
> working in this area or had it working.
>
> I would be happy to collaborate and share some patches.
>
> Nothing really works at this point, but it is further along then
> having nothing:
>
> >> =============================================================
> >> OpenBIOS 1.0RC1 [Jun 15 2006 16:42]
> >> current nvram:
> >> ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
> >> ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
> >> ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
> >> ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
> >> nvram error detected, zapping pram
> >> Initializing PCI devices...
> >> ide0: [io ports 0x1f0-0x1f7,0x3f6]
> >> drive0 [ATA disk]: QEMU HARDDISK
> >> drive1 [ATAPI floppy]: QEMU CD-ROM
> >> Initializing ADB driver
> >> Autobooting disabled - dropping into OpenFirmware
> No cdrom found
> Output device /pci/pci6666,6666 not found.
> /pci/via-cuda/adb has no read method.
> Output device screen not found.
> Input device keyboard not found.
>
> 0 >
>
>
> I get that on the serial port for PPC qemu, and now I have to work
> backwards to fix it up correctly. Serial input doesn't work quite
> right and that will probably be the first hurdle.
>
> Any pointers to active or recent projects in this area would be
> appreciated.
>
> Cheers,
> Jason.
>
> --
> OpenBIOS http://openbios.org/
> Mailinglist: http://lists.openbios.org/mailman/listinfo
> Free your System - May the Forth be with you
2
1
I started porting the OpenBIOS to the PPC qemu, and I was curious of the
state of the PearPC portion of the OpenBIOS. I thought I check and ask
if there is another branch or if someone was already working in this
area or had it working.
I would be happy to collaborate and share some patches.
Nothing really works at this point, but it is further along then having
nothing:
>> =============================================================
>> OpenBIOS 1.0RC1 [Jun 15 2006 16:42]
>> current nvram:
>> ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
>> ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
>> ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
>> ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
>> nvram error detected, zapping pram
>> Initializing PCI devices...
>> ide0: [io ports 0x1f0-0x1f7,0x3f6]
>> drive0 [ATA disk]: QEMU HARDDISK
>> drive1 [ATAPI floppy]: QEMU CD-ROM
>> Initializing ADB driver
>> Autobooting disabled - dropping into OpenFirmware
No cdrom found
Output device /pci/pci6666,6666 not found.
/pci/via-cuda/adb has no read method.
Output device screen not found.
Input device keyboard not found.
0 >
I get that on the serial port for PPC qemu, and now I have to work
backwards to fix it up correctly. Serial input doesn't work quite right
and that will probably be the first hurdle.
Any pointers to active or recent projects in this area would be
appreciated.
Cheers,
Jason.
1
0
This patch adds automatic detection of cross-compiler CFLAGS. There is some
problem with dictionary:
Dumping final dictionary to 'obj-sparc64/bootstrap.dict'
Compiling dictionary 1/2
Dictionary initialization finished.
base is not defined.
interactive? is not defined.
(to) is not defined.
linefeed is not defined.
interpretion finished. 4 errors occured.
dictionary not dumped to file.
_________________________________________________________________
Don't just search. Find. Check out the new MSN Search!
http://search.msn.click-url.com/go/onm00200636ave/direct/01/
1
0
Author: stepan
Date: 2006-06-13 17:34:53 +0200 (Tue, 13 Jun 2006)
New Revision: 65
Modified:
openbios-devel/libgcc/build.xml
Log:
only build TI mode stuff for sparc64
Modified: openbios-devel/libgcc/build.xml
===================================================================
--- openbios-devel/libgcc/build.xml 2006-06-11 11:03:45 UTC (rev 64)
+++ openbios-devel/libgcc/build.xml 2006-06-13 15:34:53 UTC (rev 65)
@@ -11,13 +11,12 @@
<object source="__umoddi3.c"/>
<!-- CONDITION="CONFIG_64BITS" -->
- <object source="__divti3.c"/>
- <object source="__udivti3.c"/>
- <object source="__udivmodti4.c"/>
- <object source="__umodti3.c"/>
+ <object source="__divti3.c" condition="SPARC64"/>
+ <object source="__udivti3.c" condition="SPARC64"/>
+ <object source="__udivmodti4.c" condition="SPARC64"/>
+ <object source="__umodti3.c" condition="SPARC64"/>
+ <object source="multi3.c" condition="SPARC64"/>
- <object source="multi3.c"/>
-
</library>
</build>
1
0
I've noticed two things over the weekend.
1) sun-parts seems to be off by 1 (it is counting the vtoc as the first partition, which it should not , AFAIK). I will submit a patch when I get a chance.
2) I am getting a bit further with the Solaris boot if I enable all the QEMU debugging (-d in_asm,exec,cpu,op,int,out_asm).
SunOS starts and then I get message:
Cannot load drivers for sd(0,2,0)@0,0:b (or :a with the sun-parts fix)
Can't load the root filesystem
I thinks QEMU emulates SCSI 3 and Solaris wants SCSI 1 or 2. Can we load drivers or emulate a supported environment?
There seems to be some sort of timing issue with the startup. If I disable all QEMU debugging, it starts about1 in 20 times. If I enable it all, about 1 in 2 times.
Hope this helps.
Regards,
1
0
Author: stepan
Date: 2006-06-11 13:03:45 +0200 (Sun, 11 Jun 2006)
New Revision: 64
Modified:
openbios-devel/arch/sparc64/build.xml
openbios-devel/arch/sparc64/openbios.c
Log:
sparc64 code
Modified: openbios-devel/arch/sparc64/build.xml
===================================================================
--- openbios-devel/arch/sparc64/build.xml 2006-06-11 10:59:48 UTC (rev 63)
+++ openbios-devel/arch/sparc64/build.xml 2006-06-11 11:03:45 UTC (rev 64)
@@ -20,14 +20,12 @@
</library>
<executable name="target/arch/sparc64/entry.o" target="target">
- <rule><![CDATA[
- $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc64/entry.S
- ]]></rule>
+ <rule><![CDATA[ arch/sparc64/entry.S
+ $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule>
</executable>
<executable name="target/arch/sparc64/vectors.o" target="target">
- <rule><![CDATA[
- $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc64/vectors.S
- ]]></rule>
+ <rule><![CDATA[ arch/sparc64/vectors.S
+ $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule>
</executable>
@@ -36,8 +34,7 @@
$(LD) -T arch/sparc64/ldscript -o $@.nostrip $^
$(NM) $@.nostrip | sort > $(ODIR)/openbios-plain.syms
cp $@.nostrip $@
- $(STRIP) $@
- </rule>
+ $(STRIP) $@</rule>
<object source="plainboot.c"/>
<external-object source="target/arch/sparc64/vectors.o"/>
<external-object source="target/arch/sparc64/entry.o"/>
@@ -57,15 +54,13 @@
@echo "static const char forth_dictionary[] = {" > $@
@cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \
| sed 's/0x ,//g' >> $@
- @echo "};" >> $@
- ]]></rule>
+ @echo "};" >> $@]]></rule>
<external-object source="openbios-sparc64.dict"/>
</executable>
<executable name="target/arch/sparc64/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED">
- <rule><![CDATA[
- $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc64/builtin.c
- ]]></rule>
+ <rule><![CDATA[ arch/sparc64/builtin.c
+ $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule>
<external-object source="target/include/static-dict.h"/>
</executable>
@@ -76,8 +71,7 @@
$(LD) -T arch/sparc64/ldscript -o $@.nostrip $^
$(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms
cp $@.nostrip $@
- $(STRIP) $@
- </rule>
+ $(STRIP) $@</rule>
<external-object source="target/arch/sparc64/vectors.o"/>
<external-object source="target/arch/sparc64/entry.o"/>
<external-object source="target/arch/sparc64/builtin.o"/>
Modified: openbios-devel/arch/sparc64/openbios.c
===================================================================
--- openbios-devel/arch/sparc64/openbios.c 2006-06-11 10:59:48 UTC (rev 63)
+++ openbios-devel/arch/sparc64/openbios.c 2006-06-11 11:03:45 UTC (rev 64)
@@ -31,6 +31,14 @@
int arch_nvram_size;
+void setup_timers()
+{
+}
+
+void udelay()
+{
+}
+
static void init_memory(void)
{
@@ -51,6 +59,16 @@
void setup_timers(void);
modules_init();
+#ifdef CONFIG_DRIVER_PCI
+ ob_pci_init();
+#endif
+#ifdef CONFIG_DRIVER_IDE
+ setup_timers();
+ ob_ide_init();
+#endif
+#ifdef CONFIG_DRIVER_FLOPPY
+ ob_floppy_init();
+#endif
#ifdef CONFIG_DEBUG_CONSOLE_VIDEO
init_video();
#endif
1
0
11 Jun '06
Author: stepan
Date: 2006-06-11 12:59:48 +0200 (Sun, 11 Jun 2006)
New Revision: 63
Added:
openbios-devel/include/sparc64/pci.h
Modified:
openbios-devel/config/examples/cross-sparc64_rules.xml
openbios-devel/libgcc/build.xml
Log:
sparc64: fix CFLAGS and add missing pci include
Modified: openbios-devel/config/examples/cross-sparc64_rules.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc64_rules.xml 2006-06-11 10:50:31 UTC (rev 62)
+++ openbios-devel/config/examples/cross-sparc64_rules.xml 2006-06-11 10:59:48 UTC (rev 63)
@@ -20,8 +20,9 @@
NM := sparc64-linux-nm
STRIP := sparc64-linux-strip
RANLIB := sparc64-linux-ranlib
-CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g
-CFLAGS+= -Wa,-xarch=v9 -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany
+CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -g
+CFLAGS+= -Wa,-xarch=v9 -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany
+CFLAGS+= -fno-builtin -nostdlib -ffreestanding
CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations
CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing
INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
Added: openbios-devel/include/sparc64/pci.h
===================================================================
--- openbios-devel/include/sparc64/pci.h (rev 0)
+++ openbios-devel/include/sparc64/pci.h 2006-06-11 10:59:48 UTC (rev 63)
@@ -0,0 +1,69 @@
+#ifndef SPARC64_PCI_H
+#define SPARC64_PCI_H
+
+#include "asm/io.h"
+
+#if !(defined(PCI_CONFIG_1) || defined(PCI_CONFIG_2))
+#define PCI_CONFIG_1 1 /* default */
+#endif
+
+#ifdef PCI_CONFIG_1
+
+/* PCI Configuration Mechanism #1 */
+
+/* Have pci_addr in the same format as the values written to 0xcf8
+ * so register accesses can be made easy. */
+#define PCI_ADDR(bus, dev, fn) \
+ ((pci_addr) (0x80000000u \
+ | (uint32_t) (bus) << 16 \
+ | (uint32_t) (dev) << 11 \
+ | (uint32_t) (fn) << 8))
+
+#define PCI_BUS(pcidev) ((uint8_t) ((pcidev) >> 16))
+#define PCI_DEV(pcidev) ((uint8_t) ((pcidev) >> 11) & 0x1f)
+#define PCI_FN(pcidev) ((uint8_t) ((pcidev) >> 8) & 7)
+
+#define APB_SPECIAL_BASE 0x1fe00000000ULL
+#define PCI_CONFIG (APB_SPECIAL_BASE + 0x2000)
+
+static inline uint8_t pci_config_read8(pci_addr dev, uint8_t reg)
+{
+ out_be32((void *)PCI_CONFIG, dev | (reg & ~3));
+ return in_8((void *)(PCI_CONFIG | (reg & 3)));
+}
+
+static inline uint16_t pci_config_read16(pci_addr dev, uint8_t reg)
+{
+ out_be32((void *)PCI_CONFIG, dev | (reg & ~3));
+ return in_be16((void *)(PCI_CONFIG | (reg & 2)));
+}
+
+static inline uint32_t pci_config_read32(pci_addr dev, uint8_t reg)
+{
+ out_be32((void *)PCI_CONFIG, dev | reg);
+ return in_be32((void *)(PCI_CONFIG | reg));
+}
+
+static inline void pci_config_write8(pci_addr dev, uint8_t reg, uint8_t val)
+{
+ out_be32((void *)PCI_CONFIG, dev | (reg & ~3));
+ out_8((void *)(PCI_CONFIG | (reg & 3)), val);
+}
+
+static inline void pci_config_write16(pci_addr dev, uint8_t reg, uint16_t val)
+{
+ out_be32((void *)PCI_CONFIG, dev | (reg & ~3));
+ out_be16((void *)(PCI_CONFIG | (reg & 2)), val);
+}
+
+static inline void pci_config_write32(pci_addr dev, uint8_t reg, uint32_t val)
+{
+ out_be32((void *)PCI_CONFIG, dev | reg);
+ out_be32((void *)(PCI_CONFIG | reg), val);
+}
+
+#else /* !PCI_CONFIG_1 */
+#error PCI Configuration Mechanism is not specified or implemented
+#endif
+
+#endif /* SPARC64_PCI_H */
Modified: openbios-devel/libgcc/build.xml
===================================================================
--- openbios-devel/libgcc/build.xml 2006-06-11 10:50:31 UTC (rev 62)
+++ openbios-devel/libgcc/build.xml 2006-06-11 10:59:48 UTC (rev 63)
@@ -9,6 +9,8 @@
<object source="__udivdi3.c"/>
<object source="__udivmoddi4.c"/>
<object source="__umoddi3.c"/>
+
+ <!-- CONDITION="CONFIG_64BITS" -->
<object source="__divti3.c"/>
<object source="__udivti3.c"/>
<object source="__udivmodti4.c"/>
1
0
Author: stepan
Date: 2006-06-11 12:50:31 +0200 (Sun, 11 Jun 2006)
New Revision: 62
Added:
openbios-devel/libgcc/__divti3.c
openbios-devel/libgcc/__udivmodti4.c
openbios-devel/libgcc/__udivti3.c
openbios-devel/libgcc/__umodti3.c
openbios-devel/libgcc/multi3.c
Modified:
openbios-devel/libgcc/build.xml
Log:
add 128bit functions.
Added: openbios-devel/libgcc/__divti3.c
===================================================================
--- openbios-devel/libgcc/__divti3.c (rev 0)
+++ openbios-devel/libgcc/__divti3.c 2006-06-11 10:50:31 UTC (rev 62)
@@ -0,0 +1,29 @@
+/*
+ * arch/i386/libgcc/__divti3.c
+ */
+
+#include "asm/types.h"
+#define NULL ((void *)0)
+
+extern __uint128_t __udivmodti4(__uint128_t num, __uint128_t den, __uint128_t *rem);
+
+__int128_t __divti3(__int128_t num, __int128_t den)
+{
+ int minus = 0;
+ __int128_t v;
+
+ if ( num < 0 ) {
+ num = -num;
+ minus = 1;
+ }
+ if ( den < 0 ) {
+ den = -den;
+ minus ^= 1;
+ }
+
+ v = __udivmodti4(num, den, NULL);
+ if ( minus )
+ v = -v;
+
+ return v;
+}
Added: openbios-devel/libgcc/__udivmodti4.c
===================================================================
--- openbios-devel/libgcc/__udivmodti4.c (rev 0)
+++ openbios-devel/libgcc/__udivmodti4.c 2006-06-11 10:50:31 UTC (rev 62)
@@ -0,0 +1,34 @@
+#include "asm/types.h"
+
+extern void __divide_error();
+
+__uint128_t __udivmodti4(__uint128_t num, __uint128_t den, __uint128_t *rem_p)
+{
+ __uint128_t quot = 0, qbit = 1;
+
+ if ( den == 0 ) {
+ __divide_error();
+ return 0; /* If trap returns... */
+ }
+
+ /* Left-justify denominator and count shift */
+ while ( (__int128_t)den >= 0 ) {
+ den <<= 1;
+ qbit <<= 1;
+ }
+
+ while ( qbit ) {
+ if ( den <= num ) {
+ num -= den;
+ quot += qbit;
+ }
+ den >>= 1;
+ qbit >>= 1;
+ }
+
+ if ( rem_p )
+ *rem_p = num;
+
+ return quot;
+}
+
Added: openbios-devel/libgcc/__udivti3.c
===================================================================
--- openbios-devel/libgcc/__udivti3.c (rev 0)
+++ openbios-devel/libgcc/__udivti3.c 2006-06-11 10:50:31 UTC (rev 62)
@@ -0,0 +1,13 @@
+/*
+ * arch/i386/libgcc/__divdi3.c
+ */
+
+#include "asm/types.h"
+#define NULL ((void *)0)
+
+extern __uint128_t __udivmodti4(__uint128_t num, __uint128_t den, __uint128_t *rem);
+
+__uint128_t __udivti3(__uint128_t num, __uint128_t den)
+{
+ return __udivmodti4(num, den, NULL);
+}
Added: openbios-devel/libgcc/__umodti3.c
===================================================================
--- openbios-devel/libgcc/__umodti3.c (rev 0)
+++ openbios-devel/libgcc/__umodti3.c 2006-06-11 10:50:31 UTC (rev 62)
@@ -0,0 +1,15 @@
+/*
+ * arch/i386/libgcc/__umoddi3.c
+ */
+
+#include "asm/types.h"
+
+extern __uint128_t __udivmodti4(__uint128_t num, __uint128_t den, __uint128_t *rem);
+
+__uint128_t __umodti3(__uint128_t num, __uint128_t den)
+{
+ __uint128_t v;
+
+ (void) __udivmodti4(num, den, &v);
+ return v;
+}
Modified: openbios-devel/libgcc/build.xml
===================================================================
--- openbios-devel/libgcc/build.xml 2006-06-10 02:22:45 UTC (rev 61)
+++ openbios-devel/libgcc/build.xml 2006-06-11 10:50:31 UTC (rev 62)
@@ -3,11 +3,19 @@
<library name="gcc" type="static" target="target">
<object source="ashldi3.c"/>
<object source="ashrdi3.c"/>
+ <object source="__lshrdi3.c"/>
+
<object source="__divdi3.c"/>
<object source="__udivdi3.c"/>
<object source="__udivmoddi4.c"/>
<object source="__umoddi3.c"/>
- <object source="__lshrdi3.c"/>
+ <object source="__divti3.c"/>
+ <object source="__udivti3.c"/>
+ <object source="__udivmodti4.c"/>
+ <object source="__umodti3.c"/>
+
+ <object source="multi3.c"/>
+
</library>
</build>
Added: openbios-devel/libgcc/multi3.c
===================================================================
--- openbios-devel/libgcc/multi3.c (rev 0)
+++ openbios-devel/libgcc/multi3.c 2006-06-11 10:50:31 UTC (rev 62)
@@ -0,0 +1,86 @@
+/* muldi3.c extracted from gcc-2.7.2.3/libgcc2.c and
+ gcc-2.7.2.3/longlong.h which is: */
+/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+
+This file is part of GNU CC.
+
+GNU CC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU CC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU CC; see the file COPYING. If not, write to
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
+
+#define BITS_PER_UNIT 8
+#define DI_TYPE_SIZE 64
+
+#define __BITS4 (DI_TYPE_SIZE / 4)
+#define __ll_B (1L << (DI_TYPE_SIZE / 2))
+#define __ll_lowpart(t) ((UDItype) (t) % __ll_B)
+#define __ll_highpart(t) ((UDItype) (t) / __ll_B)
+
+#define umul_ppmm(w1, w0, u, v) \
+ do { \
+ UDItype __x0, __x1, __x2, __x3; \
+ UDItype __ul, __vl, __uh, __vh; \
+ \
+ __ul = __ll_lowpart (u); \
+ __uh = __ll_highpart (u); \
+ __vl = __ll_lowpart (v); \
+ __vh = __ll_highpart (v); \
+ \
+ __x0 = (UDItype) __ul * __vl; \
+ __x1 = (UDItype) __ul * __vh; \
+ __x2 = (UDItype) __uh * __vl; \
+ __x3 = (UDItype) __uh * __vh; \
+ \
+ __x1 += __ll_highpart (__x0);/* this can't give carry */ \
+ __x1 += __x2; /* but this indeed can */ \
+ if (__x1 < __x2) /* did we get it? */ \
+ __x3 += __ll_B; /* yes, add it in the proper pos. */ \
+ \
+ (w1) = __x3 + __ll_highpart (__x1); \
+ (w0) = __ll_lowpart (__x1) * __ll_B + __ll_lowpart (__x0); \
+ } while (0)
+
+#define __umulsidi3(u, v) \
+ ({TIunion __w; \
+ umul_ppmm (__w.s.high, __w.s.low, u, v); \
+ __w.ll; })
+
+typedef int DItype __attribute__ ((mode (DI)));
+typedef unsigned int UDItype __attribute__ ((mode (DI)));
+typedef int TItype __attribute__ ((mode (TI)));
+typedef int word_type __attribute__ ((mode (__word__)));
+
+struct TIstruct {DItype high, low;};
+
+typedef union
+{
+ struct TIstruct s;
+ TItype ll;
+} TIunion;
+
+TItype
+__multi3 (TItype u, TItype v)
+{
+ TIunion w;
+ TIunion uu, vv;
+
+ uu.ll = u,
+ vv.ll = v;
+
+ w.ll = __umulsidi3 (uu.s.low, vv.s.low);
+ w.s.high += ((UDItype) uu.s.low * (UDItype) vv.s.high
+ + (UDItype) uu.s.high * (UDItype) vv.s.low);
+
+ return w.ll;
+}
1
0
Re: [OpenBIOS] Correct GCC configuration for cross-compiling Open BIOS
by Armistead, Jason 11 Jun '06
by Armistead, Jason 11 Jun '06
11 Jun '06
Stefan
After downloading GCC 4.1.1 (latest), I still get the same problem
Configure runs OK, but during make, while in the gcc directory, the
following message appears just as it is getting ready to move into the next
directory (intl).
checking for .preinit_array/.init_array/.fini_array support... yes
checking if mkdir takes one argument... no
*** Configuration sparc-sun-sunos4.1.4 not supported
make[2]: Entering directory `/otis/software/source/gcc-4.1.1/cross-gcc/intl'
And then when it got a bit further on, it died with the message
make[2]: Leaving directory
`/otis/software/source/gcc-4.1.1/cross-gcc/libcpp'
make[2]: Entering directory `/otis/software/source/gcc-4.1.1/cross-gcc/gcc'
make[2]: *** No rule to make target `all'. Stop.
make[2]: Leaving directory `/otis/software/source/gcc-4.1.1/cross-gcc/gcc'
make[1]: *** [all-gcc] Error 2
make[1]: Leaving directory `/otis/software/source/gcc-4.1.1/cross-gcc'
make: *** [all] Error 2
With GCC 3.4.6, it simply crashed and died once it identified
sparc-sun-sunos4.1.4 as not supported (this is output from the
gcc/config.gcc script) and it didn't continue on into other directories.
I note that you are using the target as "sparc-linux". I gave that a go,
rebuilding binutils and trying again to build gcc, and now I get a problem
about missing include files pthread.h and unistd.h.
/software/source/gcc-4.1.1/cross-gcc/./gcc/xgcc -B/software/source/gcc
-4.1.1/cross-gcc/./gcc/ -B/usr/local/sparc-linux/bin/
-B/usr/local/sparc-linux/l
ib/ -isystem /usr/local/sparc-linux/include -isystem
/usr/local/sparc-linux/sys-
include -O2 -O2 -g -O2 -DIN_GCC -DCROSS_COMPILE -W -Wall
-Wwrite-strings -W
strict-prototypes -Wmissing-prototypes -Wold-style-definition -isystem
./includ
e -fPIC -g -DHAVE_GTHR_DEFAULT -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED
-Dinhibit_
libc -I. -I. -I../../gcc -I../../gcc/. -I../../gcc/../include -I./../intl
-I../.
./gcc/../libcpp/include -fexceptions -c ../../gcc/unwind-dw2.c -o
libgcc/./unw
ind-dw2.o
In file included from ./gthr-default.h:1,
from ../../gcc/gthr.h:114,
from ../../gcc/unwind-dw2.c:42:
../../gcc/gthr-posix.h:43:21: error: pthread.h: No such file or directory
../../gcc/gthr-posix.h:44:20: error: unistd.h: No such file or directory
I'm thinking that I'm possibly missing glibc or similar, or else I need some
Linux header files. I'd better take a closer look at Dan Kegel's crosstool
- I only stayed away from it because it seemed that it didn't have very
good success for Sparc targets according to the target system build matrixes
on Dan Kegel's site.
Maybe there's a better "embedded sparc" target for binutils / gcc that
doesn't need so many headers, i.e. a version of GCC not actually targetted
at an operating system but for pure embedded systems use.
Regards
Jason
-----Original Message-----
From: openbios-bounces(a)openbios.org
[mailto:openbios-bounces@openbios.org]On Behalf Of Stefan Reinauer
Sent: Saturday, 10 June 2006 11:21 PM
To: The OpenBIOS Mailinglist
Subject: Re: [OpenBIOS] Correct GCC configuration for cross-compiling
OpenBIOS
* Armistead, Jason <Jason.Armistead(a)otis.com> [060610 15:17]:
> Can someone please advise the right cross-gcc configure script settings
they
> are using to build OpenBIOS for sparc32 ?
>
> I'm on Solaris 10 (Sparc) and need to know what your OpenBIOS environment
> returns for "gcc -v"
>
> I tried to build GCC 3.4.6 for target "sparc-sun-sunos4.1.4" but am now
> wondering if perhaps I should be building it for "sparc-sun-elf" or
similar.
This should actually work fine.
> Please advise by sending me your "gcc -v" settings so I can get myself out
> of this mess.
Since this is on a linux system (using dan kegel's crosstool) I am not
sure whether it will help..
sparc-linux-gcc -v
Using built-in specs.
Target: sparc-linux
Configured with:
/data/rpmbuild/BUILD/crosstool-0.42/build/gcc-4.1.0-glibc-2.3.2/sparc-linux/
gcc-4.1.0/configure
--target=sparc-linux --host=x86_64-host_unknown-linux-gnu
--prefix=/opt/crosstool/gcc-4.1.0-glibc-2.3.2/sparc-linux
--with-headers=/opt/crosstool/gcc-4.1.0-glibc-2.3.2/sparc-linux/sparc-linux/
include
--with-local-prefix=/opt/crosstool/gcc-4.1.0-glibc-2.3.2/sparc-linux/sparc-l
inux
--disable-nls --enable-threads=posix --enable-symvers=gnu
--enable-__cxa_atexit --enable-languages=c,c++ --enable-shared
--enable-c99 --enable-long-long
Thread model: posix
gcc version 4.1.0
Stefan
--
coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br.
Tel.: +49 761 7668825 • Fax: +49 761 7664613
Email: info(a)coresystems.de • http://www.coresystems.de/
--
OpenBIOS http://openbios.org/
Mailinglist: http://lists.openbios.org/mailman/listinfo
Free your System - May the Forth be with you
3
2
Can someone please advise the right cross-gcc configure script settings they
are using to build OpenBIOS for sparc32 ?
I'm on Solaris 10 (Sparc) and need to know what your OpenBIOS environment
returns for "gcc -v"
I tried to build GCC 3.4.6 for target "sparc-sun-sunos4.1.4" but am now
wondering if perhaps I should be building it for "sparc-sun-elf" or similar.
Please advise by sending me your "gcc -v" settings so I can get myself out
of this mess.
Thanks
Jason
2
1
r61 - in openbios-devel: . arch/sparc32 arch/sparc64 config/examples libgcc
by svn＠openbios.org 10 Jun '06
by svn＠openbios.org 10 Jun '06
10 Jun '06
Author: stepan
Date: 2006-06-10 04:22:45 +0200 (Sat, 10 Jun 2006)
New Revision: 61
Added:
openbios-devel/libgcc/
Removed:
openbios-devel/arch/sparc32/libgcc/
Modified:
openbios-devel/Makefile
openbios-devel/arch/sparc32/build.xml
openbios-devel/arch/sparc64/build.xml
openbios-devel/build.xml
openbios-devel/config/examples/cross-sparc64_rules.xml
openbios-devel/libgcc/build.xml
Log:
get sparc64 build some further
move libgcc to top level
Modified: openbios-devel/Makefile
===================================================================
--- openbios-devel/Makefile 2006-06-10 02:04:54 UTC (rev 60)
+++ openbios-devel/Makefile 2006-06-10 02:22:45 UTC (rev 61)
@@ -23,7 +23,7 @@
@mkdir -p $(ODIR)/target/arch/ppc/pearpc
@mkdir -p $(ODIR)/target/arch/ppc/mol
@mkdir -p $(ODIR)/target/arch/x86/xbox
- @mkdir -p $(ODIR)/target/arch/sparc32/libgcc
+ @mkdir -p $(ODIR)/target/libgcc
@mkdir -p $(ODIR)/target/kernel
@mkdir -p $(ODIR)/target/modules
@mkdir -p $(ODIR)/target/fs/grubfs
Modified: openbios-devel/arch/sparc32/build.xml
===================================================================
--- openbios-devel/arch/sparc32/build.xml 2006-06-10 02:04:54 UTC (rev 60)
+++ openbios-devel/arch/sparc32/build.xml 2006-06-10 02:22:45 UTC (rev 61)
@@ -1,7 +1,5 @@
<build condition="SPARC32">
- <include href="libgcc/build.xml"/>
-
<dictionary name="openbios-sparc32" init="openbios">
<object source="tree.fs" target="forth"/>
<object source="init.fs" target="forth"/>
@@ -35,25 +33,6 @@
]]></rule>
</executable>
- <executable name="openbios.multiboot" target="target" condition="IMAGE_ELF_MULTIBOOT">
- <rule>
- $(LD) -N -T arch/sparc32/ldscript -o $@.nostrip $^
- $(NM) $@.nostrip | sort > $(ODIR)/openbios-multiboot.syms
- cp $@.nostrip $@
- $(STRIP) $@
- </rule>
- <object source="multiboot.c"/>
- <external-object source="target/arch/sparc32/vectors.o"/>
- <external-object source="target/arch/sparc32/entry.o"/>
- <external-object source="libsparc32.a"/>
- <external-object source="libbootstrap.a"/>
- <external-object source="libmodules.a"/>
- <external-object source="libdrivers.a"/>
- <external-object source="liblibc.a"/>
- <external-object source="libfs.a"/>
- <external-object source="libgcc.a"/>
- </executable>
-
<executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF">
<rule>
$(LD) -N -T arch/sparc32/ldscript -o $@.nostrip $^
Modified: openbios-devel/arch/sparc64/build.xml
===================================================================
--- openbios-devel/arch/sparc64/build.xml 2006-06-10 02:04:54 UTC (rev 60)
+++ openbios-devel/arch/sparc64/build.xml 2006-06-10 02:22:45 UTC (rev 61)
@@ -30,23 +30,6 @@
]]></rule>
</executable>
- <executable name="openbios.multiboot" target="target" condition="IMAGE_ELF_MULTIBOOT">
- <rule>
- $(LD) -T arch/sparc64/ldscript -o $@.nostrip $^
- $(NM) $@.nostrip | sort > $(ODIR)/openbios-multiboot.syms
- cp $@.nostrip $@
- $(STRIP) $@
- </rule>
- <object source="multiboot.c"/>
- <external-object source="target/arch/sparc64/vectors.o"/>
- <external-object source="target/arch/sparc64/entry.o"/>
- <external-object source="libsparc64.a"/>
- <external-object source="libbootstrap.a"/>
- <external-object source="libmodules.a"/>
- <external-object source="libdrivers.a"/>
- <external-object source="liblibc.a"/>
- <external-object source="libfs.a"/>
- </executable>
<executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF">
<rule>
@@ -64,6 +47,7 @@
<external-object source="libdrivers.a"/>
<external-object source="liblibc.a"/>
<external-object source="libfs.a"/>
+ <external-object source="libgcc.a"/>
</executable>
<!-- HACK ALERT -->
@@ -103,6 +87,7 @@
<external-object source="libdrivers.a"/>
<external-object source="liblibc.a"/>
<external-object source="libfs.a"/>
+ <external-object source="libgcc.a"/>
</executable>
</build>
Modified: openbios-devel/build.xml
===================================================================
--- openbios-devel/build.xml 2006-06-10 02:04:54 UTC (rev 60)
+++ openbios-devel/build.xml 2006-06-10 02:22:45 UTC (rev 61)
@@ -5,6 +5,7 @@
<include href="toke/build.xml"/>
<include href="forth/build.xml"/>
<include href="libc/build.xml"/>
+ <include href="libgcc/build.xml"/>
<include href="modules/build.xml"/>
<include href="drivers/build.xml"/>
<include href="fs/build.xml"/>
Modified: openbios-devel/config/examples/cross-sparc64_rules.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc64_rules.xml 2006-06-10 02:04:54 UTC (rev 60)
+++ openbios-devel/config/examples/cross-sparc64_rules.xml 2006-06-10 02:22:45 UTC (rev 61)
@@ -13,13 +13,13 @@
HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS)
HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
-CC := sparc-linux-gcc
-AS := sparc-linux-as
-AR := sparc-linux-ar
-LD := sparc-linux-ld
-NM := sparc-linux-nm
-STRIP := sparc-linux-strip
-RANLIB := sparc-linux-ranlib
+CC := sparc64-linux-gcc
+AS := sparc64-linux-as
+AR := sparc64-linux-ar
+LD := sparc64-linux-ld
+NM := sparc64-linux-nm
+STRIP := sparc64-linux-strip
+RANLIB := sparc64-linux-ranlib
CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g
CFLAGS+= -Wa,-xarch=v9 -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany
CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations
Copied: openbios-devel/libgcc (from rev 59, openbios-devel/arch/sparc32/libgcc)
Modified: openbios-devel/libgcc/build.xml
===================================================================
--- openbios-devel/arch/sparc32/libgcc/build.xml 2006-06-10 01:41:02 UTC (rev 59)
+++ openbios-devel/libgcc/build.xml 2006-06-10 02:22:45 UTC (rev 61)
@@ -1,4 +1,4 @@
-<build condition="SPARC32">
+<build>
<library name="gcc" type="static" target="target">
<object source="ashldi3.c"/>
1
0
r60 - in openbios-devel: arch/sparc32 arch/sparc64 include/sparc64 modules
by svn＠openbios.org 10 Jun '06
by svn＠openbios.org 10 Jun '06
10 Jun '06
Author: stepan
Date: 2006-06-10 04:04:54 +0200 (Sat, 10 Jun 2006)
New Revision: 60
Modified:
openbios-devel/arch/sparc32/romvec.c
openbios-devel/arch/sparc64/tree.fs
openbios-devel/include/sparc64/types.h
openbios-devel/modules/build.xml
Log:
get sparc64 almost building (fails due to my binutils at the moment)
Modified: openbios-devel/arch/sparc32/romvec.c
===================================================================
--- openbios-devel/arch/sparc32/romvec.c 2006-06-10 01:41:02 UTC (rev 59)
+++ openbios-devel/arch/sparc32/romvec.c 2006-06-10 02:04:54 UTC (rev 60)
@@ -52,6 +52,8 @@
static struct linux_romvec romvec0;
+static unsigned long free_ram;
+
static void doublewalk(__attribute__((unused)) unsigned int ptab1,
__attribute__((unused)) unsigned int va)
{
@@ -367,18 +369,18 @@
return ret;
}
-static void obp_dumb_memfree(char *va, unsigned sz)
+static void obp_dumb_memfree(__attribute__((unused))char *va,
+ __attribute__((unused))unsigned sz)
{
DPRINTF("obp_dumb_memfree 0x%x(%d)\n", va, sz);
}
-static char * obp_dumb_memalloc(char *va, unsigned size)
+static char * obp_dumb_memalloc(char *va, unsigned int size)
{
- static char *pa = 0x4000000;
+ free_ram -= size;
+ DPRINTF("obp_dumb_memalloc req 0x%x of %d at 0x%x\n", va, size, free_ram);
+ obp_dumb_mmap(va, 1, free_ram, size);
- DPRINTF("obp_dumb_memalloc req 0x%x of %d at 0x%x\n", va, size, pa);
- obp_dumb_mmap(va, 1, pa, size);
- pa += size;
return va;
}
@@ -444,6 +446,8 @@
void *
init_openprom(unsigned long memsize, const char *cmdline, char boot_device)
{
+ free_ram = va2pa((int)&_data) - PAGE_SIZE;
+
ptphys = totphys;
ptmap = totmap;
ptavail = totavail;
@@ -457,7 +461,7 @@
totavail[0].theres_more = NULL;
totavail[0].start_adr = (char *) 0;
- totavail[0].num_bytes = va2pa((int)&_data) - PAGE_SIZE;
+ totavail[0].num_bytes = free_ram;
totmap[0].theres_more = NULL;
totmap[0].start_adr = &_start;
Modified: openbios-devel/arch/sparc64/tree.fs
===================================================================
--- openbios-devel/arch/sparc64/tree.fs 2006-06-10 01:41:02 UTC (rev 59)
+++ openbios-devel/arch/sparc64/tree.fs 2006-06-10 02:04:54 UTC (rev 60)
@@ -3,8 +3,8 @@
2 encode-int " #address-cells" property
1 encode-int " #size-cells" property
- : encode-unit encode-unit-sbus ;
- : decode-unit decode-unit-sbus ;
+ \ : encode-unit encode-unit-sbus ;
+ \ : decode-unit decode-unit-sbus ;
new-device
" memory" device-name
Modified: openbios-devel/include/sparc64/types.h
===================================================================
--- openbios-devel/include/sparc64/types.h 2006-06-10 01:41:02 UTC (rev 59)
+++ openbios-devel/include/sparc64/types.h 2006-06-10 02:04:54 UTC (rev 60)
@@ -16,8 +16,8 @@
/* cell based types */
typedef int64_t cell;
typedef uint64_t ucell;
-typedef long long dcell;
-typedef unsigned long long ducell;
+typedef __int128_t dcell;
+typedef __uint128_t ducell;
#define bitspercell (sizeof(cell)<<3)
#define bitsperdcell (sizeof(dcell)<<3)
Modified: openbios-devel/modules/build.xml
===================================================================
--- openbios-devel/modules/build.xml 2006-06-10 01:41:02 UTC (rev 59)
+++ openbios-devel/modules/build.xml 2006-06-10 02:04:54 UTC (rev 60)
@@ -9,6 +9,7 @@
<object source="elfnote.c" condition="X86"/>
<object source="elfnote.c" condition="AMD64"/>
<object source="elfnote.c" condition="SPARC32"/>
+ <object source="elfnote.c" condition="SPARC64"/>
<object source="elfload.c" condition="PPC"/>
<object source="linuxbios.c" condition="LINUXBIOS"/>
<object source="cmdline.c" condition="CMDLINE"/>
1
0
Author: stepan
Date: 2006-06-10 03:41:02 +0200 (Sat, 10 Jun 2006)
New Revision: 59
Modified:
openbios-devel/arch/sparc32/aoutload.c
Log:
more moderate memory consumption of BSD - Why do they break the a.out
headers?
Modified: openbios-devel/arch/sparc32/aoutload.c
===================================================================
--- openbios-devel/arch/sparc32/aoutload.c 2006-06-10 01:37:53 UTC (rev 58)
+++ openbios-devel/arch/sparc32/aoutload.c 2006-06-10 01:41:02 UTC (rev 59)
@@ -81,6 +81,9 @@
goto out;
}
+ if (ehdr.a_text == 0x30800007)
+ ehdr.a_text=64*1024;
+
if (N_MAGIC(ehdr) == NMAGIC) {
size = addr_fixup(N_DATADDR(ehdr)) + addr_fixup(ehdr.a_data);
} else {
@@ -90,6 +93,7 @@
if (size < 7680)
size = 7680;
+
start = 0x4000; // N_TXTADDR(ehdr);
if (!check_mem_ranges(info, start, size))
1
0
r58 - in openbios-devel: arch arch/sparc64 config/examples include include/sparc64
by svn＠openbios.org 10 Jun '06
by svn＠openbios.org 10 Jun '06
10 Jun '06
Author: stepan
Date: 2006-06-10 03:37:53 +0200 (Sat, 10 Jun 2006)
New Revision: 58
Added:
openbios-devel/arch/sparc64/
openbios-devel/arch/sparc64/asi.h
openbios-devel/arch/sparc64/boot.c
openbios-devel/arch/sparc64/boot.h
openbios-devel/arch/sparc64/build.xml
openbios-devel/arch/sparc64/builtin.c
openbios-devel/arch/sparc64/console.c
openbios-devel/arch/sparc64/const.h
openbios-devel/arch/sparc64/context.c
openbios-devel/arch/sparc64/context.h
openbios-devel/arch/sparc64/elfload.c
openbios-devel/arch/sparc64/entry.S
openbios-devel/arch/sparc64/forthload.c
openbios-devel/arch/sparc64/init.fs
openbios-devel/arch/sparc64/ldscript
openbios-devel/arch/sparc64/lib.c
openbios-devel/arch/sparc64/linux_load.c
openbios-devel/arch/sparc64/loadfs.c
openbios-devel/arch/sparc64/loadfs.h
openbios-devel/arch/sparc64/lsu.h
openbios-devel/arch/sparc64/multiboot.c
openbios-devel/arch/sparc64/multiboot.h
openbios-devel/arch/sparc64/openbios.c
openbios-devel/arch/sparc64/openbios.h
openbios-devel/arch/sparc64/openprom.h
openbios-devel/arch/sparc64/plainboot.c
openbios-devel/arch/sparc64/pstate.h
openbios-devel/arch/sparc64/spitfire.h
openbios-devel/arch/sparc64/switch.S
openbios-devel/arch/sparc64/sys_info.c
openbios-devel/arch/sparc64/tree.fs
openbios-devel/arch/sparc64/ttable.h
openbios-devel/arch/sparc64/vectors.S
openbios-devel/arch/sparc64/winfixup.S
openbios-devel/config/examples/cross-sparc64_config.xml
openbios-devel/config/examples/cross-sparc64_rules.xml
openbios-devel/config/examples/sparc64_config.xml
openbios-devel/config/examples/sparc64_rules.xml
openbios-devel/include/sparc64/
openbios-devel/include/sparc64/elf.h
openbios-devel/include/sparc64/io.h
openbios-devel/include/sparc64/types.h
Modified:
openbios-devel/arch/build.xml
Log:
initial sparc64 version
Modified: openbios-devel/arch/build.xml
===================================================================
--- openbios-devel/arch/build.xml 2006-06-10 01:31:30 UTC (rev 57)
+++ openbios-devel/arch/build.xml 2006-06-10 01:37:53 UTC (rev 58)
@@ -6,4 +6,5 @@
<include href="ia64/build.xml"/>
<include href="unix/build.xml"/>
<include href="sparc32/build.xml"/>
+ <include href="sparc64/build.xml"/>
</build>
Added: openbios-devel/arch/sparc64/asi.h
===================================================================
--- openbios-devel/arch/sparc64/asi.h (rev 0)
+++ openbios-devel/arch/sparc64/asi.h 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,145 @@
+/* $Id: asi.h,v 1.5 2001/03/29 11:47:47 davem Exp $ */
+#ifndef _SPARC64_ASI_H
+#define _SPARC64_ASI_H
+
+/* asi.h: Address Space Identifier values for the V9.
+ *
+ * Copyright (C) 1996 David S. Miller (davem(a)caip.rutgers.edu)
+ */
+
+/* V9 Architecture mandary ASIs. */
+#define ASI_N 0x04 /* Nucleus */
+#define ASI_NL 0x0c /* Nucleus, little endian */
+#define ASI_AIUP 0x10 /* Primary, user */
+#define ASI_AIUS 0x11 /* Secondary, user */
+#define ASI_AIUPL 0x18 /* Primary, user, little endian */
+#define ASI_AIUSL 0x19 /* Secondary, user, little endian */
+#define ASI_P 0x80 /* Primary, implicit */
+#define ASI_S 0x81 /* Secondary, implicit */
+#define ASI_PNF 0x82 /* Primary, no fault */
+#define ASI_SNF 0x83 /* Secondary, no fault */
+#define ASI_PL 0x88 /* Primary, implicit, l-endian */
+#define ASI_SL 0x89 /* Secondary, implicit, l-endian */
+#define ASI_PNFL 0x8a /* Primary, no fault, l-endian */
+#define ASI_SNFL 0x8b /* Secondary, no fault, l-endian */
+
+/* SpitFire and later extended ASIs. The "(III)" marker designates
+ * UltraSparc-III and later specific ASIs. The "(CMT)" marker designates
+ * Chip Multi Threading specific ASIs.
+ */
+#define ASI_PHYS_USE_EC 0x14 /* PADDR, E-cachable */
+#define ASI_PHYS_BYPASS_EC_E 0x15 /* PADDR, E-bit */
+#define ASI_PHYS_USE_EC_L 0x1c /* PADDR, E-cachable, little endian*/
+#define ASI_PHYS_BYPASS_EC_E_L 0x1d /* PADDR, E-bit, little endian */
+#define ASI_NUCLEUS_QUAD_LDD 0x24 /* Cachable, qword load */
+#define ASI_NUCLEUS_QUAD_LDD_L 0x2c /* Cachable, qword load, l-endian */
+#define ASI_PCACHE_DATA_STATUS 0x30 /* (III) PCache data stat RAM diag */
+#define ASI_PCACHE_DATA 0x31 /* (III) PCache data RAM diag */
+#define ASI_PCACHE_TAG 0x32 /* (III) PCache tag RAM diag */
+#define ASI_PCACHE_SNOOP_TAG 0x33 /* (III) PCache snoop tag RAM diag */
+#define ASI_QUAD_LDD_PHYS 0x34 /* (III+) PADDR, qword load */
+#define ASI_WCACHE_VALID_BITS 0x38 /* (III) WCache Valid Bits diag */
+#define ASI_WCACHE_DATA 0x39 /* (III) WCache data RAM diag */
+#define ASI_WCACHE_TAG 0x3a /* (III) WCache tag RAM diag */
+#define ASI_WCACHE_SNOOP_TAG 0x3b /* (III) WCache snoop tag RAM diag */
+#define ASI_QUAD_LDD_PHYS_L 0x3c /* (III+) PADDR, qw-load, l-endian */
+#define ASI_SRAM_FAST_INIT 0x40 /* (III+) Fast SRAM init */
+#define ASI_CORE_AVAILABLE 0x41 /* (CMT) LP Available */
+#define ASI_CORE_ENABLE_STAT 0x41 /* (CMT) LP Enable Status */
+#define ASI_CORE_ENABLE 0x41 /* (CMT) LP Enable RW */
+#define ASI_XIR_STEERING 0x41 /* (CMT) XIR Steering RW */
+#define ASI_CORE_RUNNING_RW 0x41 /* (CMT) LP Running RW */
+#define ASI_CORE_RUNNING_W1S 0x41 /* (CMT) LP Running Write-One Set */
+#define ASI_CORE_RUNNING_W1C 0x41 /* (CMT) LP Running Write-One Clr */
+#define ASI_CORE_RUNNING_STAT 0x41 /* (CMT) LP Running Status */
+#define ASI_CMT_ERROR_STEERING 0x41 /* (CMT) Error Steering RW */
+#define ASI_DCACHE_INVALIDATE 0x42 /* (III) DCache Invalidate diag */
+#define ASI_DCACHE_UTAG 0x43 /* (III) DCache uTag diag */
+#define ASI_DCACHE_SNOOP_TAG 0x44 /* (III) DCache snoop tag RAM diag */
+#define ASI_LSU_CONTROL 0x45 /* Load-store control unit */
+#define ASI_DCU_CONTROL_REG 0x45 /* (III) DCache Unit Control reg */
+#define ASI_DCACHE_DATA 0x46 /* DCache data-ram diag access */
+#define ASI_DCACHE_TAG 0x47 /* Dcache tag/valid ram diag access*/
+#define ASI_INTR_DISPATCH_STAT 0x48 /* IRQ vector dispatch status */
+#define ASI_INTR_RECEIVE 0x49 /* IRQ vector receive status */
+#define ASI_UPA_CONFIG 0x4a /* UPA config space */
+#define ASI_JBUS_CONFIG 0x4a /* (IIIi) JBUS Config Register */
+#define ASI_SAFARI_CONFIG 0x4a /* (III) Safari Config Register */
+#define ASI_SAFARI_ADDRESS 0x4a /* (III) Safari Address Register */
+#define ASI_ESTATE_ERROR_EN 0x4b /* E-cache error enable space */
+#define ASI_AFSR 0x4c /* Async fault status register */
+#define ASI_AFAR 0x4d /* Async fault address register */
+#define ASI_EC_TAG_DATA 0x4e /* E-cache tag/valid ram diag acc */
+#define ASI_IMMU 0x50 /* Insn-MMU main register space */
+#define ASI_IMMU_TSB_8KB_PTR 0x51 /* Insn-MMU 8KB TSB pointer reg */
+#define ASI_IMMU_TSB_64KB_PTR 0x52 /* Insn-MMU 64KB TSB pointer reg */
+#define ASI_ITLB_DATA_IN 0x54 /* Insn-MMU TLB data in reg */
+#define ASI_ITLB_DATA_ACCESS 0x55 /* Insn-MMU TLB data access reg */
+#define ASI_ITLB_TAG_READ 0x56 /* Insn-MMU TLB tag read reg */
+#define ASI_IMMU_DEMAP 0x57 /* Insn-MMU TLB demap */
+#define ASI_DMMU 0x58 /* Data-MMU main register space */
+#define ASI_DMMU_TSB_8KB_PTR 0x59 /* Data-MMU 8KB TSB pointer reg */
+#define ASI_DMMU_TSB_64KB_PTR 0x5a /* Data-MMU 16KB TSB pointer reg */
+#define ASI_DMMU_TSB_DIRECT_PTR 0x5b /* Data-MMU TSB direct pointer reg */
+#define ASI_DTLB_DATA_IN 0x5c /* Data-MMU TLB data in reg */
+#define ASI_DTLB_DATA_ACCESS 0x5d /* Data-MMU TLB data access reg */
+#define ASI_DTLB_TAG_READ 0x5e /* Data-MMU TLB tag read reg */
+#define ASI_DMMU_DEMAP 0x5f /* Data-MMU TLB demap */
+#define ASI_IIU_INST_TRAP 0x60 /* (III) Instruction Breakpoint */
+#define ASI_INTR_ID 0x63 /* (CMT) Interrupt ID register */
+#define ASI_CORE_ID 0x63 /* (CMT) LP ID register */
+#define ASI_CESR_ID 0x63 /* (CMT) CESR ID register */
+#define ASI_IC_INSTR 0x66 /* Insn cache instrucion ram diag */
+#define ASI_IC_TAG 0x67 /* Insn cache tag/valid ram diag */
+#define ASI_IC_STAG 0x68 /* (III) Insn cache snoop tag ram */
+#define ASI_IC_PRE_DECODE 0x6e /* Insn cache pre-decode ram diag */
+#define ASI_IC_NEXT_FIELD 0x6f /* Insn cache next-field ram diag */
+#define ASI_BRPRED_ARRAY 0x6f /* (III) Branch Prediction RAM diag*/
+#define ASI_BLK_AIUP 0x70 /* Primary, user, block load/store */
+#define ASI_BLK_AIUS 0x71 /* Secondary, user, block ld/st */
+#define ASI_MCU_CTRL_REG 0x72 /* (III) Memory controller regs */
+#define ASI_EC_DATA 0x74 /* (III) E-cache data staging reg */
+#define ASI_EC_CTRL 0x75 /* (III) E-cache control reg */
+#define ASI_EC_W 0x76 /* E-cache diag write access */
+#define ASI_UDB_ERROR_W 0x77 /* External UDB error regs W */
+#define ASI_UDB_CONTROL_W 0x77 /* External UDB control regs W */
+#define ASI_INTR_W 0x77 /* IRQ vector dispatch write */
+#define ASI_INTR_DATAN_W 0x77 /* (III) Out irq vector data reg N */
+#define ASI_INTR_DISPATCH_W 0x77 /* (III) Interrupt vector dispatch */
+#define ASI_BLK_AIUPL 0x78 /* Primary, user, little, blk ld/st*/
+#define ASI_BLK_AIUSL 0x79 /* Secondary, user, little, blk ld/st*/
+#define ASI_EC_R 0x7e /* E-cache diag read access */
+#define ASI_UDBH_ERROR_R 0x7f /* External UDB error regs rd hi */
+#define ASI_UDBL_ERROR_R 0x7f /* External UDB error regs rd low */
+#define ASI_UDBH_CONTROL_R 0x7f /* External UDB control regs rd hi */
+#define ASI_UDBL_CONTROL_R 0x7f /* External UDB control regs rd low*/
+#define ASI_INTR_R 0x7f /* IRQ vector dispatch read */
+#define ASI_INTR_DATAN_R 0x7f /* (III) In irq vector data reg N */
+#define ASI_PST8_P 0xc0 /* Primary, 8 8-bit, partial */
+#define ASI_PST8_S 0xc1 /* Secondary, 8 8-bit, partial */
+#define ASI_PST16_P 0xc2 /* Primary, 4 16-bit, partial */
+#define ASI_PST16_S 0xc3 /* Secondary, 4 16-bit, partial */
+#define ASI_PST32_P 0xc4 /* Primary, 2 32-bit, partial */
+#define ASI_PST32_S 0xc5 /* Secondary, 2 32-bit, partial */
+#define ASI_PST8_PL 0xc8 /* Primary, 8 8-bit, partial, L */
+#define ASI_PST8_SL 0xc9 /* Secondary, 8 8-bit, partial, L */
+#define ASI_PST16_PL 0xca /* Primary, 4 16-bit, partial, L */
+#define ASI_PST16_SL 0xcb /* Secondary, 4 16-bit, partial, L */
+#define ASI_PST32_PL 0xcc /* Primary, 2 32-bit, partial, L */
+#define ASI_PST32_SL 0xcd /* Secondary, 2 32-bit, partial, L */
+#define ASI_FL8_P 0xd0 /* Primary, 1 8-bit, fpu ld/st */
+#define ASI_FL8_S 0xd1 /* Secondary, 1 8-bit, fpu ld/st */
+#define ASI_FL16_P 0xd2 /* Primary, 1 16-bit, fpu ld/st */
+#define ASI_FL16_S 0xd3 /* Secondary, 1 16-bit, fpu ld/st */
+#define ASI_FL8_PL 0xd8 /* Primary, 1 8-bit, fpu ld/st, L */
+#define ASI_FL8_SL 0xd9 /* Secondary, 1 8-bit, fpu ld/st, L*/
+#define ASI_FL16_PL 0xda /* Primary, 1 16-bit, fpu ld/st, L */
+#define ASI_FL16_SL 0xdb /* Secondary, 1 16-bit, fpu ld/st,L*/
+#define ASI_BLK_COMMIT_P 0xe0 /* Primary, blk store commit */
+#define ASI_BLK_COMMIT_S 0xe1 /* Secondary, blk store commit */
+#define ASI_BLK_P 0xf0 /* Primary, blk ld/st */
+#define ASI_BLK_S 0xf1 /* Secondary, blk ld/st */
+#define ASI_BLK_PL 0xf8 /* Primary, blk ld/st, little */
+#define ASI_BLK_SL 0xf9 /* Secondary, blk ld/st, little */
+
+#endif /* _SPARC64_ASI_H */
Added: openbios-devel/arch/sparc64/boot.c
===================================================================
--- openbios-devel/arch/sparc64/boot.c (rev 0)
+++ openbios-devel/arch/sparc64/boot.c 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,82 @@
+/*
+ *
+ */
+#undef BOOTSTRAP
+#include "openbios/config.h"
+#include "openbios/bindings.h"
+#include "openbios/elfload.h"
+#include "openbios/nvram.h"
+#include "libc/diskio.h"
+#include "sys_info.h"
+
+int elf_load(struct sys_info *, const char *filename, const char *cmdline);
+int aout_load(struct sys_info *, const char *filename, const char *cmdline);
+int linux_load(struct sys_info *, const char *filename, const char *cmdline);
+
+void boot(void);
+
+struct sys_info sys_info;
+uint32_t kernel_image;
+uint32_t kernel_size;
+uint32_t cmdline;
+uint32_t cmdline_size;
+char boot_device;
+
+void boot(void)
+{
+ char *path=pop_fstr_copy(), *param;
+ char altpath[256];
+
+ if (kernel_size) {
+ int (*entry)(const void *romvec, int p2, int p3, int p4, int p5);
+
+ printk("[sparc64] Kernel already loaded\n");
+ entry = (void *) kernel_image;
+ entry(0, 0, 0, 0, 0);
+ }
+
+ if(!path) {
+ switch(boot_device) {
+ case 'a':
+ path = "/obio/SUNW,fdtwo";
+ break;
+ case 'c':
+ path = "disk";
+ break;
+ default:
+ case 'd':
+ path = "cdrom";
+ break;
+ case 'n':
+ path = "net";
+ break;
+ }
+ }
+
+ param = strchr(path, ' ');
+ if(param) {
+ *param = '\0';
+ param++;
+ } else if (cmdline_size) {
+ param = (char *)cmdline;
+ }
+
+ printk("[sparc64] Booting file '%s' ", path);
+ if(param)
+ printk("with parameters '%s'\n", param);
+ else
+ printk("without parameters.\n");
+
+
+ if (elf_load(&sys_info, path, param) == LOADER_NOT_SUPPORT)
+ if (linux_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) {
+
+ sprintf(altpath, "%s:d", path);
+
+ if (elf_load(&sys_info, altpath, param) == LOADER_NOT_SUPPORT)
+ if (linux_load(&sys_info, altpath, param) == LOADER_NOT_SUPPORT)
+ printk("Unsupported image format\n");
+ }
+
+ free(path);
+}
Added: openbios-devel/arch/sparc64/boot.h
===================================================================
--- openbios-devel/arch/sparc64/boot.h (rev 0)
+++ openbios-devel/arch/sparc64/boot.h 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,14 @@
+/* tag: openbios loader prototypes for sparc64
+ *
+ * Copyright (C) 2004 Stefan Reinauer
+ *
+ * See the file "COPYING" for further information about
+ * the copyright and warranty status of this work.
+ */
+
+int forth_load(struct sys_info *info, const char *filename, const char *cmdline);
+int elf_load(struct sys_info *info, const char *filename, const char *cmdline);
+int linux_load(struct sys_info *info, const char *file, const char *cmdline);
+
+unsigned int start_elf(unsigned long entry_point, unsigned long param);
+
Added: openbios-devel/arch/sparc64/build.xml
===================================================================
--- openbios-devel/arch/sparc64/build.xml (rev 0)
+++ openbios-devel/arch/sparc64/build.xml 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,108 @@
+<build condition="SPARC64">
+
+ <dictionary name="openbios-sparc64" init="openbios">
+ <object source="tree.fs" target="forth"/>
+ <object source="init.fs" target="forth"/>
+ </dictionary>
+
+ <library name="sparc64" type="static" target="target">
+ <object source="openbios.c"/>
+ <object source="console.c"/>
+ <object source="lib.c"/>
+ <object source="boot.c"/>
+ <object source="context.c"/>
+ <object source="switch.S"/>
+ <object source="linux_load.c"/>
+ <object source="sys_info.c"/>
+ <object source="elfload.c"/>
+ <object source="forthload.c"/>
+ <object source="loadfs.c"/>
+ </library>
+
+ <executable name="target/arch/sparc64/entry.o" target="target">
+ <rule><![CDATA[
+ $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc64/entry.S
+ ]]></rule>
+ </executable>
+ <executable name="target/arch/sparc64/vectors.o" target="target">
+ <rule><![CDATA[
+ $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc64/vectors.S
+ ]]></rule>
+ </executable>
+
+ <executable name="openbios.multiboot" target="target" condition="IMAGE_ELF_MULTIBOOT">
+ <rule>
+ $(LD) -T arch/sparc64/ldscript -o $@.nostrip $^
+ $(NM) $@.nostrip | sort > $(ODIR)/openbios-multiboot.syms
+ cp $@.nostrip $@
+ $(STRIP) $@
+ </rule>
+ <object source="multiboot.c"/>
+ <external-object source="target/arch/sparc64/vectors.o"/>
+ <external-object source="target/arch/sparc64/entry.o"/>
+ <external-object source="libsparc64.a"/>
+ <external-object source="libbootstrap.a"/>
+ <external-object source="libmodules.a"/>
+ <external-object source="libdrivers.a"/>
+ <external-object source="liblibc.a"/>
+ <external-object source="libfs.a"/>
+ </executable>
+
+ <executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF">
+ <rule>
+ $(LD) -T arch/sparc64/ldscript -o $@.nostrip $^
+ $(NM) $@.nostrip | sort > $(ODIR)/openbios-plain.syms
+ cp $@.nostrip $@
+ $(STRIP) $@
+ </rule>
+ <object source="plainboot.c"/>
+ <external-object source="target/arch/sparc64/vectors.o"/>
+ <external-object source="target/arch/sparc64/entry.o"/>
+ <external-object source="libsparc64.a"/>
+ <external-object source="libbootstrap.a"/>
+ <external-object source="libmodules.a"/>
+ <external-object source="libdrivers.a"/>
+ <external-object source="liblibc.a"/>
+ <external-object source="libfs.a"/>
+ </executable>
+
+ <!-- HACK ALERT -->
+
+ <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED">
+ <rule><![CDATA[
+ @echo "static const char forth_dictionary[] = {" > $@
+ @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \
+ | sed 's/0x ,//g' >> $@
+ @echo "};" >> $@
+ ]]></rule>
+ <external-object source="openbios-sparc64.dict"/>
+ </executable>
+
+ <executable name="target/arch/sparc64/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED">
+ <rule><![CDATA[
+ $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc64/builtin.c
+ ]]></rule>
+ <external-object source="target/include/static-dict.h"/>
+ </executable>
+
+ <!-- END OF HACK ALERT -->
+
+ <executable name="openbios-builtin.elf" target="target" condition="IMAGE_ELF_EMBEDDED">
+ <rule>
+ $(LD) -T arch/sparc64/ldscript -o $@.nostrip $^
+ $(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms
+ cp $@.nostrip $@
+ $(STRIP) $@
+ </rule>
+ <external-object source="target/arch/sparc64/vectors.o"/>
+ <external-object source="target/arch/sparc64/entry.o"/>
+ <external-object source="target/arch/sparc64/builtin.o"/>
+ <external-object source="libsparc64.a"/>
+ <external-object source="libbootstrap.a"/>
+ <external-object source="libmodules.a"/>
+ <external-object source="libdrivers.a"/>
+ <external-object source="liblibc.a"/>
+ <external-object source="libfs.a"/>
+ </executable>
+
+</build>
Added: openbios-devel/arch/sparc64/builtin.c
===================================================================
--- openbios-devel/arch/sparc64/builtin.c (rev 0)
+++ openbios-devel/arch/sparc64/builtin.c 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,26 @@
+/* tag: openbios forth starter for builtin dictionary for sparc64
+ *
+ * Copyright (C) 2003 Stefan Reinauer
+ *
+ * See the file "COPYING" for further information about
+ * the copyright and warranty status of this work.
+ */
+
+#include "openbios/config.h"
+#include <asm/types.h>
+#include "sys_info.h"
+
+/*
+ * wrap an array around the hex'ed dictionary file
+ */
+
+#include "static-dict.h"
+
+void collect_multiboot_info(struct sys_info *info);
+void collect_multiboot_info(struct sys_info *info)
+{
+ info->dict_start=(unsigned long *)forth_dictionary;
+ info->dict_end=(unsigned long *)((ucell)forth_dictionary +
+ sizeof(forth_dictionary));
+}
+
Added: openbios-devel/arch/sparc64/console.c
===================================================================
--- openbios-devel/arch/sparc64/console.c (rev 0)
+++ openbios-devel/arch/sparc64/console.c 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,406 @@
+/*
+ * Copyright (C) 2003, 2004 Stefan Reinauer
+ *
+ * See the file "COPYING" for further information about
+ * the copyright and warranty status of this work.
+ */
+
+#include "openbios/config.h"
+#include "openbios/kernel.h"
+#include "openbios.h"
+
+#ifdef CONFIG_DEBUG_CONSOLE
+
+/* ******************************************************************
+ * serial console functions
+ * ****************************************************************** */
+
+#ifdef CONFIG_DEBUG_CONSOLE_SERIAL
+
+#define RBR(x) x==2?0x2f8:0x3f8
+#define THR(x) x==2?0x2f8:0x3f8
+#define IER(x) x==2?0x2f9:0x3f9
+#define IIR(x) x==2?0x2fa:0x3fa
+#define LCR(x) x==2?0x2fb:0x3fb
+#define MCR(x) x==2?0x2fc:0x3fc
+#define LSR(x) x==2?0x2fd:0x3fd
+#define MSR(x) x==2?0x2fe:0x3fe
+#define SCR(x) x==2?0x2ff:0x3ff
+#define DLL(x) x==2?0x2f8:0x3f8
+#define DLM(x) x==2?0x2f9:0x3f9
+
+static int uart_charav(int port)
+{
+ return ((inb(LSR(port)) & 1) != 0);
+}
+
+static char uart_getchar(int port)
+{
+ while (!uart_charav(port));
+ return ((char) inb(RBR(port)) & 0177);
+}
+
+static void uart_putchar(int port, unsigned char c)
+{
+ if (c == '\n')
+ uart_putchar(port, '\r');
+ while (!(inb(LSR(port)) & 0x20));
+ outb(c, THR(port));
+}
+
+static void uart_init_line(int port, unsigned long baud)
+{
+ int i, baudconst;
+
+ switch (baud) {
+ case 115200:
+ baudconst = 1;
+ break;
+ case 57600:
+ baudconst = 2;
+ break;
+ case 38400:
+ baudconst = 3;
+ break;
+ case 19200:
+ baudconst = 6;
+ break;
+ case 9600:
+ default:
+ baudconst = 12;
+ break;
+ }
+
+ outb(0x87, LCR(port));
+ outb(0x00, DLM(port));
+ outb(baudconst, DLL(port));
+ outb(0x07, LCR(port));
+ outb(0x0f, MCR(port));
+
+ for (i = 10; i > 0; i--) {
+ if (inb(LSR(port)) == (unsigned int) 0)
+ break;
+ inb(RBR(port));
+ }
+}
+
+static void serial_cls(void);
+static void serial_putchar(int c);
+
+int uart_init(int port, unsigned long speed)
+{
+ uart_init_line(port, speed);
+ return -1;
+}
+
+static void serial_putchar(int c)
+{
+ uart_putchar(CONFIG_SERIAL_PORT, (unsigned char) (c & 0xff));
+}
+
+static void serial_cls(void)
+{
+ serial_putchar(27);
+ serial_putchar('[');
+ serial_putchar('H');
+ serial_putchar(27);
+ serial_putchar('[');
+ serial_putchar('J');
+}
+
+#endif
+
+/* ******************************************************************
+ * simple polling video/keyboard console functions
+ * ****************************************************************** */
+
+#ifdef CONFIG_DEBUG_CONSOLE_VGA
+
+/* raw vga text mode */
+#define COLUMNS 80 /* The number of columns. */
+#define LINES 25 /* The number of lines. */
+#define ATTRIBUTE 7 /* The attribute of an character. */
+
+#define APB_MEM_BASE 0x1ff00000000ULL
+#define VGA_BASE (APB_MEM_BASE + 0x4b8000ULL) /* The video memory address. */
+
+/* VGA Index and Data Registers */
+#define VGA_REG_INDEX 0x03D4 /* VGA index register */
+#define VGA_REG_DATA 0x03D5 /* VGA data register */
+
+#define VGA_IDX_CURMSL 0x09 /* cursor maximum scan line */
+#define VGA_IDX_CURSTART 0x0A /* cursor start */
+#define VGA_IDX_CUREND 0x0B /* cursor end */
+#define VGA_IDX_CURLO 0x0F /* cursor position (low 8 bits) */
+#define VGA_IDX_CURHI 0x0E /* cursor position (high 8 bits) */
+
+/* Save the X and Y position. */
+static int xpos, ypos;
+/* Point to the video memory. */
+static volatile unsigned char *video = (unsigned char *) VGA_BASE;
+
+static void video_initcursor(void)
+{
+ u8 val;
+ outb(VGA_IDX_CURMSL, VGA_REG_INDEX);
+ val = inb(VGA_REG_DATA) & 0x1f; /* maximum scan line -1 */
+
+ outb(VGA_IDX_CURSTART, VGA_REG_INDEX);
+ outb(0, VGA_REG_DATA);
+
+ outb(VGA_IDX_CUREND, VGA_REG_INDEX);
+ outb(val, VGA_REG_DATA);
+}
+
+
+
+static void video_poscursor(unsigned int x, unsigned int y)
+{
+ unsigned short pos;
+
+ /* Calculate new cursor position as a function of x and y */
+ pos = (y * COLUMNS) + x;
+
+ /* Output the new position to VGA card */
+ outb(VGA_IDX_CURLO, VGA_REG_INDEX); /* output low 8 bits */
+ outb((u8) (pos), VGA_REG_DATA);
+ outb(VGA_IDX_CURHI, VGA_REG_INDEX); /* output high 8 bits */
+ outb((u8) (pos >> 8), VGA_REG_DATA);
+
+};
+
+
+static void video_newline(void)
+{
+ xpos = 0;
+
+ if (ypos < LINES - 1) {
+ ypos++;
+ } else {
+ int i;
+ memmove((void *) video, (void *) (video + 2 * COLUMNS),
+ (LINES - 1) * COLUMNS * 2);
+
+ for (i = ((LINES - 1) * 2 * COLUMNS);
+ i < 2 * COLUMNS * LINES;) {
+ video[i++] = 0;
+ video[i++] = ATTRIBUTE;
+ }
+ }
+
+}
+
+/* Put the character C on the screen. */
+static void video_putchar(int c)
+{
+ int p=1;
+
+ if (c == '\n' || c == '\r') {
+ video_newline();
+ return;
+ }
+
+ if (c == '\b') {
+ if (xpos) xpos--;
+ c=' ';
+ p=0;
+ }
+
+
+ if (xpos >= COLUMNS)
+ video_newline();
+
+ *(video + (xpos + ypos * COLUMNS) * 2) = c & 0xFF;
+ *(video + (xpos + ypos * COLUMNS) * 2 + 1) = ATTRIBUTE;
+
+ if (p)
+ xpos++;
+
+ video_poscursor(xpos, ypos);
+}
+
+static void video_cls(void)
+{
+ int i;
+
+ for (i = 0; i < 2 * COLUMNS * LINES;) {
+ video[i++] = 0;
+ video[i++] = ATTRIBUTE;
+ }
+
+
+ xpos = 0;
+ ypos = 0;
+
+ video_initcursor();
+ video_poscursor(xpos, ypos);
+}
+
+void video_init(void)
+{
+ video=(unsigned char *)VGA_BASE;
+}
+
+/*
+ * keyboard driver
+ */
+
+static const char normal[] = {
+ 0x0, 0x1b, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-',
+ '=', '\b', '\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o',
+ 'p', '[', ']', 0xa, 0x0, 'a', 's', 'd', 'f', 'g', 'h', 'j',
+ 'k', 'l', ';', 0x27, 0x60, 0x0, 0x5c, 'z', 'x', 'c', 'v', 'b',
+ 'n', 'm', ',', '.', '/', 0x0, '*', 0x0, ' ', 0x0, 0x0, 0x0,
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, '0', 0x7f
+};
+
+static const char shifted[] = {
+ 0x0, 0x1b, '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_',
+ '+', '\b', '\t', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O',
+ 'P', '{', '}', 0xa, 0x0, 'A', 'S', 'D', 'F', 'G', 'H', 'J',
+ 'K', 'L', ':', 0x22, '~', 0x0, '|', 'Z', 'X', 'C', 'V', 'B',
+ 'N', 'M', '<', '>', '?', 0x0, '*', 0x0, ' ', 0x0, 0x0, 0x0,
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, '7', '8',
+ '9', 0x0, '4', '5', '6', 0x0, '1', '2', '3', '0', 0x7f
+};
+
+static int key_ext;
+static int key_lshift = 0, key_rshift = 0, key_caps = 0;
+
+static char last_key;
+
+static void keyboard_cmd(unsigned char cmd, unsigned char val)
+{
+ outb(cmd, 0x60);
+ /* wait until keyboard controller accepts cmds: */
+ while (inb(0x64) & 2);
+ outb(val, 0x60);
+ while (inb(0x64) & 2);
+}
+
+static char keyboard_poll(void)
+{
+ unsigned int c;
+ if (inb(0x64) & 1) {
+ c = inb(0x60);
+ switch (c) {
+ case 0xe0:
+ key_ext = 1;
+ return 0;
+ case 0x2a:
+ key_lshift = 1;
+ return 0;
+ case 0x36:
+ key_rshift = 1;
+ return 0;
+ case 0xaa:
+ key_lshift = 0;
+ return 0;
+ case 0xb6:
+ key_rshift = 0;
+ return 0;
+ case 0x3a:
+ if (key_caps) {
+ key_caps = 0;
+ keyboard_cmd(0xed, 0);
+ } else {
+ key_caps = 1;
+ keyboard_cmd(0xed, 4); /* set caps led */
+ }
+ return 0;
+ }
+
+ if (key_ext) {
+ // void printk(const char *format, ...);
+ printk("extended keycode: %x\n", c);
+
+ key_ext = 0;
+ return 0;
+ }
+
+ if (c & 0x80) /* unhandled key release */
+ return 0;
+
+ if (key_lshift || key_rshift)
+ return key_caps ? normal[c] : shifted[c];
+ else
+ return key_caps ? shifted[c] : normal[c];
+ }
+ return 0;
+}
+
+static int keyboard_dataready(void)
+{
+ if (last_key)
+ return 1;
+
+ last_key = keyboard_poll();
+
+ return (last_key != 0);
+}
+
+static unsigned char keyboard_readdata(void)
+{
+ char tmp;
+ while (!keyboard_dataready());
+ tmp = last_key;
+ last_key = 0;
+ return tmp;
+}
+#endif
+
+
+/* ******************************************************************
+ * common functions, implementing simple concurrent console
+ * ****************************************************************** */
+
+int putchar(int c)
+{
+#ifdef CONFIG_DEBUG_CONSOLE_SERIAL
+ serial_putchar(c);
+#endif
+#ifdef CONFIG_DEBUG_CONSOLE_VGA
+ video_putchar(c);
+#endif
+ return c;
+}
+
+int availchar(void)
+{
+#ifdef CONFIG_DEBUG_CONSOLE_SERIAL
+ if (uart_charav(CONFIG_SERIAL_PORT))
+ return 1;
+#endif
+#ifdef CONFIG_DEBUG_CONSOLE_VGA
+ if (keyboard_dataready())
+ return 1;
+#endif
+ return 0;
+}
+
+int getchar(void)
+{
+#ifdef CONFIG_DEBUG_CONSOLE_SERIAL
+ if (uart_charav(CONFIG_SERIAL_PORT))
+ return (uart_getchar(CONFIG_SERIAL_PORT));
+#endif
+#ifdef CONFIG_DEBUG_CONSOLE_VGA
+ if (keyboard_dataready())
+ return (keyboard_readdata());
+#endif
+ return 0;
+}
+
+void cls(void)
+{
+#ifdef CONFIG_DEBUG_CONSOLE_SERIAL
+ serial_cls();
+#endif
+#ifdef CONFIG_DEBUG_CONSOLE_VGA
+ video_cls();
+#endif
+}
+
+
+#endif // CONFIG_DEBUG_CONSOLE
Added: openbios-devel/arch/sparc64/const.h
===================================================================
--- openbios-devel/arch/sparc64/const.h (rev 0)
+++ openbios-devel/arch/sparc64/const.h 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,19 @@
+/* const.h: Macros for dealing with constants. */
+
+#ifndef _SPARC64_CONST_H
+#define _SPARC64_CONST_H
+
+/* Some constant macros are used in both assembler and
+ * C code. Therefore we cannot annotate them always with
+ * 'UL' and other type specificers unilaterally. We
+ * use the following macros to deal with this.
+ */
+
+#ifdef __ASSEMBLY__
+#define _AC(X,Y) X
+#else
+#define _AC(X,Y) (X##Y)
+#endif
+
+
+#endif /* !(_SPARC64_CONST_H) */
Added: openbios-devel/arch/sparc64/context.c
===================================================================
--- openbios-devel/arch/sparc64/context.c (rev 0)
+++ openbios-devel/arch/sparc64/context.c 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,109 @@
+/*
+ * context switching
+ * 2003-10 by SONE Takeshi
+ */
+
+#include "openbios/config.h"
+#include "openbios/kernel.h"
+#include "context.h"
+
+#define MAIN_STACK_SIZE 16384
+#define IMAGE_STACK_SIZE 4096
+
+#define debug printk
+
+static void start_main(void); /* forward decl. */
+void __exit_context(void); /* assembly routine */
+
+/*
+ * Main context structure
+ * It is placed at the bottom of our stack, and loaded by assembly routine
+ * to start us up.
+ */
+struct context main_ctx = {
+ .regs[REG_SP] = (uint64_t) &_estack - 96,
+ .pc = (uint64_t) start_main,
+ .npc = (uint64_t) start_main + 4,
+ .return_addr = (uint64_t) __exit_context,
+};
+
+/* This is used by assembly routine to load/store the context which
+ * it is to switch/switched. */
+struct context *__context = &main_ctx;
+
+/* Stack for loaded ELF image */
+static uint8_t image_stack[IMAGE_STACK_SIZE];
+
+/* Pointer to startup context (physical address) */
+unsigned long __boot_ctx;
+
+/*
+ * Main starter
+ * This is the C function that runs first.
+ */
+static void start_main(void)
+{
+ int retval;
+ extern int openbios(void);
+
+ /* Save startup context, so we can refer to it later.
+ * We have to keep it in physical address since we will relocate. */
+ __boot_ctx = virt_to_phys(__context);
+
+ /* Start the real fun */
+ retval = openbios();
+
+ /* Pass return value to startup context. Bootloader may see it. */
+ //boot_ctx->eax = retval;
+
+ /* Returning from here should jump to __exit_context */
+ __context = boot_ctx;
+}
+
+/* Setup a new context using the given stack.
+ */
+struct context *
+init_context(uint8_t *stack, uint64_t stack_size, int num_params)
+{
+ struct context *ctx;
+
+ ctx = (struct context *)
+ (stack + stack_size - (sizeof(*ctx) + num_params*sizeof(uint32_t)));
+ memset(ctx, 0, sizeof(*ctx));
+
+ /* Fill in reasonable default for flat memory model */
+ ctx->regs[REG_SP] = virt_to_phys(SP_LOC(ctx));
+ ctx->return_addr = virt_to_phys(__exit_context);
+
+ return ctx;
+}
+
+/* Switch to another context. */
+struct context *switch_to(struct context *ctx)
+{
+ struct context *save, *ret;
+
+ debug("switching to new context:\n");
+ save = __context;
+ __context = ctx;
+ //asm ("pushl %cs; call __switch_context");
+ ret = __context;
+ __context = save;
+ return ret;
+}
+
+/* Start ELF Boot image */
+uint64_t start_elf(uint64_t entry_point, uint64_t param)
+{
+ struct context *ctx;
+
+ ctx = init_context(image_stack, sizeof image_stack, 1);
+ ctx->pc = entry_point;
+ ctx->param[0] = param;
+ //ctx->eax = 0xe1fb007;
+ //ctx->ebx = param;
+
+ ctx = switch_to(ctx);
+ //return ctx->eax;
+ return 0;
+}
Added: openbios-devel/arch/sparc64/context.h
===================================================================
--- openbios-devel/arch/sparc64/context.h (rev 0)
+++ openbios-devel/arch/sparc64/context.h 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,31 @@
+#ifndef SPARC64_CONTEXT_H
+#define SPARC64_CONTEXT_H
+
+struct context {
+ /* General registers */
+ uint64_t regs[32];
+ uint64_t pc;
+ uint64_t npc;
+#define REG_O0 8
+#define REG_SP 14
+#define SP_LOC(ctx) (&(ctx)->regs[REG_SP])
+ /* Flags */
+ /* Optional stack contents */
+ uint64_t return_addr;
+ uint64_t param[0];
+};
+
+/* Create a new context in the given stack */
+struct context *
+init_context(uint8_t *stack, uint64_t stack_size, int num_param);
+
+/* Switch context */
+struct context *switch_to(struct context *);
+
+/* Holds physical address of boot context */
+extern unsigned long __boot_ctx;
+
+/* This can always be safely used to refer to the boot context */
+#define boot_ctx ((struct context *) phys_to_virt(__boot_ctx))
+
+#endif /* SPARC64_CONTEXT_H */
Added: openbios-devel/arch/sparc64/elfload.c
===================================================================
--- openbios-devel/arch/sparc64/elfload.c (rev 0)
+++ openbios-devel/arch/sparc64/elfload.c 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,416 @@
+/* ELF Boot loader
+ * As we have seek, this implementation can be straightforward.
+ * 2003-07 by SONE Takeshi
+ */
+
+#include "openbios/config.h"
+#include "openbios/kernel.h"
+#include "openbios/elf.h"
+#include "asm/elf.h"
+#include "elf_boot.h"
+#include "sys_info.h"
+#include "ipchecksum.h"
+#include "loadfs.h"
+#define printf printk
+#define debug printk
+
+extern unsigned int start_elf(unsigned long entry_point, unsigned long param);
+#define addr_fixup(addr) ((addr) & 0x00ffffff)
+
+static char *image_name, *image_version;
+const char *program_name, *program_version;
+
+static void *calloc(size_t nmemb, size_t size)
+{
+ size_t alloc_size = nmemb * size;
+ void *mem;
+
+ if (alloc_size < nmemb || alloc_size < size) {
+ printf("calloc overflow: %u, %u\n", nmemb, size);
+ return 0;
+ }
+
+ mem = malloc(alloc_size);
+ memset(mem, 0, alloc_size);
+
+ return mem;
+}
+
+
+static int check_mem_ranges(struct sys_info *info,
+ Elf_phdr *phdr, int phnum)
+{
+ int i, j;
+ unsigned long start, end;
+ unsigned long prog_start, prog_end;
+ struct memrange *mem;
+
+ prog_start = virt_to_phys(&_start);
+ prog_end = virt_to_phys(&_end);
+
+ for (i = 0; i < phnum; i++) {
+ if (phdr[i].p_type != PT_LOAD)
+ continue;
+ start = addr_fixup(phdr[i].p_paddr);
+ end = start + phdr[i].p_memsz;
+ if (start < prog_start && end > prog_start)
+ goto conflict;
+ if (start < prog_end && end > prog_end)
+ goto conflict;
+ mem=info->memrange;
+ for (j = 0; j < info->n_memranges; j++) {
+ if (mem[j].base <= start && mem[j].base + mem[j].size >= end)
+ break;
+ }
+ if (j >= info->n_memranges)
+ goto badseg;
+ }
+ return 1;
+
+conflict:
+ printf("%s occupies [%#lx-%#lx]\n", program_name, prog_start, prog_end);
+
+badseg:
+ printf("Segment %d [%#lx-%#lx] doesn't fit into memory\n", i, start, end-1);
+ return 0;
+}
+
+static unsigned long process_image_notes(Elf_phdr *phdr, int phnum,
+ unsigned short *sum_ptr,
+ unsigned int offset)
+{
+ int i;
+ char *buf = NULL;
+ int retval = 0;
+ unsigned long addr, end;
+ Elf_Nhdr *nhdr;
+ const char *name;
+ void *desc;
+
+ for (i = 0; i < phnum; i++) {
+ if (phdr[i].p_type != PT_NOTE)
+ continue;
+ buf = malloc(phdr[i].p_filesz);
+ file_seek(offset + phdr[i].p_offset);
+ if (lfile_read(buf, phdr[i].p_filesz) != phdr[i].p_filesz) {
+ printf("Can't read note segment\n");
+ goto out;
+ }
+ addr = (unsigned long) buf;
+ end = addr + phdr[i].p_filesz;
+ while (addr < end) {
+ nhdr = (Elf_Nhdr *) addr;
+ addr += sizeof(Elf_Nhdr);
+ name = (const char *) addr;
+ addr += (nhdr->n_namesz+3) & ~3;
+ desc = (void *) addr;
+ addr += (nhdr->n_descsz+3) & ~3;
+
+ if (nhdr->n_namesz==sizeof(ELF_NOTE_BOOT)
+ && memcmp(name, ELF_NOTE_BOOT, sizeof(ELF_NOTE_BOOT))==0) {
+ if (nhdr->n_type == EIN_PROGRAM_NAME) {
+ image_name = calloc(1, nhdr->n_descsz + 1);
+ memcpy(image_name, desc, nhdr->n_descsz);
+ }
+ if (nhdr->n_type == EIN_PROGRAM_VERSION) {
+ image_version = calloc(1, nhdr->n_descsz + 1);
+ memcpy(image_version, desc, nhdr->n_descsz);
+ }
+ if (nhdr->n_type == EIN_PROGRAM_CHECKSUM) {
+ *sum_ptr = *(unsigned short *) desc;
+ debug("Image checksum: %#04x\n", *sum_ptr);
+ /* Where in the file */
+ retval = phdr[i].p_offset
+ + (unsigned long) desc - (unsigned long) buf;
+ }
+ }
+ }
+ }
+out:
+ file_close();
+ if (buf)
+ free(buf);
+ return retval;
+}
+
+static int load_segments(Elf_phdr *phdr, int phnum,
+ unsigned long checksum_offset,
+ unsigned int offset)
+{
+ unsigned long bytes;
+ //unsigned int start_time, time;
+ int i;
+
+ bytes = 0;
+ // start_time = currticks();
+ for (i = 0; i < phnum; i++) {
+ if (phdr[i].p_type != PT_LOAD)
+ continue;
+ debug("segment %d addr:%#lx file:%#lx mem:%#lx ",
+ i, addr_fixup(phdr[i].p_paddr), phdr[i].p_filesz, phdr[i].p_memsz);
+ file_seek(offset + phdr[i].p_offset);
+ debug("loading... ");
+ if (lfile_read(phys_to_virt(addr_fixup(phdr[i].p_paddr)), phdr[i].p_filesz)
+ != phdr[i].p_filesz) {
+ printf("Can't read program segment %d\n", i);
+ return 0;
+ }
+ bytes += phdr[i].p_filesz;
+ debug("clearing... ");
+ memset(phys_to_virt(addr_fixup(phdr[i].p_paddr) + phdr[i].p_filesz), 0,
+ phdr[i].p_memsz - phdr[i].p_filesz);
+ if (phdr[i].p_offset <= checksum_offset
+ && phdr[i].p_offset + phdr[i].p_filesz >= checksum_offset+2) {
+ debug("clearing checksum... ");
+ memset(phys_to_virt(addr_fixup(phdr[i].p_paddr) + checksum_offset
+ - phdr[i].p_offset), 0, 2);
+ }
+ debug("ok\n");
+
+ }
+ // time = currticks() - start_time;
+ //debug("Loaded %lu bytes in %ums (%luKB/s)\n", bytes, time,
+ // time? bytes/time : 0);
+ debug("Loaded %lu bytes \n", bytes);
+
+ return 1;
+}
+
+static int verify_image(Elf_ehdr *ehdr, Elf_phdr *phdr, int phnum,
+ unsigned short image_sum)
+{
+ unsigned short sum, part_sum;
+ unsigned long offset;
+ int i;
+
+ sum = 0;
+ offset = 0;
+
+ part_sum = ipchksum(ehdr, sizeof *ehdr);
+ sum = add_ipchksums(offset, sum, part_sum);
+ offset += sizeof *ehdr;
+
+ part_sum = ipchksum(phdr, phnum * sizeof(*phdr));
+ sum = add_ipchksums(offset, sum, part_sum);
+ offset += phnum * sizeof(*phdr);
+
+ for (i = 0; i < phnum; i++) {
+ if (phdr[i].p_type != PT_LOAD)
+ continue;
+ part_sum = ipchksum(phys_to_virt(addr_fixup(phdr[i].p_paddr)), phdr[i].p_memsz);
+ sum = add_ipchksums(offset, sum, part_sum);
+ offset += phdr[i].p_memsz;
+ }
+
+ if (sum != image_sum) {
+ printf("Verify FAILED (image:%#04x vs computed:%#04x)\n",
+ image_sum, sum);
+ return 0;
+ }
+ return 1;
+}
+
+static inline unsigned padded(unsigned s)
+{
+ return (s + 3) & ~3;
+}
+
+static Elf_Bhdr *add_boot_note(Elf_Bhdr *bhdr, const char *name,
+ unsigned type, const char *desc, unsigned descsz)
+{
+ Elf_Nhdr nhdr;
+ unsigned ent_size, new_size, pad;
+ char *addr;
+
+ if (!bhdr)
+ return NULL;
+
+ nhdr.n_namesz = name? strlen(name)+1 : 0;
+ nhdr.n_descsz = descsz;
+ nhdr.n_type = type;
+ ent_size = sizeof(nhdr) + padded(nhdr.n_namesz) + padded(nhdr.n_descsz);
+ if (bhdr->b_size + ent_size > 0xffff) {
+ printf("Boot notes too big\n");
+ free(bhdr);
+ return NULL;
+ }
+ if (bhdr->b_size + ent_size > bhdr->b_checksum) {
+ do {
+ new_size = bhdr->b_checksum * 2;
+ } while (new_size < bhdr->b_size + ent_size);
+ if (new_size > 0xffff)
+ new_size = 0xffff;
+ debug("expanding boot note size to %u\n", new_size);
+#ifdef HAVE_REALLOC
+ bhdr = realloc(bhdr, new_size);
+ bhdr->b_checksum = new_size;
+#else
+ printf("Boot notes too big\n");
+ free(bhdr);
+ return NULL;
+#endif
+ }
+
+ addr = (char *) bhdr;
+ addr += bhdr->b_size;
+ memcpy(addr, &nhdr, sizeof(nhdr));
+ addr += sizeof(nhdr);
+
+ memcpy(addr, name, nhdr.n_namesz);
+ addr += nhdr.n_namesz;
+ pad = padded(nhdr.n_namesz) - nhdr.n_namesz;
+ memset(addr, 0, pad);
+ addr += pad;
+
+ memcpy(addr, desc, nhdr.n_descsz);
+ addr += nhdr.n_descsz;
+ pad = padded(nhdr.n_descsz) - nhdr.n_descsz;
+ memset(addr, 0, pad);
+ addr += pad;
+
+ bhdr->b_size += ent_size;
+ bhdr->b_records++;
+ return bhdr;
+}
+
+static inline Elf_Bhdr *add_note_string(Elf_Bhdr *bhdr, const char *name,
+ unsigned type, const char *desc)
+{
+ return add_boot_note(bhdr, name, type, desc, strlen(desc) + 1);
+}
+
+static Elf_Bhdr *build_boot_notes(struct sys_info *info, const char *cmdline)
+{
+ Elf_Bhdr *bhdr;
+
+ bhdr = malloc(256);
+ bhdr->b_signature = ELF_BHDR_MAGIC;
+ bhdr->b_size = sizeof *bhdr;
+ bhdr->b_checksum = 256; /* XXX cache the current buffer size here */
+ bhdr->b_records = 0;
+
+ if (info->firmware)
+ bhdr = add_note_string(bhdr, NULL, EBN_FIRMWARE_TYPE, info->firmware);
+ bhdr = add_note_string(bhdr, NULL, EBN_BOOTLOADER_NAME, program_name);
+ bhdr = add_note_string(bhdr, NULL, EBN_BOOTLOADER_VERSION, program_version);
+ if (cmdline)
+ bhdr = add_note_string(bhdr, NULL, EBN_COMMAND_LINE, cmdline);
+ if (!bhdr)
+ return bhdr;
+ bhdr->b_checksum = 0;
+ bhdr->b_checksum = ipchksum(bhdr, bhdr->b_size);
+ return bhdr;
+}
+
+int elf_load(struct sys_info *info, const char *filename, const char *cmdline)
+{
+ Elf_ehdr ehdr;
+ Elf_phdr *phdr = NULL;
+ unsigned long phdr_size;
+ unsigned long checksum_offset;
+ unsigned short checksum;
+ Elf_Bhdr *boot_notes = NULL;
+ int retval = -1;
+ int image_retval;
+ unsigned int offset;
+
+ image_name = image_version = 0;
+
+ if (!file_open(filename))
+ goto out;
+
+ for (offset = 0; offset < 16 * 512; offset += 512) {
+ if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) {
+ debug("Can't read ELF header\n");
+ retval = LOADER_NOT_SUPPORT;
+ goto out;
+ }
+
+ if (ehdr.e_ident[EI_MAG0] == ELFMAG0)
+ break;
+
+ file_seek(offset);
+ }
+
+ if (ehdr.e_ident[EI_MAG0] != ELFMAG0
+ || ehdr.e_ident[EI_MAG1] != ELFMAG1
+ || ehdr.e_ident[EI_MAG2] != ELFMAG2
+ || ehdr.e_ident[EI_MAG3] != ELFMAG3
+ || ehdr.e_ident[EI_CLASS] != ARCH_ELF_CLASS
+ || ehdr.e_ident[EI_DATA] != ARCH_ELF_DATA
+ || ehdr.e_ident[EI_VERSION] != EV_CURRENT
+ || ehdr.e_type != ET_EXEC
+ || !ARCH_ELF_MACHINE_OK(ehdr.e_machine)
+ || ehdr.e_version != EV_CURRENT
+ || ehdr.e_phentsize != sizeof(Elf_phdr)) {
+ debug("Not a bootable ELF image\n");
+ retval = LOADER_NOT_SUPPORT;
+ goto out;
+ }
+
+ phdr_size = ehdr.e_phnum * sizeof *phdr;
+ phdr = malloc(phdr_size);
+ file_seek(offset + ehdr.e_phoff);
+ if (lfile_read(phdr, phdr_size) != phdr_size) {
+ printf("Can't read program header\n");
+ goto out;
+ }
+
+ if (!check_mem_ranges(info, phdr, ehdr.e_phnum))
+ goto out;
+
+ checksum_offset = process_image_notes(phdr, ehdr.e_phnum, &checksum, offset);
+
+ printf("Loading %s", image_name ? image_name : "image");
+ if (image_version)
+ printf(" version %s", image_version);
+ printf("...\n");
+
+ if (!load_segments(phdr, ehdr.e_phnum, checksum_offset, offset))
+ goto out;
+
+ if (checksum_offset) {
+ if (!verify_image(&ehdr, phdr, ehdr.e_phnum, checksum))
+ goto out;
+ }
+
+ boot_notes = build_boot_notes(info, cmdline);
+
+ //debug("current time: %lu\n", currticks());
+
+ debug("entry point is %#lx\n", addr_fixup(ehdr.e_entry));
+ printf("Jumping to entry point...\n");
+
+#if 0
+ {
+ extern unsigned int qemu_mem_size;
+ extern char boot_device;
+ void *init_openprom(unsigned long memsize, const char *cmdline, char boot_device);
+
+ int (*entry)(const void *romvec, int p2, int p3, int p4, int p5);
+ const void *romvec;
+
+ romvec = init_openprom(qemu_mem_size, cmdline, boot_device);
+ entry = (void *) addr_fixup(ehdr.e_entry);
+ image_retval = entry(romvec, 0, 0, 0, 0);
+ }
+#else
+ image_retval = start_elf(addr_fixup(ehdr.e_entry), virt_to_phys(boot_notes));
+#endif
+
+ // console_init(); FIXME
+ printf("Image returned with return value %#x\n", image_retval);
+ retval = 0;
+
+out:
+ file_close();
+ if (phdr)
+ free(phdr);
+ if (boot_notes)
+ free(boot_notes);
+ if (image_name)
+ free(image_name);
+ if (image_version)
+ free(image_version);
+ return retval;
+}
Added: openbios-devel/arch/sparc64/entry.S
===================================================================
--- openbios-devel/arch/sparc64/entry.S (rev 0)
+++ openbios-devel/arch/sparc64/entry.S 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,250 @@
+/**
+ ** Standalone startup code for Linux PROM emulator.
+ ** Copyright 1999 Pete A. Zaitcev
+ ** This code is licensed under GNU General Public License.
+ **/
+/*
+ * $Id: head.S,v 1.12 2002/07/23 05:47:09 zaitcev Exp $
+ */
+
+#define __ASSEMBLY__
+#include "asi.h"
+#include "pstate.h"
+#include "lsu.h"
+
+ .globl entry, _entry
+
+ .section ".text", "ax"
+ .align 8
+ .register %g2, #scratch
+ .register %g3, #scratch
+ .register %g6, #scratch
+ .register %g7, #scratch
+
+/*
+ * Entry point
+ * We start execution from here.
+ */
+_entry:
+entry:
+ ! Set up CPU state
+ wrpr %g0, PSTATE_PRIV, %pstate
+ wr %g0, 0, %fprs
+ wrpr %g0, 0x0, %tl
+
+ ! Extract NWINDOWS from %ver
+ rdpr %ver, %g1
+ and %g1, 0xf, %g1
+ wrpr %g1, 0, %cleanwin
+ wrpr %g1, 0, %cansave
+ wrpr %g0, 0, %canrestore
+ wrpr %g0, 0, %otherwin
+ wrpr %g0, 0, %wstate
+
+ ! Disable I/D MMUs and caches
+ stxa %g0, [%g0] ASI_LSU_CONTROL
+
+ ! Get memory size from NVRAM
+ setx 0x1fe02000074, %g2, %g5
+ mov 0x30, %g2
+ stba %g2, [%g5] ASI_PHYS_BYPASS_EC_E
+ add %g5, 1, %g1
+ stba %g0, [%g1] ASI_PHYS_BYPASS_EC_E
+ add %g1, 2, %g1
+ lduba [%g1] ASI_PHYS_BYPASS_EC_E, %g4
+
+ sll %g4, 8, %g4
+ inc %g2
+ stba %g2, [%g5] ASI_PHYS_BYPASS_EC_E
+ lduba [%g1] ASI_PHYS_BYPASS_EC_E, %g3
+ or %g3, %g4, %g4
+
+ sll %g4, 8, %g4
+ inc %g2
+ stba %g2, [%g5] ASI_PHYS_BYPASS_EC_E
+ lduba [%g1] ASI_PHYS_BYPASS_EC_E, %g3
+ or %g3, %g4, %g4
+
+ sll %g4, 8, %g4
+ inc %g2
+ stba %g2, [%g5] ASI_PHYS_BYPASS_EC_E
+ lduba [%g1] ASI_PHYS_BYPASS_EC_E, %g3
+ or %g3, %g4, %g1
+ ! %g1 contains end of memory
+
+
+ setx _end, %g7, %g3
+ set 0xffff, %g2
+ add %g3, %g2, %g3
+ andn %g3, %g2, %g3
+ setx _data, %g7, %g2
+ sub %g3, %g2, %g2
+ sub %g1, %g2, %g2 ! %g2 = start of private memory
+ mov %g2, %l0
+
+ ! setup .data & .bss
+ setx _data, %g7, %g4
+ sub %g3, %g4, %g5
+ srlx %g5, 16, %g6 ! %g6 = # of 64k .bss pages
+ set 0xa0000000, %g3
+ sllx %g3, 32, %g3
+ or %g3, 0x76, %g3
+ ! valid, 64k, locked, cacheable(I/E/C), priv, writable
+ set 48, %g7
+1: stxa %g4, [%g7] ASI_DMMU ! vaddr = _data + N * 0x10000, ctx=0
+ or %g2, %g3, %g5
+ ! paddr = start_mem + N * 0x10000
+ stxa %g5, [%g0] ASI_DTLB_DATA_IN
+ set 0x10000, %g5
+ add %g2, %g5, %g2
+ add %g4, %g5, %g4
+ deccc %g6
+ bne 1b
+ nop
+
+ ! setup .rodata
+ setx _data, %g7, %g5
+ setx _rodata, %g7, %g4
+ sub %g5, %g4, %g5
+ srlx %g5, 16, %g6 ! %g6 = # of 64k .rodata pages
+ set 48, %g7
+ set 0x10000, %g5
+1: stxa %g4, [%g7] ASI_DMMU ! vaddr = _rodata, ctx=0
+ set 0xa0000000, %g3
+ sllx %g3, 32, %g3
+ or %g3, 0x74, %g3
+ or %g4, %g3, %g3
+ ! valid, 64k, locked, cacheable(I/E/C), priv
+ ! paddr = _rodata + N * 0x10000
+ stxa %g3, [%g0] ASI_DTLB_DATA_IN
+ add %g4, %g5, %g4
+ deccc %g6
+ bne 1b
+ nop
+
+ ! setup VGA buffer
+ setx 0x1ff004a0000, %g7, %g4
+ mov 2, %g6
+ set 48, %g7
+ set 0x10000, %g5
+1: stxa %g4, [%g7] ASI_DMMU ! vaddr = 0x1ff004a0000, ctx=0
+ set 0xa0000000, %g3
+ sllx %g3, 32, %g3
+ or %g3, 0x76, %g3
+ or %g4, %g3, %g3
+ ! valid, 64k, locked, cacheable(I/E/C), priv, writable
+ ! paddr = 0x1ff004a0000
+ stxa %g3, [%g0] ASI_DTLB_DATA_IN
+ add %g4, %g5, %g4
+ deccc %g6
+ bne 1b
+ nop
+
+#if 0
+ ! setup 0-4M
+ set 48, %g7
+ stxa %g0, [%g7] ASI_DMMU ! vaddr = 0, ctx=0
+ set 0xe0000000, %g3
+ sllx %g3, 32, %g3
+ or %g3, 0x36, %g3
+ ! valid, 4M, cacheable(I/E/C), priv, writable
+ ! paddr = 0
+ stxa %g3, [%g0] ASI_DTLB_DATA_IN
+#endif
+
+ membar #Sync
+
+ setx _start, %g7, %g4
+ setx _rodata, %g7, %g5
+ sub %g5, %g4, %g5
+ srlx %g5, 16, %g6 ! %g6 = # of 64k .text pages
+ set 48, %g7
+1: stxa %g4, [%g7] ASI_IMMU ! vaddr = _start, ctx=0
+ set 0xa0000000, %g3
+ sllx %g3, 32, %g3
+ or %g3, 0x74, %g3
+ or %g4, %g3, %g3
+ ! valid, 64k, locked, cacheable(I/E/C), priv
+ ! paddr = _start + N * 0x10000
+ stxa %g3, [%g0] ASI_ITLB_DATA_IN
+ set 0x10000, %g5
+ add %g4, %g5, %g4
+ deccc %g6
+ bne 1b
+ nop
+
+#if 0
+ ! setup 0-4M
+ stxa %g0, [%g7] ASI_IMMU ! vaddr = 0, ctx=0
+ set 0xe0000000, %g3
+ sllx %g3, 32, %g3
+ or %g3, 0x34, %g3
+ ! valid, 4M, cacheable(I/E/C), priv
+ ! paddr = 0
+ stxa %g3, [%g0] ASI_ITLB_DATA_IN
+#endif
+
+ flush %g4
+
+ mov %g1, %g3
+
+ set 8, %g2
+ sta %g0, [%g2] ASI_DMMU ! set primary ctx=0
+
+ ! Enable I/D MMUs and caches
+ set LSU_CONTROL_DM|LSU_CONTROL_IM|LSU_CONTROL_DC|LSU_CONTROL_IC, %g2
+ stxa %g2, [%g0] ASI_LSU_CONTROL
+
+ /* Copy the DATA section from ROM. */
+ setx _data - 8, %o7, %o0 ! First address of DATA
+ setx _bss, %o7, %o1 ! Last address of DATA
+ ba 2f
+ nop
+1:
+ ldxa [%o0] ASI_PHYS_BYPASS_EC_E, %g1
+ stx %g1, [%o0]
+2:
+ subcc %o0, %o1, %g0
+ bl 1b
+ add %o0, 0x8, %o0
+
+ /* Zero out our BSS section. */
+ setx _bss - 8, %o7, %o0 ! First address of BSS
+ setx _end, %o7, %o1 ! Last address of BSS
+ ba 2f
+ nop
+1:
+ stx %g0, [%o0]
+2:
+ subcc %o0, %o1, %g0
+ bl 1b
+ add %o0, 0x8, %o0
+
+ setx trap_table, %g2, %g1
+ wrpr %g1, %tba
+
+ setx qemu_mem_size, %g7, %g1
+ stx %g3, [%g1]
+
+ setx _data, %g7, %g1 ! Store va->pa conversion factor
+ sub %g1, %l0, %g2
+ setx va_shift, %g7, %g1
+ stx %g2, [%g1]
+
+ /* Finally, turn on traps so that we can call c-code. */
+ wrpr %g0, (PSTATE_PRIV|PSTATE_PEF|PSTATE_IE), %pstate
+
+ /* Switch to our main context.
+ * Main context is statically defined in C.
+ */
+
+ call __switch_context_nosave
+ nop
+
+ /* We get here when the main context switches back to
+ * the boot context.
+ * Return to previous bootloader.
+ */
+ ret
+ nop
+
Added: openbios-devel/arch/sparc64/forthload.c
===================================================================
--- openbios-devel/arch/sparc64/forthload.c (rev 0)
+++ openbios-devel/arch/sparc64/forthload.c 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,62 @@
+/* tag: forth source loader
+ *
+ * Copyright (C) 2004 Stefan Reinauer
+ *
+ * See the file "COPYING" for further information about
+ * the copyright and warranty status of this work.
+ */
+
+#include "openbios/config.h"
+#include "openbios/kernel.h"
+#include "openbios/bindings.h"
+#include "sys_info.h"
+#include "loadfs.h"
+#include "boot.h"
+#define printk printk
+#define debug printk
+
+static char *forthtext=NULL;
+int forth_load(struct sys_info *info, const char *filename, const char *cmdline)
+{
+ char magic[2];
+ unsigned long forthsize;
+ int retval = -1;
+
+ if (!file_open(filename))
+ goto out;
+
+ if (lfile_read(magic, 2) != 2) {
+ debug("Can't read magic header\n");
+ retval = LOADER_NOT_SUPPORT;
+ goto out;
+ }
+
+ if (magic[0] != '\\' || magic[1] != ' ') {
+ debug("No forth source image\n");
+ retval = LOADER_NOT_SUPPORT;
+ goto out;
+ }
+
+ forthsize = file_size();
+
+ forthtext = malloc(forthsize+1);
+ file_seek(0);
+
+ printk("Loading forth source ...");
+ if ((unsigned long)lfile_read(forthtext, forthsize) != forthsize) {
+ printk("Can't read forth text\n");
+ goto out;
+ }
+ forthtext[forthsize]=0;
+ printk("ok\n");
+
+ PUSH ( (ucell)forthtext );
+ PUSH ( (ucell)forthsize );
+ fword("eval2");
+ retval=0;
+
+out:
+ //if (forthtext)
+ // free(forthtext);
+ return retval;
+}
Added: openbios-devel/arch/sparc64/init.fs
===================================================================
--- openbios-devel/arch/sparc64/init.fs (rev 0)
+++ openbios-devel/arch/sparc64/init.fs 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,58 @@
+:noname
+ ." Type 'help' for detailed information" cr
+ \ ." boot secondary slave cdrom: " cr
+ \ ." 0 > boot hd:2,\boot\vmlinuz root=/dev/hda2" cr
+ ; DIAG-initializer
+
+: make-openable ( path )
+ find-dev if
+ begin ?dup while
+ \ install trivial open and close methods
+ dup active-package! is-open
+ parent
+ repeat
+ then
+;
+
+: preopen ( chosen-str node-path )
+ 2dup make-openable
+
+ " /chosen" find-device
+ open-dev ?dup if
+ encode-int 2swap property
+ else
+ 2drop
+ then
+;
+
+:noname
+ set-defaults
+; SYSTEM-initializer
+
+\ preopen device nodes (and store the ihandles under /chosen)
+:noname
+ " memory" " /memory" preopen
+ " mmu" " /cpus/@0" preopen
+ " stdout" " /builtin/console" preopen
+ " stdin" " /builtin/console" preopen
+
+; SYSTEM-initializer
+
+\ use the tty interface if available
+:noname
+ " /builtin/console" find-dev if drop
+ " /builtin/console" " input-device" $setenv
+ " /builtin/console" " output-device" $setenv
+ then
+; SYSTEM-initializer
+
+:noname
+ " keyboard" input
+; CONSOLE-IN-initializer
+
+device-end
+
+: rmap@ ( virt -- rmentry )
+ drop 0
+ ;
+
Added: openbios-devel/arch/sparc64/ldscript
===================================================================
--- openbios-devel/arch/sparc64/ldscript (rev 0)
+++ openbios-devel/arch/sparc64/ldscript 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,83 @@
+OUTPUT_FORMAT(elf64-sparc)
+OUTPUT_ARCH(sparc:v9)
+
+/* Qemu ELF loader can't handle very complex files, so we put ELFBoot
+info to rodata and put initctx to data.*/
+
+ENTRY(trap_table)
+
+/* Initial load address
+ */
+BASE_ADDR = 0x000001fff0000000;
+
+/* 16KB heap and stack */
+HEAP_SIZE = 16384;
+STACK_SIZE = 16384;
+VMEM_SIZE = 128 * 1024;
+IOMEM_SIZE = 256 * 1024 + 768 * 1024;
+
+SECTIONS
+{
+ . = BASE_ADDR;
+
+ /* Start of the program.
+ * Now the version string is in the note, we must include it
+ * in the program. Otherwise we lose the string after relocation. */
+ _start = .;
+
+ /* Normal sections */
+ .text ALIGN(65536): {
+ *(.text.vectors)
+ *(.text)
+ *(.text.*)
+ }
+ .rodata ALIGN(65536): {
+ _rodata = .;
+ sound_drivers_start = .;
+ *(.rodata.sound_drivers)
+ sound_drivers_end = .;
+ *(.rodata)
+ *(.rodata.*)
+ *(.note.ELFBoot)
+ }
+ .data ALIGN(65536): {
+ _data = .;
+ *(.data)
+ *(.data.*)
+ }
+
+ .bss ALIGN(4096): {
+ _bss = .;
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+
+ /* Put heap and stack here, so they are included in PT_LOAD segment
+ * and the bootloader is aware of it. */
+
+ . = ALIGN(16);
+ _heap = .;
+ . += HEAP_SIZE;
+ . = ALIGN(16);
+ _eheap = .;
+
+ . = ALIGN(4096);
+ _vmem = .;
+ . += VMEM_SIZE;
+ _evmem = .;
+
+ _stack = .;
+ . += STACK_SIZE;
+ . = ALIGN(16);
+ _estack = .;
+ }
+
+ . = ALIGN(4096);
+ _end = .;
+ _iomem = _end + IOMEM_SIZE;
+
+ /* We discard .note sections other than .note.ELFBoot,
+ * because some versions of GCC generates useless ones. */
+
+ /DISCARD/ : { *(.comment*) *(.note.*) }
+}
Added: openbios-devel/arch/sparc64/lib.c
===================================================================
--- openbios-devel/arch/sparc64/lib.c (rev 0)
+++ openbios-devel/arch/sparc64/lib.c 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,59 @@
+/* lib.c
+ * tag: simple function library
+ *
+ * Copyright (C) 2003 Stefan Reinauer
+ *
+ * See the file "COPYING" for further information about
+ * the copyright and warranty status of this work.
+ */
+
+#include "openbios/config.h"
+#include "asm/types.h"
+#include <stdarg.h>
+#include "libc/stdlib.h"
+#include "libc/vsprintf.h"
+#include "openbios/kernel.h"
+
+/* Format a string and print it on the screen, just like the libc
+ * function printf.
+ */
+int printk( const char *fmt, ... )
+{
+ char *p, buf[512]; /* XXX: no buffer overflow protection... */
+ va_list args;
+ int i;
+
+ va_start(args, fmt);
+ i=vsprintf(buf,fmt,args);
+ va_end(args);
+
+ for( p=buf; *p; p++ )
+ putchar(*p);
+ return i;
+}
+
+#define MEMSIZE 128*1024
+static char memory[MEMSIZE];
+static void *memptr=memory;
+static int memsize=MEMSIZE;
+
+
+void *malloc(int size)
+{
+ void *ret=(void *)0;
+ if(memsize>=size) {
+ memsize-=size;
+ ret=memptr;
+ memptr+=size;
+ }
+ return ret;
+}
+
+void free(void *ptr)
+{
+ /* Nothing yet */
+}
+
+unsigned long map_page(unsigned long va, unsigned long epa, int type)
+{
+}
Added: openbios-devel/arch/sparc64/linux_load.c
===================================================================
--- openbios-devel/arch/sparc64/linux_load.c (rev 0)
+++ openbios-devel/arch/sparc64/linux_load.c 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,623 @@
+/*
+ * Linux/i386 loader
+ * Supports bzImage, zImage and Image format.
+ *
+ * Based on work by Steve Gehlbach.
+ * Portions are taken from mkelfImage.
+ *
+ * 2003-09 by SONE Takeshi
+ */
+
+#include "openbios/config.h"
+#include "openbios/kernel.h"
+#include "openbios/bindings.h"
+#include "sys_info.h"
+#include "context.h"
+#include "loadfs.h"
+
+#define printf printk
+#define debug printk
+#define strtoull_with_suffix strtol
+
+#define LINUX_PARAM_LOC 0x90000
+#define COMMAND_LINE_LOC 0x91000
+#define GDT_LOC 0x92000
+#define STACK_LOC 0x93000
+
+#define E820MAX 32 /* number of entries in E820MAP */
+struct e820entry {
+ unsigned long long addr; /* start of memory segment */
+ unsigned long long size; /* size of memory segment */
+ unsigned long type; /* type of memory segment */
+#define E820_RAM 1
+#define E820_RESERVED 2
+#define E820_ACPI 3 /* usable as RAM once ACPI tables have been read */
+#define E820_NVS 4
+};
+
+/* The header of Linux/i386 kernel */
+struct linux_header {
+ uint8_t reserved1[0x1f1]; /* 0x000 */
+ uint8_t setup_sects; /* 0x1f1 */
+ uint16_t root_flags; /* 0x1f2 */
+ uint8_t reserved2[6]; /* 0x1f4 */
+ uint16_t vid_mode; /* 0x1fa */
+ uint16_t root_dev; /* 0x1fc */
+ uint16_t boot_sector_magic; /* 0x1fe */
+ /* 2.00+ */
+ uint8_t reserved3[2]; /* 0x200 */
+ uint8_t header_magic[4]; /* 0x202 */
+ uint16_t protocol_version; /* 0x206 */
+ uint32_t realmode_swtch; /* 0x208 */
+ uint16_t start_sys; /* 0x20c */
+ uint16_t kver_addr; /* 0x20e */
+ uint8_t type_of_loader; /* 0x210 */
+ uint8_t loadflags; /* 0x211 */
+ uint16_t setup_move_size; /* 0x212 */
+ uint32_t code32_start; /* 0x214 */
+ uint32_t ramdisk_image; /* 0x218 */
+ uint32_t ramdisk_size; /* 0x21c */
+ uint8_t reserved4[4]; /* 0x220 */
+ /* 2.01+ */
+ uint16_t heap_end_ptr; /* 0x224 */
+ uint8_t reserved5[2]; /* 0x226 */
+ /* 2.02+ */
+ uint32_t cmd_line_ptr; /* 0x228 */
+ /* 2.03+ */
+ uint32_t initrd_addr_max; /* 0x22c */
+} __attribute__ ((packed));
+
+
+/* Paramters passed to 32-bit part of Linux
+ * This is another view of the structure above.. */
+struct linux_params {
+ uint8_t orig_x; /* 0x00 */
+ uint8_t orig_y; /* 0x01 */
+ uint16_t ext_mem_k; /* 0x02 -- EXT_MEM_K sits here */
+ uint16_t orig_video_page; /* 0x04 */
+ uint8_t orig_video_mode; /* 0x06 */
+ uint8_t orig_video_cols; /* 0x07 */
+ uint16_t unused2; /* 0x08 */
+ uint16_t orig_video_ega_bx; /* 0x0a */
+ uint16_t unused3; /* 0x0c */
+ uint8_t orig_video_lines; /* 0x0e */
+ uint8_t orig_video_isVGA; /* 0x0f */
+ uint16_t orig_video_points; /* 0x10 */
+
+ /* VESA graphic mode -- linear frame buffer */
+ uint16_t lfb_width; /* 0x12 */
+ uint16_t lfb_height; /* 0x14 */
+ uint16_t lfb_depth; /* 0x16 */
+ uint32_t lfb_base; /* 0x18 */
+ uint32_t lfb_size; /* 0x1c */
+ uint16_t cl_magic; /* 0x20 */
+#define CL_MAGIC_VALUE 0xA33F
+ uint16_t cl_offset; /* 0x22 */
+ uint16_t lfb_linelength; /* 0x24 */
+ uint8_t red_size; /* 0x26 */
+ uint8_t red_pos; /* 0x27 */
+ uint8_t green_size; /* 0x28 */
+ uint8_t green_pos; /* 0x29 */
+ uint8_t blue_size; /* 0x2a */
+ uint8_t blue_pos; /* 0x2b */
+ uint8_t rsvd_size; /* 0x2c */
+ uint8_t rsvd_pos; /* 0x2d */
+ uint16_t vesapm_seg; /* 0x2e */
+ uint16_t vesapm_off; /* 0x30 */
+ uint16_t pages; /* 0x32 */
+ uint8_t reserved4[12]; /* 0x34 -- 0x3f reserved for future expansion */
+
+ //struct apm_bios_info apm_bios_info; /* 0x40 */
+ uint8_t apm_bios_info[0x40];
+ //struct drive_info_struct drive_info; /* 0x80 */
+ uint8_t drive_info[0x20];
+ //struct sys_desc_table sys_desc_table; /* 0xa0 */
+ uint8_t sys_desc_table[0x140];
+ uint32_t alt_mem_k; /* 0x1e0 */
+ uint8_t reserved5[4]; /* 0x1e4 */
+ uint8_t e820_map_nr; /* 0x1e8 */
+ uint8_t reserved6[9]; /* 0x1e9 */
+ uint16_t mount_root_rdonly; /* 0x1f2 */
+ uint8_t reserved7[4]; /* 0x1f4 */
+ uint16_t ramdisk_flags; /* 0x1f8 */
+#define RAMDISK_IMAGE_START_MASK 0x07FF
+#define RAMDISK_PROMPT_FLAG 0x8000
+#define RAMDISK_LOAD_FLAG 0x4000
+ uint8_t reserved8[2]; /* 0x1fa */
+ uint16_t orig_root_dev; /* 0x1fc */
+ uint8_t reserved9[1]; /* 0x1fe */
+ uint8_t aux_device_info; /* 0x1ff */
+ uint8_t reserved10[2]; /* 0x200 */
+ uint8_t param_block_signature[4]; /* 0x202 */
+ uint16_t param_block_version; /* 0x206 */
+ uint8_t reserved11[8]; /* 0x208 */
+ uint8_t loader_type; /* 0x210 */
+#define LOADER_TYPE_LOADLIN 1
+#define LOADER_TYPE_BOOTSECT_LOADER 2
+#define LOADER_TYPE_SYSLINUX 3
+#define LOADER_TYPE_ETHERBOOT 4
+#define LOADER_TYPE_KERNEL 5
+ uint8_t loader_flags; /* 0x211 */
+ uint8_t reserved12[2]; /* 0x212 */
+ uint32_t kernel_start; /* 0x214 */
+ uint32_t initrd_start; /* 0x218 */
+ uint32_t initrd_size; /* 0x21c */
+ uint8_t reserved12_5[8]; /* 0x220 */
+ uint32_t cmd_line_ptr; /* 0x228 */
+ uint8_t reserved13[164]; /* 0x22c */
+ struct e820entry e820_map[E820MAX]; /* 0x2d0 */
+ uint8_t reserved16[688]; /* 0x550 */
+#define COMMAND_LINE_SIZE 256
+ /* Command line is copied here by 32-bit i386/kernel/head.S.
+ * So I will follow the boot protocol, rather than putting it
+ * directly here. --ts1 */
+ uint8_t command_line[COMMAND_LINE_SIZE]; /* 0x800 */
+ uint8_t reserved17[1792]; /* 0x900 - 0x1000 */
+};
+
+uint64_t forced_memsize;
+
+/* Load the first part the file and check if it's Linux */
+static uint32_t load_linux_header(struct linux_header *hdr)
+{
+ int load_high;
+ uint32_t kern_addr;
+
+ if (lfile_read(hdr, sizeof *hdr) != sizeof *hdr) {
+ debug("Can't read Linux header\n");
+ return 0;
+ }
+ if (hdr->boot_sector_magic != 0xaa55) {
+ debug("Not a Linux kernel image\n");
+ return 0;
+ }
+
+ /* Linux is found. Print some information */
+ if (memcmp(hdr->header_magic, "HdrS", 4) != 0) {
+ /* This may be floppy disk image or something.
+ * Perform a simple (incomplete) sanity check. */
+ if (hdr->setup_sects >= 16
+ || file_size() - (hdr->setup_sects<<9) >= 512<<10) {
+ debug("This looks like a bootdisk image but not like Linux...\n");
+ return 0;
+ }
+
+ printf("Possible very old Linux");
+ /* This kernel does not even have a protocol version.
+ * Force the value. */
+ hdr->protocol_version = 0; /* pre-2.00 */
+ } else
+ printf("Found Linux");
+ if (hdr->protocol_version >= 0x200 && hdr->kver_addr) {
+ char kver[256];
+ file_seek(hdr->kver_addr + 0x200);
+ if (lfile_read(kver, sizeof kver) != 0) {
+ kver[255] = 0;
+ printf(" version %s", kver);
+ }
+ }
+ debug(" (protocol %#x)", hdr->protocol_version);
+ load_high = 0;
+ if (hdr->protocol_version >= 0x200) {
+ debug(" (loadflags %#x)", hdr->loadflags);
+ load_high = hdr->loadflags & 1;
+ }
+ if (load_high) {
+ printf(" bzImage");
+ kern_addr = 0x100000;
+ } else {
+ printf(" zImage or Image");
+ kern_addr = 0x1000;
+ }
+ printf(".\n");
+
+ return kern_addr;
+}
+
+/* Set up parameters for 32-bit kernel */
+static void
+init_linux_params(struct linux_params *params, struct linux_header *hdr)
+{
+ debug("Setting up paramters at %#lx\n", virt_to_phys(params));
+ memset(params, 0, sizeof *params);
+
+ /* Copy some useful values from header */
+ params->mount_root_rdonly = hdr->root_flags;
+ params->orig_root_dev = hdr->root_dev;
+
+ /* Video parameters.
+ * This assumes we have VGA in standard 80x25 text mode,
+ * just like our vga.c does.
+ * Cursor position is filled later to allow some more printf's. */
+ params->orig_video_mode = 3;
+ params->orig_video_cols = 80;
+ params->orig_video_lines = 25;
+ params->orig_video_isVGA = 1;
+ params->orig_video_points = 16;
+
+ params->loader_type = 0xff; /* Unregistered Linux loader */
+}
+
+/* Memory map */
+static void
+set_memory_size(struct linux_params *params, struct sys_info *info)
+{
+ int i;
+ uint64_t end;
+ uint32_t ramtop = 0;
+ struct e820entry *linux_map;
+ struct memrange *filo_map;
+
+ linux_map = params->e820_map;
+ filo_map = info->memrange;
+ for (i = 0; i < info->n_memranges; i++, linux_map++, filo_map++) {
+ if (i < E820MAX) {
+ /* Convert to BIOS e820 style */
+ linux_map->addr = filo_map->base;
+ linux_map->size = filo_map->size;
+ linux_map->type = E820_RAM;
+ debug("%016Lx - %016Lx\n", linux_map->addr,
+ linux_map->addr + linux_map->size);
+ params->e820_map_nr = i+1;
+ }
+
+ /* Find out top of RAM. XXX This ignores hole above 1MB */
+ end = filo_map->base + filo_map->size;
+ if (end < (1ULL << 32)) { /* don't count memory above 4GB */
+ if (end > ramtop)
+ ramtop = (uint32_t) end;
+ }
+ }
+ debug("ramtop=%#x\n", ramtop);
+ /* Size of memory above 1MB in KB */
+ params->alt_mem_k = (ramtop - (1<<20)) >> 10;
+ /* old style, 64MB max */
+ if (ramtop >= (64<<20))
+ params->ext_mem_k = (63<<10);
+ else
+ params->ext_mem_k = params->alt_mem_k;
+ debug("ext_mem_k=%d, alt_mem_k=%d\n", params->ext_mem_k, params->alt_mem_k);
+}
+
+/*
+ * Parse command line
+ * Some parameters, like initrd=<file>, are not passed to kernel,
+ * we are responsible to process them.
+ * Parameters for kernel are copied to kern_cmdline. Returns name of initrd.
+ */
+static char *parse_command_line(const char *orig_cmdline, char *kern_cmdline)
+{
+ const char *start, *sep, *end, *val;
+ char name[64];
+ unsigned long len;
+ int k_len;
+ int to_kern;
+ char *initrd = 0;
+ int toolong = 0;
+
+ forced_memsize = 0;
+
+ if (!orig_cmdline) {
+ *kern_cmdline = 0;
+ return 0;
+ }
+
+ k_len = 0;
+ debug("original command line: \"%s\"\n", orig_cmdline);
+ debug("kernel command line at %#lx\n", virt_to_phys(kern_cmdline));
+
+ start = orig_cmdline;
+ while (*start == ' ')
+ start++;
+ while (*start) {
+ end = strchr(start, ' ');
+ if (!end)
+ end = start + strlen(start);
+ sep = strchr(start, '=');
+ if (!sep || sep > end)
+ sep = end;
+ len = sep - start;
+ if (len >= sizeof(name))
+ len = sizeof(name) - 1;
+ memcpy(name, start, len);
+ name[len] = 0;
+
+ if (*sep == '=') {
+ val = sep + 1;
+ len = end - val;
+ } else {
+ val = 0;
+ len = 0;
+ }
+
+ /* Only initrd= and mem= are handled here. vga= is not,
+ * which I believe is a paramter to the realmode part of Linux,
+ * which we don't execute. */
+ if (strcmp(name, "initrd") == 0) {
+ if (!val)
+ printf("Missing filename to initrd parameter\n");
+ else {
+ initrd = malloc(len + 1);
+ memcpy(initrd, val, len);
+ initrd[len] = 0;
+ debug("initrd=%s\n", initrd);
+ }
+ /* Don't pass this to kernel */
+ to_kern = 0;
+ } else if (strcmp(name, "mem") == 0) {
+ if (!val)
+ printf("Missing value for mem parameter\n");
+ else {
+ forced_memsize = strtoull_with_suffix(val, (char**)&val, 0);
+ if (forced_memsize == 0)
+ printf("Invalid mem option, ignored\n");
+ if (val != end) {
+ printf("Garbage after mem=<size>, ignored\n");
+ forced_memsize = 0;
+ }
+ debug("mem=%Lu\n", forced_memsize);
+ }
+ /* mem= is for both loader and kernel */
+ to_kern = 1;
+ } else
+ to_kern = 1;
+
+ if (to_kern) {
+ /* Copy to kernel command line buffer */
+ if (k_len != 0)
+ kern_cmdline[k_len++] = ' '; /* put separator */
+ len = end - start;
+ if (k_len + len >= COMMAND_LINE_SIZE) {
+ len = COMMAND_LINE_SIZE - k_len - 1;
+ if (!toolong) {
+ printf("Kernel command line is too long; truncated to "
+ "%d bytes\n", COMMAND_LINE_SIZE-1);
+ toolong = 1;
+ }
+ }
+ memcpy(kern_cmdline + k_len, start, len);
+ k_len += len;
+ }
+
+ start = end;
+ while (*start == ' ')
+ start++;
+ }
+ kern_cmdline[k_len] = 0;
+ debug("kernel command line (%d bytes): \"%s\"\n", k_len, kern_cmdline);
+
+ return initrd;
+}
+
+/* Set command line location */
+static void set_command_line_loc(struct linux_params *params,
+ struct linux_header *hdr)
+{
+ if (hdr->protocol_version >= 0x202) {
+ /* new style */
+ params->cmd_line_ptr = COMMAND_LINE_LOC;
+ } else {
+ /* old style */
+ params->cl_magic = CL_MAGIC_VALUE;
+ params->cl_offset = COMMAND_LINE_LOC - LINUX_PARAM_LOC;
+ }
+}
+
+/* Load 32-bit part of kernel */
+static int load_linux_kernel(struct linux_header *hdr, uint32_t kern_addr)
+{
+ uint32_t kern_offset, kern_size;
+
+ if (hdr->setup_sects == 0)
+ hdr->setup_sects = 4;
+ kern_offset = (hdr->setup_sects + 1) * 512;
+ file_seek(kern_offset);
+ kern_size = file_size() - kern_offset;
+ debug("offset=%#x addr=%#x size=%#x\n", kern_offset, kern_addr, kern_size);
+
+#if 0
+ if (using_devsize) {
+ printf("Attempt to load up to end of device as kernel; "
+ "specify the image size\n");
+ return 0;
+ }
+#endif
+
+ printf("Loading kernel... ");
+ if (lfile_read(phys_to_virt(kern_addr), kern_size) != kern_size) {
+ printf("Can't read kernel\n");
+ return 0;
+ }
+ printf("ok\n");
+
+ return kern_size;
+}
+
+static int load_initrd(struct linux_header *hdr, struct sys_info *info,
+ uint32_t kern_end, struct linux_params *params, const char *initrd_file)
+{
+ uint32_t max;
+ uint32_t start, end, size;
+ uint64_t forced;
+
+ if (!file_open(initrd_file)) {
+ printf("Can't open initrd: %s\n", initrd_file);
+ return -1;
+ }
+
+#if 0
+ if (using_devsize) {
+ printf("Attempt to load up to end of device as initrd; "
+ "specify the image size\n");
+ return -1;
+ }
+#endif
+
+ size = file_size();
+
+
+ /* Find out the kernel's restriction on how high the initrd can be
+ * placed */
+ if (hdr->protocol_version >= 0x203)
+ max = hdr->initrd_addr_max;
+ else
+ max = 0x38000000; /* Hardcoded value for older kernels */
+
+ /* FILO itself is at the top of RAM. (relocated)
+ * So, try putting initrd just below us. */
+ end = virt_to_phys(_start);
+ if (end > max)
+ end = max;
+
+ /* If "mem=" option is given, we have to put the initrd within
+ * the specified range. */
+ if (forced_memsize) {
+ forced = forced_memsize;
+ if (forced > max)
+ forced = max;
+ /* If the "mem=" is lower, it's easy */
+ if (forced <= end)
+ end = forced;
+ else {
+ /* Otherwise, see if we can put it above us */
+ if (virt_to_phys(_end) + size <= forced)
+ end = forced; /* Ok */
+ }
+ }
+
+ start = end - size;
+ start &= ~0xfff; /* page align */
+ end = start + size;
+
+ debug("start=%#x end=%#x\n", start, end);
+
+ if (start < kern_end) {
+ printf("Initrd is too big to fit in memory\n");
+ return -1;
+ }
+
+ printf("Loading initrd... ");
+ if (lfile_read(phys_to_virt(start), size) != size) {
+ printf("Can't read initrd\n");
+ return -1;
+ }
+ printf("ok\n");
+
+ params->initrd_start = start;
+ params->initrd_size = size;
+
+ return 0;
+}
+
+static void hardware_setup(void)
+{
+ /* Disable nmi */
+ outb(0x80, 0x70);
+
+ /* Make sure any coprocessor is properly reset.. */
+ outb(0, 0xf0);
+ outb(0, 0xf1);
+
+ /* we're getting screwed again and again by this problem of the 8259.
+ * so we're going to leave this lying around for inclusion into
+ * crt0.S on an as-needed basis.
+ *
+ * well, that went ok, I hope. Now we have to reprogram the interrupts :-(
+ * we put them right after the intel-reserved hardware interrupts, at
+ * int 0x20-0x2F. There they won't mess up anything. Sadly IBM really
+ * messed this up with the original PC, and they haven't been able to
+ * rectify it afterwards. Thus the bios puts interrupts at 0x08-0x0f,
+ * which is used for the internal hardware interrupts as well. We just
+ * have to reprogram the 8259's, and it isn't fun.
+ */
+
+ outb(0x11, 0x20); /* initialization sequence to 8259A-1 */
+ outb(0x11, 0xA0); /* and to 8259A-2 */
+
+ outb(0x20, 0x21); /* start of hardware int's (0x20) */
+ outb(0x28, 0xA1); /* start of hardware int's 2 (0x28) */
+
+ outb(0x04, 0x21); /* 8259-1 is master */
+ outb(0x02, 0xA1); /* 8259-2 is slave */
+
+ outb(0x01, 0x21); /* 8086 mode for both */
+ outb(0x01, 0xA1);
+
+ outb(0xFF, 0xA1); /* mask off all interrupts for now */
+ outb(0xFB, 0x21); /* mask all irq's but irq2 which is cascaded */
+}
+
+/* Start Linux */
+static int start_linux(uint32_t kern_addr, struct linux_params *params)
+{
+ struct context *ctx;
+ //extern int cursor_x, cursor_y;
+
+ ctx = init_context(phys_to_virt(STACK_LOC), 4096, 0);
+
+ /* Entry point */
+ ctx->pc = kern_addr;
+ ctx->npc = kern_addr + 4;
+
+ debug("pc=%#x\n", kern_addr);
+ printf("Jumping to entry point...\n");
+
+#ifdef VGA_CONSOLE
+ /* Update VGA cursor position.
+ * This must be here because the printf changes the value! */
+ params->orig_x = cursor_x;
+ params->orig_y = cursor_y;
+#endif
+
+ /* Go... */
+ ctx = switch_to(ctx);
+
+ /* It's impossible but... */
+ printf("Returned with o0=%#x\n", ctx->regs[REG_O0]);
+
+ return ctx->regs[REG_O0];
+}
+
+int linux_load(struct sys_info *info, const char *file, const char *cmdline)
+{
+ struct linux_header hdr;
+ struct linux_params *params;
+ uint32_t kern_addr, kern_size;
+ char *initrd_file = 0;
+
+ if (!file_open(file))
+ return -1;
+
+ kern_addr = load_linux_header(&hdr);
+ if (kern_addr == 0) {
+ file_close();
+ return LOADER_NOT_SUPPORT;
+ }
+
+ params = phys_to_virt(LINUX_PARAM_LOC);
+ init_linux_params(params, &hdr);
+ set_memory_size(params, info);
+ initrd_file = parse_command_line(cmdline, phys_to_virt(COMMAND_LINE_LOC));
+ set_command_line_loc(params, &hdr);
+
+ kern_size = load_linux_kernel(&hdr, kern_addr);
+ if (kern_size == 0) {
+ if (initrd_file)
+ free(initrd_file);
+ return -1;
+ }
+
+ if (initrd_file) {
+ if (load_initrd(&hdr, info, kern_addr+kern_size, params, initrd_file)
+ != 0) {
+ free(initrd_file);
+ return -1;
+ }
+ free(initrd_file);
+ }
+
+ hardware_setup();
+
+ start_linux(kern_addr, params);
+ return 0;
+}
Added: openbios-devel/arch/sparc64/loadfs.c
===================================================================
--- openbios-devel/arch/sparc64/loadfs.c (rev 0)
+++ openbios-devel/arch/sparc64/loadfs.c 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,64 @@
+#include "openbios/config.h"
+#include "openbios/kernel.h"
+#include "libc/diskio.h"
+#include "loadfs.h"
+
+static int load_fd=-1;
+
+int file_open(const char *filename)
+{
+ load_fd=open_io(filename);
+ if(load_fd >= 0)
+ seek_io(load_fd, 0);
+ return load_fd>-1;
+}
+
+void file_close(void)
+{
+ if(load_fd==-1)
+ return;
+
+ close_io(load_fd);
+ load_fd=-1;
+}
+
+int lfile_read(void *buf, unsigned long len)
+{
+ int ret = 0;
+
+ if (load_fd >= 0)
+ ret=read_io(load_fd, buf, len);
+ return ret;
+}
+
+int file_seek(unsigned long offset)
+{
+ if (load_fd >= 0)
+ return seek_io(load_fd, offset);
+ else
+ return -1;
+}
+
+unsigned long file_size(void)
+{
+ llong fpos, fsize;
+
+ if (load_fd < 0)
+ return 0;
+
+ /* save current position */
+ fpos=tell(load_fd);
+
+ /* go to end of file and get position */
+ seek_io(load_fd, -1);
+ fsize=tell(load_fd);
+
+ /* go back to old position */
+ seek_io(load_fd, 0);
+ seek_io(load_fd, fpos);
+
+ return fsize;
+}
+
+
+
Added: openbios-devel/arch/sparc64/loadfs.h
===================================================================
--- openbios-devel/arch/sparc64/loadfs.h (rev 0)
+++ openbios-devel/arch/sparc64/loadfs.h 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,7 @@
+int file_open(const char *filename);
+int lfile_read(void *buf, unsigned long len);
+int file_seek(unsigned long offset);
+unsigned long file_size(void);
+
+
+
Added: openbios-devel/arch/sparc64/lsu.h
===================================================================
--- openbios-devel/arch/sparc64/lsu.h (rev 0)
+++ openbios-devel/arch/sparc64/lsu.h 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,20 @@
+/* $Id: lsu.h,v 1.2 1997/04/04 00:50:22 davem Exp $ */
+#ifndef _SPARC64_LSU_H
+#define _SPARC64_LSU_H
+
+#include "const.h"
+
+/* LSU Control Register */
+#define LSU_CONTROL_PM _AC(0x000001fe00000000,UL) /* Phys-watchpoint byte mask*/
+#define LSU_CONTROL_VM _AC(0x00000001fe000000,UL) /* Virt-watchpoint byte mask*/
+#define LSU_CONTROL_PR _AC(0x0000000001000000,UL) /* Phys-rd watchpoint enable*/
+#define LSU_CONTROL_PW _AC(0x0000000000800000,UL) /* Phys-wr watchpoint enable*/
+#define LSU_CONTROL_VR _AC(0x0000000000400000,UL) /* Virt-rd watchpoint enable*/
+#define LSU_CONTROL_VW _AC(0x0000000000200000,UL) /* Virt-wr watchpoint enable*/
+#define LSU_CONTROL_FM _AC(0x00000000000ffff0,UL) /* Parity mask enables. */
+#define LSU_CONTROL_DM _AC(0x0000000000000008,UL) /* Data MMU enable. */
+#define LSU_CONTROL_IM _AC(0x0000000000000004,UL) /* Instruction MMU enable. */
+#define LSU_CONTROL_DC _AC(0x0000000000000002,UL) /* Data cache enable. */
+#define LSU_CONTROL_IC _AC(0x0000000000000001,UL) /* Instruction cache enable.*/
+
+#endif /* !(_SPARC64_LSU_H) */
Added: openbios-devel/arch/sparc64/multiboot.c
===================================================================
--- openbios-devel/arch/sparc64/multiboot.c (rev 0)
+++ openbios-devel/arch/sparc64/multiboot.c 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,125 @@
+/* Support for Multiboot */
+
+#include "openbios/config.h"
+#include "asm/io.h"
+#include "sys_info.h"
+#include "multiboot.h"
+
+#define printf printk
+#ifdef CONFIG_DEBUG_BOOT
+#define debug printk
+#else
+#define debug(x...)
+#endif
+
+struct mbheader {
+ unsigned int magic, flags, checksum;
+};
+const struct mbheader multiboot_header
+ __attribute__((section (".hdr"))) =
+{
+ MULTIBOOT_HEADER_MAGIC,
+ MULTIBOOT_HEADER_FLAGS,
+ -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)
+};
+
+/* Multiboot information structure, provided by loader to us */
+
+struct multiboot_mmap {
+ unsigned entry_size;
+ unsigned base_lo, base_hi;
+ unsigned size_lo, size_hi;
+ unsigned type;
+};
+
+#define MULTIBOOT_MEM_VALID 0x01
+#define MULTIBOOT_BOOT_DEV_VALID 0x02
+#define MULTIBOOT_CMDLINE_VALID 0x04
+#define MULTIBOOT_MODS_VALID 0x08
+#define MULTIBOOT_AOUT_SYMS_VALID 0x10
+#define MULTIBOOT_ELF_SYMS_VALID 0x20
+#define MULTIBOOT_MMAP_VALID 0x40
+
+void collect_multiboot_info(struct sys_info *info);
+void collect_multiboot_info(struct sys_info *info)
+{
+ struct multiboot_info *mbinfo;
+ struct multiboot_mmap *mbmem;
+ unsigned mbcount, mbaddr;
+ unsigned int i;
+ struct memrange *mmap;
+ int mmap_count;
+ module_t *mod;
+
+ if (info->boot_type != 0x2BADB002)
+ return;
+
+ debug("Using Multiboot information at %#lx\n", info->boot_data);
+
+ mbinfo = phys_to_virt(info->boot_data);
+
+ if (mbinfo->mods_count != 1) {
+ printf("Multiboot: no dictionary\n");
+ return;
+ }
+
+ mod = (module_t *) mbinfo->mods_addr;
+ info->dict_start=(unsigned long *)mod->mod_start;
+ info->dict_end=(unsigned long *)mod->mod_end;
+
+ if (mbinfo->flags & MULTIBOOT_MMAP_VALID) {
+ /* convert mmap records */
+ mbmem = phys_to_virt(mbinfo->mmap_addr);
+ mbcount = mbinfo->mmap_length / (mbmem->entry_size + 4);
+ mmap = malloc(mbcount * sizeof(struct memrange));
+ mmap_count = 0;
+ mbaddr = mbinfo->mmap_addr;
+ for (i = 0; i < mbcount; i++) {
+ mbmem = phys_to_virt(mbaddr);
+ debug("%08x%08x %08x%08x (%d)\n",
+ mbmem->base_hi,
+ mbmem->base_lo,
+ mbmem->size_hi,
+ mbmem->size_lo,
+ mbmem->type);
+ if (mbmem->type == 1) { /* Only normal RAM */
+ mmap[mmap_count].base = mbmem->base_lo
+ + (((unsigned long long) mbmem->base_hi) << 32);
+ mmap[mmap_count].size = mbmem->size_lo
+ + (((unsigned long long) mbmem->size_hi) << 32);
+ mmap_count++;
+ }
+ mbaddr += mbmem->entry_size + 4;
+ if (mbaddr >= mbinfo->mmap_addr + mbinfo->mmap_length)
+ break;
+ }
+ /* simple sanity check - there should be at least 2 RAM segments
+ * (base 640k and extended) */
+ if (mmap_count >= 2)
+ goto got_it;
+
+ printf("Multiboot mmap is broken\n");
+ free(mmap);
+ /* fall back to mem_lower/mem_upper */
+ }
+
+ if (mbinfo->flags & MULTIBOOT_MEM_VALID) {
+ /* use mem_lower and mem_upper */
+ mmap_count = 2;
+ mmap = malloc(2 * sizeof(*mmap));
+ mmap[0].base = 0;
+ mmap[0].size = mbinfo->mem_lower << 10;
+ mmap[1].base = 1 << 20; /* 1MB */
+ mmap[1].size = mbinfo->mem_upper << 10;
+ goto got_it;
+ }
+
+ printf("Can't get memory information from Multiboot\n");
+ return;
+
+got_it:
+ info->memrange = mmap;
+ info->n_memranges = mmap_count;
+
+ return;
+}
Added: openbios-devel/arch/sparc64/multiboot.h
===================================================================
--- openbios-devel/arch/sparc64/multiboot.h (rev 0)
+++ openbios-devel/arch/sparc64/multiboot.h 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,96 @@
+/* multiboot.h
+ * tag: header for multiboot
+ *
+ * Copyright (C) 2003-2004 Stefan Reinauer
+ *
+ * See the file "COPYING" for further information about
+ * the copyright and warranty status of this work.
+ */
+
+/* magic number for multiboot header */
+#define MULTIBOOT_HEADER_MAGIC 0x1BADB002
+
+/* flags for multiboot header */
+#define MULTIBOOT_HEADER_FLAGS 0x00010003
+
+/* magic number passed by multiboot-compliant boot loader. */
+#define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002
+
+/* The size of our stack (8KB). */
+#define STACK_SIZE 0x2000
+
+/* C symbol format. HAVE_ASM_USCORE is defined by configure. */
+#ifdef HAVE_ASM_USCORE
+# define EXT_C(sym) _ ## sym
+#else
+# define EXT_C(sym) sym
+#endif
+
+#ifndef ASM
+/* We don't want these declarations in boot.S */
+
+/* multiboot header */
+typedef struct multiboot_header {
+ unsigned long magic;
+ unsigned long flags;
+ unsigned long checksum;
+ unsigned long header_addr;
+ unsigned long load_addr;
+ unsigned long load_end_addr;
+ unsigned long bss_end_addr;
+ unsigned long entry_addr;
+} multiboot_header_t;
+
+/* symbol table for a.out */
+typedef struct aout_symbol_table {
+ unsigned long tabsize;
+ unsigned long strsize;
+ unsigned long addr;
+ unsigned long reserved;
+} aout_symbol_table_t;
+
+/* section header table for ELF */
+typedef struct elf_section_header_table {
+ unsigned long num;
+ unsigned long size;
+ unsigned long addr;
+ unsigned long shndx;
+} elf_section_header_table_t;
+
+/* multiboot information */
+typedef struct multiboot_info {
+ unsigned long flags;
+ unsigned long mem_lower;
+ unsigned long mem_upper;
+ unsigned long boot_device;
+ unsigned long cmdline;
+ unsigned long mods_count;
+ unsigned long mods_addr;
+ union {
+ aout_symbol_table_t aout_sym;
+ elf_section_header_table_t elf_sec;
+ } u;
+ unsigned long mmap_length;
+ unsigned long mmap_addr;
+} multiboot_info_t;
+
+/* module structure */
+typedef struct module {
+ unsigned long mod_start;
+ unsigned long mod_end;
+ unsigned long string;
+ unsigned long reserved;
+} module_t;
+
+/* memory map. Be careful that the offset 0 is base_addr_low
+ but no size. */
+typedef struct memory_map {
+ unsigned long size;
+ unsigned long base_addr_low;
+ unsigned long base_addr_high;
+ unsigned long length_low;
+ unsigned long length_high;
+ unsigned long type;
+} memory_map_t;
+
+#endif /* ! ASM */
Added: openbios-devel/arch/sparc64/openbios.c
===================================================================
--- openbios-devel/arch/sparc64/openbios.c (rev 0)
+++ openbios-devel/arch/sparc64/openbios.c 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,115 @@
+/* tag: openbios forth environment, executable code
+ *
+ * Copyright (C) 2003 Patrick Mauritz, Stefan Reinauer
+ *
+ * See the file "COPYING" for further information about
+ * the copyright and warranty status of this work.
+ */
+
+#include "openbios/config.h"
+#include "openbios/bindings.h"
+#include "openbios/drivers.h"
+#include "asm/types.h"
+#include "dict.h"
+#include "openbios/kernel.h"
+#include "openbios/stack.h"
+#include "sys_info.h"
+#include "openbios.h"
+
+void boot(void);
+
+static unsigned char intdict[256 * 1024];
+
+// XXX
+void arch_nvram_put()
+{
+}
+
+void arch_nvram_get()
+{
+}
+
+int arch_nvram_size;
+
+static void init_memory(void)
+{
+
+ /* push start and end of available memory to the stack
+ * so that the forth word QUIT can initialize memory
+ * management. For now we use hardcoded memory between
+ * 0x10000 and 0x9ffff (576k). If we need more memory
+ * than that we have serious bloat.
+ */
+
+ PUSH((unsigned int)&_heap);
+ PUSH((unsigned int)&_eheap);
+}
+
+static void
+arch_init( void )
+{
+ void setup_timers(void);
+
+ modules_init();
+#ifdef CONFIG_DEBUG_CONSOLE_VIDEO
+ init_video();
+#endif
+
+ nvram_init();
+ device_end();
+
+ bind_func("platform-boot", boot );
+}
+
+int openbios(void)
+{
+ extern struct sys_info sys_info;
+
+#ifdef CONFIG_DEBUG_CONSOLE
+#ifdef CONFIG_DEBUG_CONSOLE_SERIAL
+ uart_init(CONFIG_SERIAL_PORT, CONFIG_SERIAL_SPEED);
+#endif
+#ifdef CONFIG_DEBUG_CONSOLE_VGA
+ video_init();
+#endif
+ /* Clear the screen. */
+ cls();
+ printk("OpenBIOS for Sparc64\n");
+#endif
+
+ collect_sys_info(&sys_info);
+
+ dict=intdict;
+ load_dictionary((char *)sys_info.dict_start,
+ (unsigned long)sys_info.dict_end
+ - (unsigned long)sys_info.dict_start);
+
+#ifdef CONFIG_DEBUG_BOOT
+ printk("forth started.\n");
+ printk("initializing memory...");
+#endif
+
+ init_memory();
+
+#ifdef CONFIG_DEBUG_BOOT
+ printk("done\n");
+#endif
+
+ PUSH_xt( bind_noname_func(arch_init) );
+ fword("PREPOST-initializer");
+
+ PC = (ucell)findword("initialize-of");
+
+ if (!PC) {
+ printk("panic: no dictionary entry point.\n");
+ return -1;
+ }
+#ifdef CONFIG_DEBUG_DICTIONARY
+ printk("done (%d bytes).\n", dicthead);
+ printk("Jumping to dictionary...\n");
+#endif
+
+ enterforth((xt_t)PC);
+
+ return 0;
+}
Added: openbios-devel/arch/sparc64/openbios.h
===================================================================
--- openbios-devel/arch/sparc64/openbios.h (rev 0)
+++ openbios-devel/arch/sparc64/openbios.h 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,29 @@
+/*
+ * Creation Date: <2004/01/15 16:14:05 samuel>
+ * Time-stamp: <2004/01/15 16:14:05 samuel>
+ *
+ * <openbios.h>
+ *
+ *
+ *
+ * Copyright (C) 2004 Samuel Rydh (samuel(a)ibrium.se)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2
+ *
+ */
+
+#ifndef _H_OPENBIOS
+#define _H_OPENBIOS
+
+int openbios(void);
+
+/* console.c */
+extern void cls(void);
+#ifdef CONFIG_DEBUG_CONSOLE
+extern int uart_init(int port, unsigned long speed);
+extern void video_init(void);
+#endif
+
+#endif /* _H_OPENBIOS */
Added: openbios-devel/arch/sparc64/openprom.h
===================================================================
--- openbios-devel/arch/sparc64/openprom.h (rev 0)
+++ openbios-devel/arch/sparc64/openprom.h 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,281 @@
+/* $Id: openprom.h,v 1.9 2001/03/16 10:22:02 davem Exp $ */
+#ifndef __SPARC64_OPENPROM_H
+#define __SPARC64_OPENPROM_H
+
+/* openprom.h: Prom structures and defines for access to the OPENBOOT
+ * prom routines and data areas.
+ *
+ * Copyright (C) 1996 David S. Miller (davem(a)caip.rutgers.edu)
+ */
+
+#ifndef __ASSEMBLY__
+/* V0 prom device operations. */
+struct linux_dev_v0_funcs {
+ int (*v0_devopen)(char *device_str);
+ int (*v0_devclose)(int dev_desc);
+ int (*v0_rdblkdev)(int dev_desc, int num_blks, int blk_st, char *buf);
+ int (*v0_wrblkdev)(int dev_desc, int num_blks, int blk_st, char *buf);
+ int (*v0_wrnetdev)(int dev_desc, int num_bytes, char *buf);
+ int (*v0_rdnetdev)(int dev_desc, int num_bytes, char *buf);
+ int (*v0_rdchardev)(int dev_desc, int num_bytes, int dummy, char *buf);
+ int (*v0_wrchardev)(int dev_desc, int num_bytes, int dummy, char *buf);
+ int (*v0_seekdev)(int dev_desc, long logical_offst, int from);
+};
+
+/* V2 and later prom device operations. */
+struct linux_dev_v2_funcs {
+ int (*v2_inst2pkg)(int d); /* Convert ihandle to phandle */
+ char * (*v2_dumb_mem_alloc)(char *va, unsigned sz);
+ void (*v2_dumb_mem_free)(char *va, unsigned sz);
+
+ /* To map devices into virtual I/O space. */
+ char * (*v2_dumb_mmap)(char *virta, int which_io, unsigned paddr, unsigned sz);
+ void (*v2_dumb_munmap)(char *virta, unsigned size);
+
+ int (*v2_dev_open)(char *devpath);
+ void (*v2_dev_close)(int d);
+ int (*v2_dev_read)(int d, char *buf, int nbytes);
+ int (*v2_dev_write)(int d, char *buf, int nbytes);
+ int (*v2_dev_seek)(int d, int hi, int lo);
+
+ /* Never issued (multistage load support) */
+ void (*v2_wheee2)(void);
+ void (*v2_wheee3)(void);
+};
+
+struct linux_mlist_v0 {
+ struct linux_mlist_v0 *theres_more;
+ unsigned start_adr;
+ unsigned num_bytes;
+};
+
+struct linux_mem_v0 {
+ struct linux_mlist_v0 **v0_totphys;
+ struct linux_mlist_v0 **v0_prommap;
+ struct linux_mlist_v0 **v0_available; /* What we can use */
+};
+
+/* Arguments sent to the kernel from the boot prompt. */
+struct linux_arguments_v0 {
+ char *argv[8];
+ char args[100];
+ char boot_dev[2];
+ int boot_dev_ctrl;
+ int boot_dev_unit;
+ int dev_partition;
+ char *kernel_file_name;
+ void *aieee1; /* XXX */
+};
+
+/* V2 and up boot things. */
+struct linux_bootargs_v2 {
+ char **bootpath;
+ char **bootargs;
+ int *fd_stdin;
+ int *fd_stdout;
+};
+
+/* The top level PROM vector. */
+struct linux_romvec {
+ /* Version numbers. */
+ unsigned int pv_magic_cookie;
+ unsigned int pv_romvers;
+ unsigned int pv_plugin_revision;
+ unsigned int pv_printrev;
+
+ /* Version 0 memory descriptors. */
+ struct linux_mem_v0 pv_v0mem;
+
+ /* Node operations. */
+ struct linux_nodeops *pv_nodeops;
+
+ char **pv_bootstr;
+ struct linux_dev_v0_funcs pv_v0devops;
+
+ char *pv_stdin;
+ char *pv_stdout;
+#define PROMDEV_KBD 0 /* input from keyboard */
+#define PROMDEV_SCREEN 0 /* output to screen */
+#define PROMDEV_TTYA 1 /* in/out to ttya */
+#define PROMDEV_TTYB 2 /* in/out to ttyb */
+
+ /* Blocking getchar/putchar. NOT REENTRANT! (grr) */
+ int (*pv_getchar)(void);
+ void (*pv_putchar)(int ch);
+
+ /* Non-blocking variants. */
+ int (*pv_nbgetchar)(void);
+ int (*pv_nbputchar)(int ch);
+
+ void (*pv_putstr)(char *str, int len);
+
+ /* Miscellany. */
+ void (*pv_reboot)(char *bootstr);
+ void (*pv_printf)(__const__ char *fmt, ...);
+ void (*pv_abort)(void);
+ __volatile__ int *pv_ticks;
+ void (*pv_halt)(void);
+ void (**pv_synchook)(void);
+
+ /* Evaluate a forth string, not different proto for V0 and V2->up. */
+ union {
+ void (*v0_eval)(int len, char *str);
+ void (*v2_eval)(char *str);
+ } pv_fortheval;
+
+ struct linux_arguments_v0 **pv_v0bootargs;
+
+ /* Get ether address. */
+ unsigned int (*pv_enaddr)(int d, char *enaddr);
+
+ struct linux_bootargs_v2 pv_v2bootargs;
+ struct linux_dev_v2_funcs pv_v2devops;
+
+ int filler[15];
+
+ /* This one is sun4c/sun4 only. */
+ void (*pv_setctxt)(int ctxt, char *va, int pmeg);
+
+ /* Prom version 3 Multiprocessor routines. This stuff is crazy.
+ * No joke. Calling these when there is only one cpu probably
+ * crashes the machine, have to test this. :-)
+ */
+
+ /* v3_cpustart() will start the cpu 'whichcpu' in mmu-context
+ * 'thiscontext' executing at address 'prog_counter'
+ */
+ int (*v3_cpustart)(unsigned int whichcpu, int ctxtbl_ptr,
+ int thiscontext, char *prog_counter);
+
+ /* v3_cpustop() will cause cpu 'whichcpu' to stop executing
+ * until a resume cpu call is made.
+ */
+ int (*v3_cpustop)(unsigned int whichcpu);
+
+ /* v3_cpuidle() will idle cpu 'whichcpu' until a stop or
+ * resume cpu call is made.
+ */
+ int (*v3_cpuidle)(unsigned int whichcpu);
+
+ /* v3_cpuresume() will resume processor 'whichcpu' executing
+ * starting with whatever 'pc' and 'npc' were left at the
+ * last 'idle' or 'stop' call.
+ */
+ int (*v3_cpuresume)(unsigned int whichcpu);
+};
+
+/* Routines for traversing the prom device tree. */
+struct linux_nodeops {
+ int (*no_nextnode)(int node);
+ int (*no_child)(int node);
+ int (*no_proplen)(int node, char *name);
+ int (*no_getprop)(int node, char *name, char *val);
+ int (*no_setprop)(int node, char *name, char *val, int len);
+ char * (*no_nextprop)(int node, char *name);
+};
+
+/* More fun PROM structures for device probing. */
+#define PROMREG_MAX 16
+#define PROMVADDR_MAX 16
+#define PROMINTR_MAX 15
+
+struct linux_prom_registers {
+ unsigned which_io; /* hi part of physical address */
+ unsigned phys_addr; /* The physical address of this register */
+ int reg_size; /* How many bytes does this register take up? */
+};
+
+struct linux_prom64_registers {
+ long phys_addr;
+ long reg_size;
+};
+
+struct linux_prom_irqs {
+ int pri; /* IRQ priority */
+ int vector; /* This is foobar, what does it do? */
+};
+
+/* Element of the "ranges" vector */
+struct linux_prom_ranges {
+ unsigned int ot_child_space;
+ unsigned int ot_child_base; /* Bus feels this */
+ unsigned int ot_parent_space;
+ unsigned int ot_parent_base; /* CPU looks from here */
+ unsigned int or_size;
+};
+
+struct linux_prom64_ranges {
+ unsigned long ot_child_base; /* Bus feels this */
+ unsigned long ot_parent_base; /* CPU looks from here */
+ unsigned long or_size;
+};
+
+/* Ranges and reg properties are a bit different for PCI. */
+struct linux_prom_pci_registers {
+ unsigned int phys_hi;
+ unsigned int phys_mid;
+ unsigned int phys_lo;
+
+ unsigned int size_hi;
+ unsigned int size_lo;
+};
+
+struct linux_prom_pci_ranges {
+ unsigned int child_phys_hi; /* Only certain bits are encoded here. */
+ unsigned int child_phys_mid;
+ unsigned int child_phys_lo;
+
+ unsigned int parent_phys_hi;
+ unsigned int parent_phys_lo;
+
+ unsigned int size_hi;
+ unsigned int size_lo;
+};
+
+struct linux_prom_pci_intmap {
+ unsigned int phys_hi;
+ unsigned int phys_mid;
+ unsigned int phys_lo;
+
+ unsigned int interrupt;
+
+ int cnode;
+ unsigned int cinterrupt;
+};
+
+struct linux_prom_pci_intmask {
+ unsigned int phys_hi;
+ unsigned int phys_mid;
+ unsigned int phys_lo;
+ unsigned int interrupt;
+};
+
+struct linux_prom_ebus_ranges {
+ unsigned int child_phys_hi;
+ unsigned int child_phys_lo;
+
+ unsigned int parent_phys_hi;
+ unsigned int parent_phys_mid;
+ unsigned int parent_phys_lo;
+
+ unsigned int size;
+};
+
+struct linux_prom_ebus_intmap {
+ unsigned int phys_hi;
+ unsigned int phys_lo;
+
+ unsigned int interrupt;
+
+ int cnode;
+ unsigned int cinterrupt;
+};
+
+struct linux_prom_ebus_intmask {
+ unsigned int phys_hi;
+ unsigned int phys_lo;
+ unsigned int interrupt;
+};
+#endif /* !(__ASSEMBLY__) */
+
+#endif /* !(__SPARC64_OPENPROM_H) */
Added: openbios-devel/arch/sparc64/plainboot.c
===================================================================
--- openbios-devel/arch/sparc64/plainboot.c (rev 0)
+++ openbios-devel/arch/sparc64/plainboot.c 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,22 @@
+/* tag: openbios fixed address forth starter
+ *
+ * Copyright (C) 2003 Stefan Reinauer
+ *
+ * See the file "COPYING" for further information about
+ * the copyright and warranty status of this work.
+ */
+
+#include "openbios/config.h"
+#include "sys_info.h"
+#include "multiboot.h"
+
+#define FIXED_DICTSTART 0xfffe0000
+#define FIXED_DICTEND 0xfffeffff
+
+void collect_multiboot_info(struct sys_info *info);
+void collect_multiboot_info(struct sys_info *info)
+{
+ info->dict_start=(unsigned long *)FIXED_DICTSTART;
+ info->dict_end=(unsigned long *)FIXED_DICTEND;
+}
+
Added: openbios-devel/arch/sparc64/pstate.h
===================================================================
--- openbios-devel/arch/sparc64/pstate.h (rev 0)
+++ openbios-devel/arch/sparc64/pstate.h 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,90 @@
+/* $Id: pstate.h,v 1.6 1997/06/25 07:39:45 jj Exp $ */
+#ifndef _SPARC64_PSTATE_H
+#define _SPARC64_PSTATE_H
+
+#include "const.h"
+
+/* The V9 PSTATE Register (with SpitFire extensions).
+ *
+ * -----------------------------------------------------------------------
+ * | Resv | IG | MG | CLE | TLE | MM | RED | PEF | AM | PRIV | IE | AG |
+ * -----------------------------------------------------------------------
+ * 63 12 11 10 9 8 7 6 5 4 3 2 1 0
+ */
+#define PSTATE_IG _AC(0x0000000000000800,UL) /* Interrupt Globals. */
+#define PSTATE_MG _AC(0x0000000000000400,UL) /* MMU Globals. */
+#define PSTATE_CLE _AC(0x0000000000000200,UL) /* Current Little Endian.*/
+#define PSTATE_TLE _AC(0x0000000000000100,UL) /* Trap Little Endian. */
+#define PSTATE_MM _AC(0x00000000000000c0,UL) /* Memory Model. */
+#define PSTATE_TSO _AC(0x0000000000000000,UL) /* MM: TotalStoreOrder */
+#define PSTATE_PSO _AC(0x0000000000000040,UL) /* MM: PartialStoreOrder */
+#define PSTATE_RMO _AC(0x0000000000000080,UL) /* MM: RelaxedMemoryOrder*/
+#define PSTATE_RED _AC(0x0000000000000020,UL) /* Reset Error Debug. */
+#define PSTATE_PEF _AC(0x0000000000000010,UL) /* Floating Point Enable.*/
+#define PSTATE_AM _AC(0x0000000000000008,UL) /* Address Mask. */
+#define PSTATE_PRIV _AC(0x0000000000000004,UL) /* Privilege. */
+#define PSTATE_IE _AC(0x0000000000000002,UL) /* Interrupt Enable. */
+#define PSTATE_AG _AC(0x0000000000000001,UL) /* Alternate Globals. */
+
+/* The V9 TSTATE Register (with SpitFire and Linux extensions).
+ *
+ * ---------------------------------------------------------------
+ * | Resv | CCR | ASI | %pil | PSTATE | Resv | CWP |
+ * ---------------------------------------------------------------
+ * 63 40 39 32 31 24 23 20 19 8 7 5 4 0
+ */
+#define TSTATE_CCR _AC(0x000000ff00000000,UL) /* Condition Codes. */
+#define TSTATE_XCC _AC(0x000000f000000000,UL) /* Condition Codes. */
+#define TSTATE_XNEG _AC(0x0000008000000000,UL) /* %xcc Negative. */
+#define TSTATE_XZERO _AC(0x0000004000000000,UL) /* %xcc Zero. */
+#define TSTATE_XOVFL _AC(0x0000002000000000,UL) /* %xcc Overflow. */
+#define TSTATE_XCARRY _AC(0x0000001000000000,UL) /* %xcc Carry. */
+#define TSTATE_ICC _AC(0x0000000f00000000,UL) /* Condition Codes. */
+#define TSTATE_INEG _AC(0x0000000800000000,UL) /* %icc Negative. */
+#define TSTATE_IZERO _AC(0x0000000400000000,UL) /* %icc Zero. */
+#define TSTATE_IOVFL _AC(0x0000000200000000,UL) /* %icc Overflow. */
+#define TSTATE_ICARRY _AC(0x0000000100000000,UL) /* %icc Carry. */
+#define TSTATE_ASI _AC(0x00000000ff000000,UL) /* AddrSpace ID. */
+#define TSTATE_PIL _AC(0x0000000000f00000,UL) /* %pil (Linux traps)*/
+#define TSTATE_PSTATE _AC(0x00000000000fff00,UL) /* PSTATE. */
+#define TSTATE_IG _AC(0x0000000000080000,UL) /* Interrupt Globals.*/
+#define TSTATE_MG _AC(0x0000000000040000,UL) /* MMU Globals. */
+#define TSTATE_CLE _AC(0x0000000000020000,UL) /* CurrLittleEndian. */
+#define TSTATE_TLE _AC(0x0000000000010000,UL) /* TrapLittleEndian. */
+#define TSTATE_MM _AC(0x000000000000c000,UL) /* Memory Model. */
+#define TSTATE_TSO _AC(0x0000000000000000,UL) /* MM: TSO */
+#define TSTATE_PSO _AC(0x0000000000004000,UL) /* MM: PSO */
+#define TSTATE_RMO _AC(0x0000000000008000,UL) /* MM: RMO */
+#define TSTATE_RED _AC(0x0000000000002000,UL) /* Reset Error Debug.*/
+#define TSTATE_PEF _AC(0x0000000000001000,UL) /* FPU Enable. */
+#define TSTATE_AM _AC(0x0000000000000800,UL) /* Address Mask. */
+#define TSTATE_PRIV _AC(0x0000000000000400,UL) /* Privilege. */
+#define TSTATE_IE _AC(0x0000000000000200,UL) /* Interrupt Enable. */
+#define TSTATE_AG _AC(0x0000000000000100,UL) /* Alternate Globals.*/
+#define TSTATE_CWP _AC(0x000000000000001f,UL) /* Curr Win-Pointer. */
+
+/* Floating-Point Registers State Register.
+ *
+ * --------------------------------
+ * | Resv | FEF | DU | DL |
+ * --------------------------------
+ * 63 3 2 1 0
+ */
+#define FPRS_FEF _AC(0x0000000000000004,UL) /* FPU Enable. */
+#define FPRS_DU _AC(0x0000000000000002,UL) /* Dirty Upper. */
+#define FPRS_DL _AC(0x0000000000000001,UL) /* Dirty Lower. */
+
+/* Version Register.
+ *
+ * ------------------------------------------------------
+ * | MANUF | IMPL | MASK | Resv | MAXTL | Resv | MAXWIN |
+ * ------------------------------------------------------
+ * 63 48 47 32 31 24 23 16 15 8 7 5 4 0
+ */
+#define VERS_MANUF _AC(0xffff000000000000,UL) /* Manufacturer. */
+#define VERS_IMPL _AC(0x0000ffff00000000,UL) /* Implementation. */
+#define VERS_MASK _AC(0x00000000ff000000,UL) /* Mask Set Revision.*/
+#define VERS_MAXTL _AC(0x000000000000ff00,UL) /* Max Trap Level. */
+#define VERS_MAXWIN _AC(0x000000000000001f,UL) /* Max RegWindow Idx.*/
+
+#endif /* !(_SPARC64_PSTATE_H) */
Added: openbios-devel/arch/sparc64/spitfire.h
===================================================================
--- openbios-devel/arch/sparc64/spitfire.h (rev 0)
+++ openbios-devel/arch/sparc64/spitfire.h 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,502 @@
+/* $Id: spitfire.h,v 1.18 2001/11/29 16:42:10 kanoj Exp $
+ * spitfire.h: SpitFire/BlackBird/Cheetah inline MMU operations.
+ *
+ * Copyright (C) 1996 David S. Miller (davem(a)caip.rutgers.edu)
+ */
+
+#ifndef _SPARC64_SPITFIRE_H
+#define _SPARC64_SPITFIRE_H
+
+#include <asm/asi.h>
+
+/* The following register addresses are accessible via ASI_DMMU
+ * and ASI_IMMU, that is there is a distinct and unique copy of
+ * each these registers for each TLB.
+ */
+#define TSB_TAG_TARGET 0x0000000000000000 /* All chips */
+#define TLB_SFSR 0x0000000000000018 /* All chips */
+#define TSB_REG 0x0000000000000028 /* All chips */
+#define TLB_TAG_ACCESS 0x0000000000000030 /* All chips */
+#define VIRT_WATCHPOINT 0x0000000000000038 /* All chips */
+#define PHYS_WATCHPOINT 0x0000000000000040 /* All chips */
+#define TSB_EXTENSION_P 0x0000000000000048 /* Ultra-III and later */
+#define TSB_EXTENSION_S 0x0000000000000050 /* Ultra-III and later, D-TLB only */
+#define TSB_EXTENSION_N 0x0000000000000058 /* Ultra-III and later */
+#define TLB_TAG_ACCESS_EXT 0x0000000000000060 /* Ultra-III+ and later */
+
+/* These registers only exist as one entity, and are accessed
+ * via ASI_DMMU only.
+ */
+#define PRIMARY_CONTEXT 0x0000000000000008
+#define SECONDARY_CONTEXT 0x0000000000000010
+#define DMMU_SFAR 0x0000000000000020
+#define VIRT_WATCHPOINT 0x0000000000000038
+#define PHYS_WATCHPOINT 0x0000000000000040
+
+#define SPITFIRE_HIGHEST_LOCKED_TLBENT (64 - 1)
+
+#ifndef __ASSEMBLY__
+
+enum ultra_tlb_layout {
+ spitfire = 0,
+ cheetah = 1,
+ cheetah_plus = 2,
+};
+
+extern enum ultra_tlb_layout tlb_type;
+
+#define CHEETAH_HIGHEST_LOCKED_TLBENT (16 - 1)
+
+#define L1DCACHE_SIZE 0x4000
+
+#define sparc64_highest_locked_tlbent() \
+ (tlb_type == spitfire ? \
+ SPITFIRE_HIGHEST_LOCKED_TLBENT : \
+ CHEETAH_HIGHEST_LOCKED_TLBENT)
+
+static __inline__ unsigned long spitfire_get_isfsr(void)
+{
+ unsigned long ret;
+
+ __asm__ __volatile__("ldxa [%1] %2, %0"
+ : "=r" (ret)
+ : "r" (TLB_SFSR), "i" (ASI_IMMU));
+ return ret;
+}
+
+static __inline__ unsigned long spitfire_get_dsfsr(void)
+{
+ unsigned long ret;
+
+ __asm__ __volatile__("ldxa [%1] %2, %0"
+ : "=r" (ret)
+ : "r" (TLB_SFSR), "i" (ASI_DMMU));
+ return ret;
+}
+
+static __inline__ unsigned long spitfire_get_sfar(void)
+{
+ unsigned long ret;
+
+ __asm__ __volatile__("ldxa [%1] %2, %0"
+ : "=r" (ret)
+ : "r" (DMMU_SFAR), "i" (ASI_DMMU));
+ return ret;
+}
+
+static __inline__ void spitfire_put_isfsr(unsigned long sfsr)
+{
+ __asm__ __volatile__("stxa %0, [%1] %2\n\t"
+ "membar #Sync"
+ : /* no outputs */
+ : "r" (sfsr), "r" (TLB_SFSR), "i" (ASI_IMMU));
+}
+
+static __inline__ void spitfire_put_dsfsr(unsigned long sfsr)
+{
+ __asm__ __volatile__("stxa %0, [%1] %2\n\t"
+ "membar #Sync"
+ : /* no outputs */
+ : "r" (sfsr), "r" (TLB_SFSR), "i" (ASI_DMMU));
+}
+
+static __inline__ unsigned long spitfire_get_primary_context(void)
+{
+ unsigned long ctx;
+
+ __asm__ __volatile__("ldxa [%1] %2, %0"
+ : "=r" (ctx)
+ : "r" (PRIMARY_CONTEXT), "i" (ASI_DMMU));
+ return ctx;
+}
+
+static __inline__ void spitfire_set_primary_context(unsigned long ctx)
+{
+ __asm__ __volatile__("stxa %0, [%1] %2\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (ctx & 0x3ff),
+ "r" (PRIMARY_CONTEXT), "i" (ASI_DMMU));
+ __asm__ __volatile__ ("membar #Sync" : : : "memory");
+}
+
+static __inline__ unsigned long spitfire_get_secondary_context(void)
+{
+ unsigned long ctx;
+
+ __asm__ __volatile__("ldxa [%1] %2, %0"
+ : "=r" (ctx)
+ : "r" (SECONDARY_CONTEXT), "i" (ASI_DMMU));
+ return ctx;
+}
+
+static __inline__ void spitfire_set_secondary_context(unsigned long ctx)
+{
+ __asm__ __volatile__("stxa %0, [%1] %2\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (ctx & 0x3ff),
+ "r" (SECONDARY_CONTEXT), "i" (ASI_DMMU));
+ __asm__ __volatile__ ("membar #Sync" : : : "memory");
+}
+
+/* The data cache is write through, so this just invalidates the
+ * specified line.
+ */
+static __inline__ void spitfire_put_dcache_tag(unsigned long addr, unsigned long tag)
+{
+ __asm__ __volatile__("stxa %0, [%1] %2\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (tag), "r" (addr), "i" (ASI_DCACHE_TAG));
+ __asm__ __volatile__ ("membar #Sync" : : : "memory");
+}
+
+/* The instruction cache lines are flushed with this, but note that
+ * this does not flush the pipeline. It is possible for a line to
+ * get flushed but stale instructions to still be in the pipeline,
+ * a flush instruction (to any address) is sufficient to handle
+ * this issue after the line is invalidated.
+ */
+static __inline__ void spitfire_put_icache_tag(unsigned long addr, unsigned long tag)
+{
+ __asm__ __volatile__("stxa %0, [%1] %2\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (tag), "r" (addr), "i" (ASI_IC_TAG));
+}
+
+static __inline__ unsigned long spitfire_get_dtlb_data(int entry)
+{
+ unsigned long data;
+
+ __asm__ __volatile__("ldxa [%1] %2, %0"
+ : "=r" (data)
+ : "r" (entry << 3), "i" (ASI_DTLB_DATA_ACCESS));
+
+ /* Clear TTE diag bits. */
+ data &= ~0x0003fe0000000000UL;
+
+ return data;
+}
+
+static __inline__ unsigned long spitfire_get_dtlb_tag(int entry)
+{
+ unsigned long tag;
+
+ __asm__ __volatile__("ldxa [%1] %2, %0"
+ : "=r" (tag)
+ : "r" (entry << 3), "i" (ASI_DTLB_TAG_READ));
+ return tag;
+}
+
+static __inline__ void spitfire_put_dtlb_data(int entry, unsigned long data)
+{
+ __asm__ __volatile__("stxa %0, [%1] %2\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (data), "r" (entry << 3),
+ "i" (ASI_DTLB_DATA_ACCESS));
+}
+
+static __inline__ unsigned long spitfire_get_itlb_data(int entry)
+{
+ unsigned long data;
+
+ __asm__ __volatile__("ldxa [%1] %2, %0"
+ : "=r" (data)
+ : "r" (entry << 3), "i" (ASI_ITLB_DATA_ACCESS));
+
+ /* Clear TTE diag bits. */
+ data &= ~0x0003fe0000000000UL;
+
+ return data;
+}
+
+static __inline__ unsigned long spitfire_get_itlb_tag(int entry)
+{
+ unsigned long tag;
+
+ __asm__ __volatile__("ldxa [%1] %2, %0"
+ : "=r" (tag)
+ : "r" (entry << 3), "i" (ASI_ITLB_TAG_READ));
+ return tag;
+}
+
+static __inline__ void spitfire_put_itlb_data(int entry, unsigned long data)
+{
+ __asm__ __volatile__("stxa %0, [%1] %2\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (data), "r" (entry << 3),
+ "i" (ASI_ITLB_DATA_ACCESS));
+}
+
+/* Spitfire hardware assisted TLB flushes. */
+
+/* Context level flushes. */
+static __inline__ void spitfire_flush_dtlb_primary_context(void)
+{
+ __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (0x40), "i" (ASI_DMMU_DEMAP));
+}
+
+static __inline__ void spitfire_flush_itlb_primary_context(void)
+{
+ __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (0x40), "i" (ASI_IMMU_DEMAP));
+}
+
+static __inline__ void spitfire_flush_dtlb_secondary_context(void)
+{
+ __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (0x50), "i" (ASI_DMMU_DEMAP));
+}
+
+static __inline__ void spitfire_flush_itlb_secondary_context(void)
+{
+ __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (0x50), "i" (ASI_IMMU_DEMAP));
+}
+
+static __inline__ void spitfire_flush_dtlb_nucleus_context(void)
+{
+ __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (0x60), "i" (ASI_DMMU_DEMAP));
+}
+
+static __inline__ void spitfire_flush_itlb_nucleus_context(void)
+{
+ __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (0x60), "i" (ASI_IMMU_DEMAP));
+}
+
+/* Page level flushes. */
+static __inline__ void spitfire_flush_dtlb_primary_page(unsigned long page)
+{
+ __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (page), "i" (ASI_DMMU_DEMAP));
+}
+
+static __inline__ void spitfire_flush_itlb_primary_page(unsigned long page)
+{
+ __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (page), "i" (ASI_IMMU_DEMAP));
+}
+
+static __inline__ void spitfire_flush_dtlb_secondary_page(unsigned long page)
+{
+ __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (page | 0x10), "i" (ASI_DMMU_DEMAP));
+}
+
+static __inline__ void spitfire_flush_itlb_secondary_page(unsigned long page)
+{
+ __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (page | 0x10), "i" (ASI_IMMU_DEMAP));
+}
+
+static __inline__ void spitfire_flush_dtlb_nucleus_page(unsigned long page)
+{
+ __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (page | 0x20), "i" (ASI_DMMU_DEMAP));
+}
+
+static __inline__ void spitfire_flush_itlb_nucleus_page(unsigned long page)
+{
+ __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (page | 0x20), "i" (ASI_IMMU_DEMAP));
+}
+
+/* Cheetah has "all non-locked" tlb flushes. */
+static __inline__ void cheetah_flush_dtlb_all(void)
+{
+ __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (0x80), "i" (ASI_DMMU_DEMAP));
+}
+
+static __inline__ void cheetah_flush_itlb_all(void)
+{
+ __asm__ __volatile__("stxa %%g0, [%0] %1\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (0x80), "i" (ASI_IMMU_DEMAP));
+}
+
+/* Cheetah has a 4-tlb layout so direct access is a bit different.
+ * The first two TLBs are fully assosciative, hold 16 entries, and are
+ * used only for locked and >8K sized translations. One exists for
+ * data accesses and one for instruction accesses.
+ *
+ * The third TLB is for data accesses to 8K non-locked translations, is
+ * 2 way assosciative, and holds 512 entries. The fourth TLB is for
+ * instruction accesses to 8K non-locked translations, is 2 way
+ * assosciative, and holds 128 entries.
+ *
+ * Cheetah has some bug where bogus data can be returned from
+ * ASI_{D,I}TLB_DATA_ACCESS loads, doing the load twice fixes
+ * the problem for me. -DaveM
+ */
+static __inline__ unsigned long cheetah_get_ldtlb_data(int entry)
+{
+ unsigned long data;
+
+ __asm__ __volatile__("ldxa [%1] %2, %%g0\n\t"
+ "ldxa [%1] %2, %0"
+ : "=r" (data)
+ : "r" ((0 << 16) | (entry << 3)),
+ "i" (ASI_DTLB_DATA_ACCESS));
+
+ return data;
+}
+
+static __inline__ unsigned long cheetah_get_litlb_data(int entry)
+{
+ unsigned long data;
+
+ __asm__ __volatile__("ldxa [%1] %2, %%g0\n\t"
+ "ldxa [%1] %2, %0"
+ : "=r" (data)
+ : "r" ((0 << 16) | (entry << 3)),
+ "i" (ASI_ITLB_DATA_ACCESS));
+
+ return data;
+}
+
+static __inline__ unsigned long cheetah_get_ldtlb_tag(int entry)
+{
+ unsigned long tag;
+
+ __asm__ __volatile__("ldxa [%1] %2, %0"
+ : "=r" (tag)
+ : "r" ((0 << 16) | (entry << 3)),
+ "i" (ASI_DTLB_TAG_READ));
+
+ return tag;
+}
+
+static __inline__ unsigned long cheetah_get_litlb_tag(int entry)
+{
+ unsigned long tag;
+
+ __asm__ __volatile__("ldxa [%1] %2, %0"
+ : "=r" (tag)
+ : "r" ((0 << 16) | (entry << 3)),
+ "i" (ASI_ITLB_TAG_READ));
+
+ return tag;
+}
+
+static __inline__ void cheetah_put_ldtlb_data(int entry, unsigned long data)
+{
+ __asm__ __volatile__("stxa %0, [%1] %2\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (data),
+ "r" ((0 << 16) | (entry << 3)),
+ "i" (ASI_DTLB_DATA_ACCESS));
+}
+
+static __inline__ void cheetah_put_litlb_data(int entry, unsigned long data)
+{
+ __asm__ __volatile__("stxa %0, [%1] %2\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (data),
+ "r" ((0 << 16) | (entry << 3)),
+ "i" (ASI_ITLB_DATA_ACCESS));
+}
+
+static __inline__ unsigned long cheetah_get_dtlb_data(int entry, int tlb)
+{
+ unsigned long data;
+
+ __asm__ __volatile__("ldxa [%1] %2, %%g0\n\t"
+ "ldxa [%1] %2, %0"
+ : "=r" (data)
+ : "r" ((tlb << 16) | (entry << 3)), "i" (ASI_DTLB_DATA_ACCESS));
+
+ return data;
+}
+
+static __inline__ unsigned long cheetah_get_dtlb_tag(int entry, int tlb)
+{
+ unsigned long tag;
+
+ __asm__ __volatile__("ldxa [%1] %2, %0"
+ : "=r" (tag)
+ : "r" ((tlb << 16) | (entry << 3)), "i" (ASI_DTLB_TAG_READ));
+ return tag;
+}
+
+static __inline__ void cheetah_put_dtlb_data(int entry, unsigned long data, int tlb)
+{
+ __asm__ __volatile__("stxa %0, [%1] %2\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (data),
+ "r" ((tlb << 16) | (entry << 3)),
+ "i" (ASI_DTLB_DATA_ACCESS));
+}
+
+static __inline__ unsigned long cheetah_get_itlb_data(int entry)
+{
+ unsigned long data;
+
+ __asm__ __volatile__("ldxa [%1] %2, %%g0\n\t"
+ "ldxa [%1] %2, %0"
+ : "=r" (data)
+ : "r" ((2 << 16) | (entry << 3)),
+ "i" (ASI_ITLB_DATA_ACCESS));
+
+ return data;
+}
+
+static __inline__ unsigned long cheetah_get_itlb_tag(int entry)
+{
+ unsigned long tag;
+
+ __asm__ __volatile__("ldxa [%1] %2, %0"
+ : "=r" (tag)
+ : "r" ((2 << 16) | (entry << 3)), "i" (ASI_ITLB_TAG_READ));
+ return tag;
+}
+
+static __inline__ void cheetah_put_itlb_data(int entry, unsigned long data)
+{
+ __asm__ __volatile__("stxa %0, [%1] %2\n\t"
+ "membar #Sync"
+ : /* No outputs */
+ : "r" (data), "r" ((2 << 16) | (entry << 3)),
+ "i" (ASI_ITLB_DATA_ACCESS));
+}
+
+#endif /* !(__ASSEMBLY__) */
+
+#endif /* !(_SPARC64_SPITFIRE_H) */
Added: openbios-devel/arch/sparc64/switch.S
===================================================================
--- openbios-devel/arch/sparc64/switch.S (rev 0)
+++ openbios-devel/arch/sparc64/switch.S 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,118 @@
+#include "pstate.h"
+#include "asi.h"
+#define ASI_BP ASI_M_BYPASS
+#define REGWIN_SZ 0x40
+
+ .globl __switch_context, __switch_context_nosave, __exit_context, halt
+
+ .text
+ .align 4
+ .register %g2, #scratch
+ .register %g3, #scratch
+ .register %g6, #scratch
+ .register %g7, #scratch
+
+/*
+ * Switch execution context
+ * This saves registers in the stack, then
+ * switches the stack, and restores everything from the new stack.
+ * This function takes no argument. New stack pointer is
+ * taken from global variable __context, and old stack pointer
+ * is also saved to __context. This way we can just jump to
+ * this routine to get back to the original context.
+ */
+
+/* XXX: totally bogus for sparc, need to save and restore all windows */
+__switch_context:
+ /* Save everything in current stack */
+ setx __context, %g2, %g1
+ stx %g3, [%g1 + 24]
+ stx %g4, [%g1 + 32]
+ stx %g5, [%g1 + 40]
+ stx %g6, [%g1 + 48]
+ stx %g7, [%g1 + 56]
+
+ stx %o0, [%g1 + 64]
+ stx %o1, [%g1 + 72]
+ stx %o2, [%g1 + 80]
+ stx %o3, [%g1 + 88]
+ stx %o4, [%g1 + 96]
+ stx %o5, [%g1 + 104]
+ stx %o6, [%g1 + 112]
+ stx %o7, [%g1 + 120]
+
+ stx %l0, [%g1 + 128]
+ stx %l1, [%g1 + 136]
+ stx %l2, [%g1 + 144]
+ stx %l3, [%g1 + 152]
+ stx %l4, [%g1 + 160]
+ stx %l5, [%g1 + 168]
+ stx %l6, [%g1 + 176]
+ stx %l7, [%g1 + 184]
+
+ stx %i0, [%g1 + 192]
+ stx %i1, [%g1 + 200]
+ stx %i2, [%g1 + 208]
+ stx %i3, [%g1 + 216]
+ stx %i4, [%g1 + 224]
+ stx %i5, [%g1 + 232]
+ stx %i6, [%g1 + 240]
+ stx %i7, [%g1 + 248]
+
+__switch_context_nosave:
+ /* Interrupts are not allowed... */
+
+ /* Load all registers
+ */
+ setx __context, %g2, %g1
+ ldx [%g1], %g1
+ ldx [%g1 + 16], %g2
+ ldx [%g1 + 24], %g3
+ ldx [%g1 + 32], %g4
+ ldx [%g1 + 40], %g5
+ ldx [%g1 + 48], %g6
+ ldx [%g1 + 56], %g7
+
+ ldx [%g1 + 64], %o0
+ ldx [%g1 + 72], %o1
+ ldx [%g1 + 80], %o2
+ ldx [%g1 + 88], %o3
+ ldx [%g1 + 96], %o4
+ ldx [%g1 + 104], %o5
+ ldx [%g1 + 112], %o6
+ ldx [%g1 + 120], %o7
+
+ ldx [%g1 + 128], %l0
+ ldx [%g1 + 136], %l1
+ ldx [%g1 + 144], %l2
+ ldx [%g1 + 152], %l3
+ ldx [%g1 + 160], %l4
+ ldx [%g1 + 168], %l5
+ ldx [%g1 + 176], %l6
+ ldx [%g1 + 184], %l7
+
+ ldx [%g1 + 192], %i0
+ ldx [%g1 + 200], %i1
+ ldx [%g1 + 208], %i2
+ ldx [%g1 + 216], %i3
+ ldx [%g1 + 224], %i4
+ ldx [%g1 + 232], %i5
+ ldx [%g1 + 240], %i6
+ ldx [%g1 + 248], %i7
+
+ ldx [%g1 + 256], %g1
+ /* Finally, load new %pc */
+ jmp %g1
+ clr %g1
+
+__exit_context:
+ /* Get back to the original context */
+ call __switch_context
+ nop
+
+ /* We get here if the other context attempt to switch to this
+ * dead context. This should not happen. */
+
+halt:
+ b halt
+ nop
Added: openbios-devel/arch/sparc64/sys_info.c
===================================================================
--- openbios-devel/arch/sparc64/sys_info.c (rev 0)
+++ openbios-devel/arch/sparc64/sys_info.c 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,59 @@
+#include "openbios/config.h"
+#include "openbios/kernel.h"
+#include "elf_boot.h"
+#include "sys_info.h"
+#include "context.h"
+
+#define printf printk
+#ifdef CONFIG_DEBUG_BOOT
+#define debug printk
+#else
+#define debug(x...)
+#endif
+
+unsigned long qemu_mem_size;
+unsigned long va_shift;
+
+void collect_multiboot_info(struct sys_info *);
+
+void collect_sys_info(struct sys_info *info)
+{
+ int i;
+ unsigned long long total = 0;
+ struct memrange *mmap;
+ extern struct elf_image_note elf_image_notes;
+
+ /* Pick up paramters given by bootloader to us */
+ //info->boot_type = boot_ctx->eax;
+ //info->boot_data = boot_ctx->ebx;
+ info->boot_arg = boot_ctx->param[0];
+ //debug("boot eax = %#lx\n", info->boot_type);
+ //debug("boot ebx = %#lx\n", info->boot_data);
+ info->boot_type = ELF_BHDR_MAGIC;
+ info->boot_data = virt_to_phys(&elf_image_notes);
+ debug("boot arg = %#lx\n", info->boot_arg);
+
+ collect_elfboot_info(info);
+#ifdef CONFIG_LINUXBIOS
+ collect_linuxbios_info(info);
+#endif
+#ifdef CONFIG_IMAGE_ELF_MULTIBOOT
+ collect_multiboot_info(info);
+#endif
+
+ if (!info->memrange) {
+ info->n_memranges = 1;
+ info->memrange = malloc(1 * sizeof(struct memrange));
+ info->memrange[0].base = 0;
+ info->memrange[0].size = qemu_mem_size;
+ }
+
+ debug("\n");
+ mmap=info->memrange;
+ for (i = 0; i < info->n_memranges; i++) {
+ debug("%08lx-", (long)mmap[i].base);
+ debug("%08lx\n", (long)mmap[i].base + (long)mmap[i].size);
+ total += mmap[i].size;
+ }
+ debug("RAM %ld MB\n", (long)total >> 20);
+}
Added: openbios-devel/arch/sparc64/tree.fs
===================================================================
--- openbios-devel/arch/sparc64/tree.fs (rev 0)
+++ openbios-devel/arch/sparc64/tree.fs 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,29 @@
+
+" /" find-device
+ 2 encode-int " #address-cells" property
+ 1 encode-int " #size-cells" property
+
+ : encode-unit encode-unit-sbus ;
+ : decode-unit decode-unit-sbus ;
+
+new-device
+ " memory" device-name
+ external
+ : open true ;
+ : close ;
+ \ claim ( phys size align -- base )
+ \ release ( phys size -- )
+finish-device
+
+new-device
+ " virtual-memory" device-name
+ external
+ : open true ;
+ : close ;
+ \ claim ( phys size align -- base )
+ \ release ( phys size -- )
+finish-device
+
+" /options" find-device
+ " disk" encode-string " boot-from" property
+
Added: openbios-devel/arch/sparc64/ttable.h
===================================================================
--- openbios-devel/arch/sparc64/ttable.h (rev 0)
+++ openbios-devel/arch/sparc64/ttable.h 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,407 @@
+/* $Id: ttable.h,v 1.18 2002/02/09 19:49:32 davem Exp $ */
+#ifndef _SPARC64_TTABLE_H
+#define _SPARC64_TTABLE_H
+
+//#include <linux/config.h>
+//#include <asm/utrap.h>
+
+//#ifdef __ASSEMBLY__
+//#include <asm/thread_info.h>
+//#endif
+
+//#define BOOT_KERNEL b sparc64_boot; nop; nop; nop; nop; nop; nop; nop;
+
+/* We need a "cleaned" instruction... */
+#define CLEAN_WINDOW \
+ rdpr %cleanwin, %l0; add %l0, 1, %l0; \
+ wrpr %l0, 0x0, %cleanwin; \
+ clr %o0; clr %o1; clr %o2; clr %o3; \
+ clr %o4; clr %o5; clr %o6; clr %o7; \
+ clr %l0; clr %l1; clr %l2; clr %l3; \
+ clr %l4; clr %l5; clr %l6; clr %l7; \
+ retry; \
+ nop;nop;nop;nop;nop;nop;nop;nop;nop;nop;nop;nop;
+
+#define TRAP(routine) \
+ sethi %hi(109f), %g7; \
+ ba,pt %xcc, etrap; \
+109: or %g7, %lo(109b), %g7; \
+ call routine; \
+ add %sp, PTREGS_OFF, %o0; \
+ ba,pt %xcc, rtrap; \
+ clr %l6; \
+ nop;
+
+#define TRAP_7INSNS(routine) \
+ sethi %hi(109f), %g7; \
+ ba,pt %xcc, etrap; \
+109: or %g7, %lo(109b), %g7; \
+ call routine; \
+ add %sp, PTREGS_OFF, %o0; \
+ ba,pt %xcc, rtrap; \
+ clr %l6;
+
+#define TRAP_SAVEFPU(routine) \
+ sethi %hi(109f), %g7; \
+ ba,pt %xcc, do_fptrap; \
+109: or %g7, %lo(109b), %g7; \
+ call routine; \
+ add %sp, PTREGS_OFF, %o0; \
+ ba,pt %xcc, rtrap; \
+ clr %l6; \
+ nop;
+
+#define TRAP_NOSAVE(routine) \
+ ba,pt %xcc, routine; \
+ nop; \
+ nop; nop; nop; nop; nop; nop;
+
+#define TRAP_NOSAVE_7INSNS(routine) \
+ ba,pt %xcc, routine; \
+ nop; \
+ nop; nop; nop; nop; nop;
+
+#define TRAPTL1(routine) \
+ sethi %hi(109f), %g7; \
+ ba,pt %xcc, etraptl1; \
+109: or %g7, %lo(109b), %g7; \
+ call routine; \
+ add %sp, PTREGS_OFF, %o0; \
+ ba,pt %xcc, rtrap; \
+ clr %l6; \
+ nop;
+
+#define TRAP_ARG(routine, arg) \
+ sethi %hi(109f), %g7; \
+ ba,pt %xcc, etrap; \
+109: or %g7, %lo(109b), %g7; \
+ add %sp, PTREGS_OFF, %o0; \
+ call routine; \
+ mov arg, %o1; \
+ ba,pt %xcc, rtrap; \
+ clr %l6;
+
+#define TRAPTL1_ARG(routine, arg) \
+ sethi %hi(109f), %g7; \
+ ba,pt %xcc, etraptl1; \
+109: or %g7, %lo(109b), %g7; \
+ add %sp, PTREGS_OFF, %o0; \
+ call routine; \
+ mov arg, %o1; \
+ ba,pt %xcc, rtrap; \
+ clr %l6;
+
+#define SYSCALL_TRAP(routine, systbl) \
+ sethi %hi(109f), %g7; \
+ ba,pt %xcc, scetrap; \
+109: or %g7, %lo(109b), %g7; \
+ sethi %hi(systbl), %l7; \
+ ba,pt %xcc, routine; \
+ or %l7, %lo(systbl), %l7; \
+ nop; nop;
+
+#define INDIRECT_SOLARIS_SYSCALL(num) \
+ sethi %hi(109f), %g7; \
+ ba,pt %xcc, etrap; \
+109: or %g7, %lo(109b), %g7; \
+ ba,pt %xcc, tl0_solaris + 0xc; \
+ mov num, %g1; \
+ nop;nop;nop;
+
+#define TRAP_UTRAP(handler,lvl) \
+ ldx [%g6 + TI_UTRAPS], %g1; \
+ sethi %hi(109f), %g7; \
+ brz,pn %g1, utrap; \
+ or %g7, %lo(109f), %g7; \
+ ba,pt %xcc, utrap; \
+109: ldx [%g1 + handler*8], %g1; \
+ ba,pt %xcc, utrap_ill; \
+ mov lvl, %o1;
+
+#ifdef CONFIG_SUNOS_EMUL
+#define SUNOS_SYSCALL_TRAP SYSCALL_TRAP(linux_sparc_syscall32, sunos_sys_table)
+#else
+#define SUNOS_SYSCALL_TRAP TRAP(sunos_syscall)
+#endif
+#ifdef CONFIG_COMPAT
+#define LINUX_32BIT_SYSCALL_TRAP SYSCALL_TRAP(linux_sparc_syscall32, sys_call_table32)
+#else
+#define LINUX_32BIT_SYSCALL_TRAP BTRAP(0x110)
+#endif
+#define LINUX_64BIT_SYSCALL_TRAP SYSCALL_TRAP(linux_sparc_syscall, sys_call_table64)
+#define GETCC_TRAP TRAP(getcc)
+#define SETCC_TRAP TRAP(setcc)
+#ifdef CONFIG_SOLARIS_EMUL
+#define SOLARIS_SYSCALL_TRAP TRAP(solaris_sparc_syscall)
+#else
+#define SOLARIS_SYSCALL_TRAP TRAP(solaris_syscall)
+#endif
+/* FIXME: Write these actually */
+#define NETBSD_SYSCALL_TRAP TRAP(netbsd_syscall)
+#define BREAKPOINT_TRAP TRAP(breakpoint_trap)
+
+#define TRAP_IRQ(routine, level) \
+ rdpr %pil, %g2; \
+ wrpr %g0, 15, %pil; \
+ b,pt %xcc, etrap_irq; \
+ rd %pc, %g7; \
+ mov level, %o0; \
+ call routine; \
+ add %sp, PTREGS_OFF, %o1; \
+ ba,a,pt %xcc, rtrap_irq;
+
+#define TICK_SMP_IRQ \
+ rdpr %pil, %g2; \
+ wrpr %g0, 15, %pil; \
+ sethi %hi(109f), %g7; \
+ b,pt %xcc, etrap_irq; \
+109: or %g7, %lo(109b), %g7; \
+ call smp_percpu_timer_interrupt; \
+ add %sp, PTREGS_OFF, %o0; \
+ ba,a,pt %xcc, rtrap_irq;
+
+#define TRAP_IVEC TRAP_NOSAVE(do_ivec)
+
+#define BTRAP(lvl) TRAP_ARG(bad_trap, lvl)
+
+#define BTRAPTL1(lvl) TRAPTL1_ARG(bad_trap_tl1, lvl)
+
+#define FLUSH_WINDOW_TRAP \
+ ba,pt %xcc, etrap; \
+ rd %pc, %g7; \
+ flushw; \
+ ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1; \
+ add %l1, 4, %l2; \
+ stx %l1, [%sp + PTREGS_OFF + PT_V9_TPC]; \
+ ba,pt %xcc, rtrap_clr_l6; \
+ stx %l2, [%sp + PTREGS_OFF + PT_V9_TNPC];
+
+#ifdef CONFIG_KPROBES
+#define KPROBES_TRAP(lvl) TRAP_IRQ(kprobe_trap, lvl)
+#else
+#define KPROBES_TRAP(lvl) TRAP_ARG(bad_trap, lvl)
+#endif
+
+/* Before touching these macros, you owe it to yourself to go and
+ * see how arch/sparc64/kernel/winfixup.S works... -DaveM
+ *
+ * For the user cases we used to use the %asi register, but
+ * it turns out that the "wr xxx, %asi" costs ~5 cycles, so
+ * now we use immediate ASI loads and stores instead. Kudos
+ * to Greg Onufer for pointing out this performance anomaly.
+ *
+ * Further note that we cannot use the g2, g4, g5, and g7 alternate
+ * globals in the spill routines, check out the save instruction in
+ * arch/sparc64/kernel/etrap.S to see what I mean about g2, and
+ * g4/g5 are the globals which are preserved by etrap processing
+ * for the caller of it. The g7 register is the return pc for
+ * etrap. Finally, g6 is the current thread register so we cannot
+ * us it in the spill handlers either. Most of these rules do not
+ * apply to fill processing, only g6 is not usable.
+ */
+
+/* Normal kernel spill */
+#define SPILL_0_NORMAL \
+ stx %l0, [%sp + STACK_BIAS + 0x00]; \
+ stx %l1, [%sp + STACK_BIAS + 0x08]; \
+ stx %l2, [%sp + STACK_BIAS + 0x10]; \
+ stx %l3, [%sp + STACK_BIAS + 0x18]; \
+ stx %l4, [%sp + STACK_BIAS + 0x20]; \
+ stx %l5, [%sp + STACK_BIAS + 0x28]; \
+ stx %l6, [%sp + STACK_BIAS + 0x30]; \
+ stx %l7, [%sp + STACK_BIAS + 0x38]; \
+ stx %i0, [%sp + STACK_BIAS + 0x40]; \
+ stx %i1, [%sp + STACK_BIAS + 0x48]; \
+ stx %i2, [%sp + STACK_BIAS + 0x50]; \
+ stx %i3, [%sp + STACK_BIAS + 0x58]; \
+ stx %i4, [%sp + STACK_BIAS + 0x60]; \
+ stx %i5, [%sp + STACK_BIAS + 0x68]; \
+ stx %i6, [%sp + STACK_BIAS + 0x70]; \
+ stx %i7, [%sp + STACK_BIAS + 0x78]; \
+ saved; retry; nop; nop; nop; nop; nop; nop; \
+ nop; nop; nop; nop; nop; nop; nop; nop;
+
+/* Normal 64bit spill */
+#define SPILL_1_GENERIC(ASI) \
+ add %sp, STACK_BIAS + 0x00, %g1; \
+ stxa %l0, [%g1 + %g0] ASI; \
+ mov 0x08, %g3; \
+ stxa %l1, [%g1 + %g3] ASI; \
+ add %g1, 0x10, %g1; \
+ stxa %l2, [%g1 + %g0] ASI; \
+ stxa %l3, [%g1 + %g3] ASI; \
+ add %g1, 0x10, %g1; \
+ stxa %l4, [%g1 + %g0] ASI; \
+ stxa %l5, [%g1 + %g3] ASI; \
+ add %g1, 0x10, %g1; \
+ stxa %l6, [%g1 + %g0] ASI; \
+ stxa %l7, [%g1 + %g3] ASI; \
+ add %g1, 0x10, %g1; \
+ stxa %i0, [%g1 + %g0] ASI; \
+ stxa %i1, [%g1 + %g3] ASI; \
+ add %g1, 0x10, %g1; \
+ stxa %i2, [%g1 + %g0] ASI; \
+ stxa %i3, [%g1 + %g3] ASI; \
+ add %g1, 0x10, %g1; \
+ stxa %i4, [%g1 + %g0] ASI; \
+ stxa %i5, [%g1 + %g3] ASI; \
+ add %g1, 0x10, %g1; \
+ stxa %i6, [%g1 + %g0] ASI; \
+ stxa %i7, [%g1 + %g3] ASI; \
+ saved; \
+ retry; nop; nop; \
+ b,a,pt %xcc, spill_fixup_dax; \
+ b,a,pt %xcc, spill_fixup_mna; \
+ b,a,pt %xcc, spill_fixup;
+
+/* Normal 32bit spill */
+#define SPILL_2_GENERIC(ASI) \
+ srl %sp, 0, %sp; \
+ stwa %l0, [%sp + %g0] ASI; \
+ mov 0x04, %g3; \
+ stwa %l1, [%sp + %g3] ASI; \
+ add %sp, 0x08, %g1; \
+ stwa %l2, [%g1 + %g0] ASI; \
+ stwa %l3, [%g1 + %g3] ASI; \
+ add %g1, 0x08, %g1; \
+ stwa %l4, [%g1 + %g0] ASI; \
+ stwa %l5, [%g1 + %g3] ASI; \
+ add %g1, 0x08, %g1; \
+ stwa %l6, [%g1 + %g0] ASI; \
+ stwa %l7, [%g1 + %g3] ASI; \
+ add %g1, 0x08, %g1; \
+ stwa %i0, [%g1 + %g0] ASI; \
+ stwa %i1, [%g1 + %g3] ASI; \
+ add %g1, 0x08, %g1; \
+ stwa %i2, [%g1 + %g0] ASI; \
+ stwa %i3, [%g1 + %g3] ASI; \
+ add %g1, 0x08, %g1; \
+ stwa %i4, [%g1 + %g0] ASI; \
+ stwa %i5, [%g1 + %g3] ASI; \
+ add %g1, 0x08, %g1; \
+ stwa %i6, [%g1 + %g0] ASI; \
+ stwa %i7, [%g1 + %g3] ASI; \
+ saved; \
+ retry; nop; nop; \
+ b,a,pt %xcc, spill_fixup_dax; \
+ b,a,pt %xcc, spill_fixup_mna; \
+ b,a,pt %xcc, spill_fixup;
+
+#define SPILL_1_NORMAL SPILL_1_GENERIC(ASI_AIUP)
+#define SPILL_2_NORMAL SPILL_2_GENERIC(ASI_AIUP)
+#define SPILL_3_NORMAL SPILL_0_NORMAL
+#define SPILL_4_NORMAL SPILL_0_NORMAL
+#define SPILL_5_NORMAL SPILL_0_NORMAL
+#define SPILL_6_NORMAL SPILL_0_NORMAL
+#define SPILL_7_NORMAL SPILL_0_NORMAL
+
+#define SPILL_0_OTHER SPILL_0_NORMAL
+#define SPILL_1_OTHER SPILL_1_GENERIC(ASI_AIUS)
+#define SPILL_2_OTHER SPILL_2_GENERIC(ASI_AIUS)
+#define SPILL_3_OTHER SPILL_3_NORMAL
+#define SPILL_4_OTHER SPILL_4_NORMAL
+#define SPILL_5_OTHER SPILL_5_NORMAL
+#define SPILL_6_OTHER SPILL_6_NORMAL
+#define SPILL_7_OTHER SPILL_7_NORMAL
+
+/* Normal kernel fill */
+#define FILL_0_NORMAL \
+ ldx [%sp + STACK_BIAS + 0x00], %l0; \
+ ldx [%sp + STACK_BIAS + 0x08], %l1; \
+ ldx [%sp + STACK_BIAS + 0x10], %l2; \
+ ldx [%sp + STACK_BIAS + 0x18], %l3; \
+ ldx [%sp + STACK_BIAS + 0x20], %l4; \
+ ldx [%sp + STACK_BIAS + 0x28], %l5; \
+ ldx [%sp + STACK_BIAS + 0x30], %l6; \
+ ldx [%sp + STACK_BIAS + 0x38], %l7; \
+ ldx [%sp + STACK_BIAS + 0x40], %i0; \
+ ldx [%sp + STACK_BIAS + 0x48], %i1; \
+ ldx [%sp + STACK_BIAS + 0x50], %i2; \
+ ldx [%sp + STACK_BIAS + 0x58], %i3; \
+ ldx [%sp + STACK_BIAS + 0x60], %i4; \
+ ldx [%sp + STACK_BIAS + 0x68], %i5; \
+ ldx [%sp + STACK_BIAS + 0x70], %i6; \
+ ldx [%sp + STACK_BIAS + 0x78], %i7; \
+ restored; retry; nop; nop; nop; nop; nop; nop; \
+ nop; nop; nop; nop; nop; nop; nop; nop;
+
+/* Normal 64bit fill */
+#define FILL_1_GENERIC(ASI) \
+ add %sp, STACK_BIAS + 0x00, %g1; \
+ ldxa [%g1 + %g0] ASI, %l0; \
+ mov 0x08, %g2; \
+ mov 0x10, %g3; \
+ ldxa [%g1 + %g2] ASI, %l1; \
+ mov 0x18, %g5; \
+ ldxa [%g1 + %g3] ASI, %l2; \
+ ldxa [%g1 + %g5] ASI, %l3; \
+ add %g1, 0x20, %g1; \
+ ldxa [%g1 + %g0] ASI, %l4; \
+ ldxa [%g1 + %g2] ASI, %l5; \
+ ldxa [%g1 + %g3] ASI, %l6; \
+ ldxa [%g1 + %g5] ASI, %l7; \
+ add %g1, 0x20, %g1; \
+ ldxa [%g1 + %g0] ASI, %i0; \
+ ldxa [%g1 + %g2] ASI, %i1; \
+ ldxa [%g1 + %g3] ASI, %i2; \
+ ldxa [%g1 + %g5] ASI, %i3; \
+ add %g1, 0x20, %g1; \
+ ldxa [%g1 + %g0] ASI, %i4; \
+ ldxa [%g1 + %g2] ASI, %i5; \
+ ldxa [%g1 + %g3] ASI, %i6; \
+ ldxa [%g1 + %g5] ASI, %i7; \
+ restored; \
+ retry; nop; nop; nop; nop; \
+ b,a,pt %xcc, fill_fixup_dax; \
+ b,a,pt %xcc, fill_fixup_mna; \
+ b,a,pt %xcc, fill_fixup;
+
+/* Normal 32bit fill */
+#define FILL_2_GENERIC(ASI) \
+ srl %sp, 0, %sp; \
+ lduwa [%sp + %g0] ASI, %l0; \
+ mov 0x04, %g2; \
+ mov 0x08, %g3; \
+ lduwa [%sp + %g2] ASI, %l1; \
+ mov 0x0c, %g5; \
+ lduwa [%sp + %g3] ASI, %l2; \
+ lduwa [%sp + %g5] ASI, %l3; \
+ add %sp, 0x10, %g1; \
+ lduwa [%g1 + %g0] ASI, %l4; \
+ lduwa [%g1 + %g2] ASI, %l5; \
+ lduwa [%g1 + %g3] ASI, %l6; \
+ lduwa [%g1 + %g5] ASI, %l7; \
+ add %g1, 0x10, %g1; \
+ lduwa [%g1 + %g0] ASI, %i0; \
+ lduwa [%g1 + %g2] ASI, %i1; \
+ lduwa [%g1 + %g3] ASI, %i2; \
+ lduwa [%g1 + %g5] ASI, %i3; \
+ add %g1, 0x10, %g1; \
+ lduwa [%g1 + %g0] ASI, %i4; \
+ lduwa [%g1 + %g2] ASI, %i5; \
+ lduwa [%g1 + %g3] ASI, %i6; \
+ lduwa [%g1 + %g5] ASI, %i7; \
+ restored; \
+ retry; nop; nop; nop; nop; \
+ b,a,pt %xcc, fill_fixup_dax; \
+ b,a,pt %xcc, fill_fixup_mna; \
+ b,a,pt %xcc, fill_fixup;
+
+#define FILL_1_NORMAL FILL_1_GENERIC(ASI_AIUP)
+#define FILL_2_NORMAL FILL_2_GENERIC(ASI_AIUP)
+#define FILL_3_NORMAL FILL_0_NORMAL
+#define FILL_4_NORMAL FILL_0_NORMAL
+#define FILL_5_NORMAL FILL_0_NORMAL
+#define FILL_6_NORMAL FILL_0_NORMAL
+#define FILL_7_NORMAL FILL_0_NORMAL
+
+#define FILL_0_OTHER FILL_0_NORMAL
+#define FILL_1_OTHER FILL_1_GENERIC(ASI_AIUS)
+#define FILL_2_OTHER FILL_2_GENERIC(ASI_AIUS)
+#define FILL_3_OTHER FILL_3_NORMAL
+#define FILL_4_OTHER FILL_4_NORMAL
+#define FILL_5_OTHER FILL_5_NORMAL
+#define FILL_6_OTHER FILL_6_NORMAL
+#define FILL_7_OTHER FILL_7_NORMAL
+
+#endif /* !(_SPARC64_TTABLE_H) */
Added: openbios-devel/arch/sparc64/vectors.S
===================================================================
--- openbios-devel/arch/sparc64/vectors.S (rev 0)
+++ openbios-devel/arch/sparc64/vectors.S 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,322 @@
+/*
+ * <vectors.S>
+ *
+ * Sparc V9 Trap Table(s) with SpitFire/Cheetah extensions.
+ *
+ * Copyright (C) 1996, 2001 David S. Miller (davem(a)caip.rutgers.edu)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License V2
+ * as published by the Free Software Foundation
+ */
+
+#define __ASSEMBLY__
+#include "pstate.h"
+#include "asi.h"
+#include "ttable.h"
+#define ASI_BP ASI_PHYS_BYPASS_EC_E
+#define SER_ADDR 0x1fe020003f8
+
+ .section ".text.vectors", "ax"
+ .align 16384
+/* Sparc64 trap table */
+ .globl trap_table, __divide_error
+ .register %g2, #scratch
+ .register %g3, #scratch
+ .register %g6, #scratch
+ .register %g7, #scratch
+trap_table:
+#undef TRAP_IRQ
+#define TRAP_IRQ(routine, level) \
+ ba routine; nop; nop; nop; nop; nop; nop; nop;
+#undef BTRAP
+#define BTRAP(lvl) \
+ ba bug; mov lvl, %g1; nop; nop; nop; nop; nop; nop;
+#undef BTRAPTL1
+#define BTRAPTL1(lvl) BTRAP(lvl)
+#define BTRAPS(x) BTRAP(x) BTRAP(x+1) BTRAP(x+2) BTRAP(x+3) BTRAP(x+4) BTRAP(x+5) BTRAP(x+6) BTRAP(x+7)
+
+#define STACK_BIAS 2047
+ .globl sparc64_ttable_tl0, sparc64_ttable_tl1
+sparc64_ttable_tl0:
+ ba entry; nop; nop; nop; nop; nop; nop; nop;
+ BTRAP(0x01) BTRAP(0x02) BTRAP(0x03) BTRAP(0x04) BTRAP(0x05) BTRAP(0x06) BTRAP(0x07)
+ BTRAPS(0x08)
+ BTRAPS(0x10) BTRAPS(0x18)
+ BTRAP(0x20) BTRAP(0x21) BTRAP(0x22) BTRAP(0x23)
+ CLEAN_WINDOW ! 24-27
+ BTRAPS(0x28)
+ BTRAPS(0x30) BTRAPS(0x38)
+#if 0
+ BTRAP(0x40) BTRAP(0x41) BTRAP(0x42) BTRAP(0x43)
+tl0_irq4: TRAP_IRQ(handler_irq, 4)
+tl0_irq5: TRAP_IRQ(handler_irq, 5) TRAP_IRQ(handler_irq, 6)
+tl0_irq7: TRAP_IRQ(handler_irq, 7) TRAP_IRQ(handler_irq, 8)
+tl0_irq9: TRAP_IRQ(handler_irq, 9) TRAP_IRQ(handler_irq, 10)
+tl0_irq11: TRAP_IRQ(handler_irq, 11) TRAP_IRQ(handler_irq, 12)
+tl0_irq13: TRAP_IRQ(handler_irq, 13)
+tl0_irq14: TRAP_IRQ(handler_irq, 14)
+tl0_irq15: TRAP_IRQ(handler_irq, 15)
+#else
+ BTRAPS(0x40) BTRAPS(0x48)
+#endif
+ BTRAPS(0x50) BTRAPS(0x58)
+ BTRAPS(0x60) BTRAPS(0x68)
+ BTRAPS(0x70) BTRAPS(0x78)
+tl0_s0n: SPILL_0_NORMAL
+tl0_s1n: SPILL_1_NORMAL
+tl0_s2n: SPILL_2_NORMAL
+tl0_s3n: SPILL_3_NORMAL
+tl0_s4n: SPILL_4_NORMAL
+tl0_s5n: SPILL_5_NORMAL
+tl0_s6n: SPILL_6_NORMAL
+tl0_s7n: SPILL_7_NORMAL
+tl0_s0o: SPILL_0_OTHER
+tl0_s1o: SPILL_1_OTHER
+tl0_s2o: SPILL_2_OTHER
+tl0_s3o: SPILL_3_OTHER
+tl0_s4o: SPILL_4_OTHER
+tl0_s5o: SPILL_5_OTHER
+tl0_s6o: SPILL_6_OTHER
+tl0_s7o: SPILL_7_OTHER
+tl0_f0n: FILL_0_NORMAL
+tl0_f1n: FILL_1_NORMAL
+tl0_f2n: FILL_2_NORMAL
+tl0_f3n: FILL_3_NORMAL
+tl0_f4n: FILL_4_NORMAL
+tl0_f5n: FILL_5_NORMAL
+tl0_f6n: FILL_6_NORMAL
+tl0_f7n: FILL_7_NORMAL
+tl0_f0o: FILL_0_OTHER
+tl0_f1o: FILL_1_OTHER
+tl0_f2o: FILL_2_OTHER
+tl0_f3o: FILL_3_OTHER
+tl0_f4o: FILL_4_OTHER
+tl0_f5o: FILL_5_OTHER
+tl0_f6o: FILL_6_OTHER
+tl0_f7o: FILL_7_OTHER
+tl0_resv100: BTRAPS(0x100) BTRAPS(0x108)
+tl0_resv110: BTRAPS(0x110) BTRAPS(0x118)
+tl0_resv120: BTRAPS(0x120) BTRAPS(0x128)
+tl0_resv130: BTRAPS(0x130) BTRAPS(0x138)
+tl0_resv140: BTRAPS(0x140) BTRAPS(0x148)
+tl0_resv150: BTRAPS(0x150) BTRAPS(0x158)
+tl0_resv160: BTRAPS(0x160) BTRAPS(0x168)
+tl0_resv170: BTRAPS(0x170) BTRAPS(0x178)
+tl0_resv180: BTRAPS(0x180) BTRAPS(0x188)
+tl0_resv190: BTRAPS(0x190) BTRAPS(0x198)
+tl0_resv1a0: BTRAPS(0x1a0) BTRAPS(0x1a8)
+tl0_resv1b0: BTRAPS(0x1b0) BTRAPS(0x1b8)
+tl0_resv1c0: BTRAPS(0x1c0) BTRAPS(0x1c8)
+tl0_resv1d0: BTRAPS(0x1d0) BTRAPS(0x1d8)
+tl0_resv1e0: BTRAPS(0x1e0) BTRAPS(0x1e8)
+tl0_resv1f0: BTRAPS(0x1f0) BTRAPS(0x1f8)
+
+#undef BTRAPS
+#define BTRAPS(x) BTRAPTL1(x) BTRAPTL1(x+1) BTRAPTL1(x+2) BTRAPTL1(x+3) BTRAPTL1(x+4) BTRAPTL1(x+5) BTRAPTL1(x+6) BTRAPTL1(x+7)
+
+sparc64_ttable_tl1:
+ BTRAPS(0x00) BTRAPS(0x08)
+ BTRAPS(0x10) BTRAPS(0x18)
+ BTRAPTL1(0x20) BTRAPTL1(0x21) BTRAPTL1(0x22) BTRAPTL1(0x23)
+ CLEAN_WINDOW ! 24-27
+ BTRAPS(0x28)
+ BTRAPS(0x30) BTRAPS(0x38)
+#if 0
+ BTRAPTL1(0x40) BTRAPTL1(0x41) BTRAPTL1(0x42) BTRAPTL1(0x43)
+tl1_irq4: TRAP_IRQ(handler_irq, 4)
+tl1_irq5: TRAP_IRQ(handler_irq, 5) TRAP_IRQ(handler_irq, 6)
+tl1_irq7: TRAP_IRQ(handler_irq, 7) TRAP_IRQ(handler_irq, 8)
+tl1_irq9: TRAP_IRQ(handler_irq, 9) TRAP_IRQ(handler_irq, 10)
+tl1_irq11: TRAP_IRQ(handler_irq, 11) TRAP_IRQ(handler_irq, 12)
+tl1_irq13: TRAP_IRQ(handler_irq, 13)
+tl1_irq14: TRAP_IRQ(handler_irq, 14)
+tl1_irq15: TRAP_IRQ(handler_irq, 15)
+#else
+ BTRAPS(0x40) BTRAPS(0x48)
+#endif
+ BTRAPS(0x50) BTRAPS(0x58)
+ BTRAPS(0x60) BTRAPS(0x68)
+ BTRAPS(0x70) BTRAPS(0x78)
+tl1_s0n: SPILL_0_NORMAL
+tl1_s1n: SPILL_1_NORMAL
+tl1_s2n: SPILL_2_NORMAL
+tl1_s3n: SPILL_3_NORMAL
+tl1_s4n: SPILL_4_NORMAL
+tl1_s5n: SPILL_5_NORMAL
+tl1_s6n: SPILL_6_NORMAL
+tl1_s7n: SPILL_7_NORMAL
+tl1_s0o: SPILL_0_OTHER
+tl1_s1o: SPILL_1_OTHER
+tl1_s2o: SPILL_2_OTHER
+tl1_s3o: SPILL_3_OTHER
+tl1_s4o: SPILL_4_OTHER
+tl1_s5o: SPILL_5_OTHER
+tl1_s6o: SPILL_6_OTHER
+tl1_s7o: SPILL_7_OTHER
+tl1_f0n: FILL_0_NORMAL
+tl1_f1n: FILL_1_NORMAL
+tl1_f2n: FILL_2_NORMAL
+tl1_f3n: FILL_3_NORMAL
+tl1_f4n: FILL_4_NORMAL
+tl1_f5n: FILL_5_NORMAL
+tl1_f6n: FILL_6_NORMAL
+tl1_f7n: FILL_7_NORMAL
+tl1_f0o: FILL_0_OTHER
+tl1_f1o: FILL_1_OTHER
+tl1_f2o: FILL_2_OTHER
+tl1_f3o: FILL_3_OTHER
+tl1_f4o: FILL_4_OTHER
+tl1_f5o: FILL_5_OTHER
+tl1_f6o: FILL_6_OTHER
+tl1_f7o: FILL_7_OTHER
+tl1_resv100: BTRAPS(0x100) BTRAPS(0x108)
+tl1_resv110: BTRAPS(0x110) BTRAPS(0x118)
+tl1_resv120: BTRAPS(0x120) BTRAPS(0x128)
+tl1_resv130: BTRAPS(0x130) BTRAPS(0x138)
+tl1_resv140: BTRAPS(0x140) BTRAPS(0x148)
+tl1_resv150: BTRAPS(0x150) BTRAPS(0x158)
+tl1_resv160: BTRAPS(0x160) BTRAPS(0x168)
+tl1_resv170: BTRAPS(0x170) BTRAPS(0x178)
+tl1_resv180: BTRAPS(0x180) BTRAPS(0x188)
+tl1_resv190: BTRAPS(0x190) BTRAPS(0x198)
+tl1_resv1a0: BTRAPS(0x1a0) BTRAPS(0x1a8)
+tl1_resv1b0: BTRAPS(0x1b0) BTRAPS(0x1b8)
+tl1_resv1c0: BTRAPS(0x1c0) BTRAPS(0x1c8)
+tl1_resv1d0: BTRAPS(0x1d0) BTRAPS(0x1d8)
+tl1_resv1e0: BTRAPS(0x1e0) BTRAPS(0x1e8)
+tl1_resv1f0: BTRAPS(0x1f0) BTRAPS(0x1f8)
+
+spill_fixup:
+spill_fixup_dax:
+spill_fixup_mna:
+fill_fixup:
+fill_fixup_dax:
+fill_fixup_mna:
+__divide_error:
+bug:
+ /* Dump the exception and its context */
+ ! Set up CPU state
+ wrpr %g0, PSTATE_PRIV, %pstate
+ wr %g0, 0, %fprs
+ wrpr %g0, 0x0, %tl
+
+ ! Disable I/D MMUs and caches
+ stxa %g0, [%g0] ASI_LSU_CONTROL
+
+ ! Extract NWINDOWS from %ver
+ rdpr %ver, %g2
+ and %g2, 0xf, %g2
+ wrpr %g2, 0, %cleanwin
+ wrpr %g2, 0, %cansave
+ wrpr %g0, 0, %canrestore
+ wrpr %g0, 0, %otherwin
+ wrpr %g0, 0, %wstate
+
+ call dump_exception
+ nop
+_forever:
+ /* Loop forever */
+ b _forever ;
+ nop
+outstr:
+ /* void outstr (unsigned long port, const unsigned char *str);
+ * Writes a string on an IO port.
+ */
+1: ldub [%o1], %o3
+ cmp %o3, 0
+ be 2f
+ nop
+ stba %o3, [%o0] ASI_BP
+ b 1b
+ inc %o1
+2: retl
+ nop
+
+outdigit:
+ /* void outdigit (unsigned long port, uint8_t digit);
+ * Dumps a single digit on serial port.
+ */
+ add %o1, '0', %o1
+ retl
+ stba %o1, [%o0] ASI_BP
+
+outhex:
+ /* void outhex (unsigned long port, uint64_t value);
+ * Dumps a 64 bits hex number on serial port
+ */
+ mov %o1, %o2
+ set 60, %o3
+ srlx %o2, %o3, %o1
+1: and %o1, 0xf, %o1
+ cmp %o1, 9
+ bgt 2f
+ nop
+ b 3f
+ add %o1, '0', %o1
+2: add %o1, 'a' - 10, %o1
+3: stba %o1, [%o0] ASI_BP
+ subcc %o3, 4, %o3
+ bge 1b
+ srlx %o2, %o3, %o1
+ retl
+ nop
+
+ /* void dump_exception ();
+ *
+ * Dump a message when catching an exception
+ */
+dump_exception:
+ setx SER_ADDR, %o3, %o0
+ setx (_BUG_message_0), %o3, %o1
+ call outstr
+ nop
+
+ call outhex
+ mov %g1, %o1
+
+ setx (_BUG_message_1), %o3, %o1
+ call outstr
+ nop
+
+ call outhex
+ rdpr %tpc, %o1
+
+ setx (_BUG_message_2), %o3, %o1
+ call outstr
+ nop
+
+ call outhex
+ rdpr %tnpc, %o1
+
+ setx (_BUG_message_3), %o3, %o1
+ call outstr
+ nop
+
+ retl
+ nop
+
+//#include "winfixup.S"
+
+ .section .rodata
+_BUG_message_0:
+ .string "Unhandled Exception 0x"
+_BUG_message_1:
+ .string "\nPC = 0x"
+_BUG_message_2:
+ .string " NPC = 0x"
+_BUG_message_3:
+ .string "\nStopping execution\n"
Added: openbios-devel/arch/sparc64/winfixup.S
===================================================================
--- openbios-devel/arch/sparc64/winfixup.S (rev 0)
+++ openbios-devel/arch/sparc64/winfixup.S 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,240 @@
+/* $Id: winfixup.S,v 1.30 2002/02/09 19:49:30 davem Exp $
+ *
+ * winfixup.S: Handle cases where user stack pointer is found to be bogus.
+ *
+ * Copyright (C) 1997 David S. Miller (davem(a)caip.rutgers.edu)
+ */
+
+#include "asi.h"
+#include "spitfire.h"
+#if 0
+#include <asm/head.h>
+#include <asm/page.h>
+#include <asm/ptrace.h>
+#include <asm/processor.h>
+#include <asm/thread_info.h>
+#else
+#define FAULT_CODE_WRITE 0x01 /* Write access, implies D-TLB */
+#define FAULT_CODE_DTLB 0x02 /* Miss happened in D-TLB */
+#define FAULT_CODE_ITLB 0x04 /* Miss happened in I-TLB */
+#define FAULT_CODE_WINFIXUP 0x08 /* Miss happened during spill/fill */
+#define FAULT_CODE_BLKCOMMIT 0x10 /* Use blk-commit ASI in copy_page */
+#endif
+ .text
+ .align 32
+
+ /* Here are the rules, pay attention.
+ *
+ * The kernel is disallowed from touching user space while
+ * the trap level is greater than zero, except for from within
+ * the window spill/fill handlers. This must be followed
+ * so that we can easily detect the case where we tried to
+ * spill/fill with a bogus (or unmapped) user stack pointer.
+ *
+ * These are layed out in a special way for cache reasons,
+ * don't touch...
+ */
+ .globl fill_fixup, spill_fixup
+fill_fixup:
+ rdpr %tstate, %g1
+ or %g4, FAULT_CODE_WINFIXUP, %g4
+ and %g1, TSTATE_CWP, %g1
+
+ /* This is the extremely complex case, but it does happen from
+ * time to time if things are just right. Essentially the restore
+ * done in rtrap right before going back to user mode, with tl=1
+ * and that levels trap stack registers all setup, took a fill trap,
+ * the user stack was not mapped in the tlb, and tlb miss occurred,
+ * the pte found was not valid, and a simple ref bit watch update
+ * could not satisfy the miss, so we got here.
+ *
+ * We must carefully unwind the state so we get back to tl=0, preserve
+ * all the register values we were going to give to the user. Luckily
+ * most things are where they need to be, we also have the address
+ * which triggered the fault handy as well.
+ *
+ * Also note that we must preserve %l5 and %l6. If the user was
+ * returning from a system call, we must make it look this way
+ * after we process the fill fault on the users stack.
+ *
+ * First, get into the window where the original restore was executed.
+ */
+
+ rdpr %wstate, %g2 ! Grab user mode wstate.
+ wrpr %g1, %cwp ! Get into the right window.
+ sll %g2, 3, %g2 ! NORMAL-->OTHER
+
+ wrpr %g0, 0x0, %canrestore ! Standard etrap stuff.
+ wrpr %g2, 0x0, %wstate ! This must be consistent.
+ wrpr %g0, 0x0, %otherwin ! We know this.
+ mov PRIMARY_CONTEXT, %g1 ! Change contexts...
+ stxa %g0, [%g1] ASI_DMMU ! Back into the nucleus.
+ flush %g6 ! Flush instruction buffers
+ rdpr %pstate, %l1 ! Prepare to change globals.
+ mov %g6, %o7 ! Get current.
+
+ andn %l1, PSTATE_MM, %l1 ! We want to be in RMO
+ stb %g4, [%g6 + TI_FAULT_CODE]
+ stx %g5, [%g6 + TI_FAULT_ADDR]
+ wrpr %g0, 0x0, %tl ! Out of trap levels.
+ wrpr %l1, (PSTATE_IE | PSTATE_AG | PSTATE_RMO), %pstate
+ mov %o7, %g6
+ ldx [%g6 + TI_TASK], %g4
+
+ /* This is the same as below, except we handle this a bit special
+ * since we must preserve %l5 and %l6, see comment above.
+ */
+ call do_sparc64_fault
+ add %sp, PTREGS_OFF, %o0
+ ba,pt %xcc, rtrap
+ nop ! yes, nop is correct
+
+ /* Be very careful about usage of the alternate globals here.
+ * You cannot touch %g4/%g5 as that has the fault information
+ * should this be from usermode. Also be careful for the case
+ * where we get here from the save instruction in etrap.S when
+ * coming from either user or kernel (does not matter which, it
+ * is the same problem in both cases). Essentially this means
+ * do not touch %g7 or %g2 so we handle the two cases fine.
+ */
+spill_fixup:
+ ldx [%g6 + TI_FLAGS], %g1
+ andcc %g1, _TIF_32BIT, %g0
+ ldub [%g6 + TI_WSAVED], %g1
+
+ sll %g1, 3, %g3
+ add %g6, %g3, %g3
+ stx %sp, [%g3 + TI_RWIN_SPTRS]
+ sll %g1, 7, %g3
+ bne,pt %xcc, 1f
+ add %g6, %g3, %g3
+ stx %l0, [%g3 + TI_REG_WINDOW + 0x00]
+ stx %l1, [%g3 + TI_REG_WINDOW + 0x08]
+
+ stx %l2, [%g3 + TI_REG_WINDOW + 0x10]
+ stx %l3, [%g3 + TI_REG_WINDOW + 0x18]
+ stx %l4, [%g3 + TI_REG_WINDOW + 0x20]
+ stx %l5, [%g3 + TI_REG_WINDOW + 0x28]
+ stx %l6, [%g3 + TI_REG_WINDOW + 0x30]
+ stx %l7, [%g3 + TI_REG_WINDOW + 0x38]
+ stx %i0, [%g3 + TI_REG_WINDOW + 0x40]
+ stx %i1, [%g3 + TI_REG_WINDOW + 0x48]
+
+ stx %i2, [%g3 + TI_REG_WINDOW + 0x50]
+ stx %i3, [%g3 + TI_REG_WINDOW + 0x58]
+ stx %i4, [%g3 + TI_REG_WINDOW + 0x60]
+ stx %i5, [%g3 + TI_REG_WINDOW + 0x68]
+ stx %i6, [%g3 + TI_REG_WINDOW + 0x70]
+ b,pt %xcc, 2f
+ stx %i7, [%g3 + TI_REG_WINDOW + 0x78]
+1: stw %l0, [%g3 + TI_REG_WINDOW + 0x00]
+
+ stw %l1, [%g3 + TI_REG_WINDOW + 0x04]
+ stw %l2, [%g3 + TI_REG_WINDOW + 0x08]
+ stw %l3, [%g3 + TI_REG_WINDOW + 0x0c]
+ stw %l4, [%g3 + TI_REG_WINDOW + 0x10]
+ stw %l5, [%g3 + TI_REG_WINDOW + 0x14]
+ stw %l6, [%g3 + TI_REG_WINDOW + 0x18]
+ stw %l7, [%g3 + TI_REG_WINDOW + 0x1c]
+ stw %i0, [%g3 + TI_REG_WINDOW + 0x20]
+
+ stw %i1, [%g3 + TI_REG_WINDOW + 0x24]
+ stw %i2, [%g3 + TI_REG_WINDOW + 0x28]
+ stw %i3, [%g3 + TI_REG_WINDOW + 0x2c]
+ stw %i4, [%g3 + TI_REG_WINDOW + 0x30]
+ stw %i5, [%g3 + TI_REG_WINDOW + 0x34]
+ stw %i6, [%g3 + TI_REG_WINDOW + 0x38]
+ stw %i7, [%g3 + TI_REG_WINDOW + 0x3c]
+2: add %g1, 1, %g1
+
+ stb %g1, [%g6 + TI_WSAVED]
+ rdpr %tstate, %g1
+ saved
+ and %g1, TSTATE_CWP, %g1
+ mov FAULT_CODE_WRITE | FAULT_CODE_DTLB | FAULT_CODE_WINFIXUP, %g4
+ retry
+
+ .globl winfix_mna, fill_fixup_mna, spill_fixup_mna
+winfix_mna:
+ andn %g3, 0x7f, %g3
+ add %g3, 0x78, %g3
+ wrpr %g3, %tnpc
+ done
+fill_fixup_mna:
+ rdpr %tstate, %g1
+ and %g1, TSTATE_CWP, %g1
+
+ /* Please, see fill_fixup commentary about why we must preserve
+ * %l5 and %l6 to preserve absolute correct semantics.
+ */
+ rdpr %wstate, %g2 ! Grab user mode wstate.
+ wrpr %g1, %cwp ! Get into the right window.
+ sll %g2, 3, %g2 ! NORMAL-->OTHER
+ wrpr %g0, 0x0, %canrestore ! Standard etrap stuff.
+
+ wrpr %g2, 0x0, %wstate ! This must be consistent.
+ wrpr %g0, 0x0, %otherwin ! We know this.
+ mov PRIMARY_CONTEXT, %g1 ! Change contexts...
+ stxa %g0, [%g1] ASI_DMMU ! Back into the nucleus.
+ flush %g6 ! Flush instruction buffers
+ rdpr %pstate, %l1 ! Prepare to change globals.
+ mov %g4, %o2 ! Setup args for
+ mov %g5, %o1 ! final call to mem_address_unaligned.
+ andn %l1, PSTATE_MM, %l1 ! We want to be in RMO
+
+ mov %g6, %o7 ! Stash away current.
+ wrpr %g0, 0x0, %tl ! Out of trap levels.
+ wrpr %l1, (PSTATE_IE | PSTATE_AG | PSTATE_RMO), %pstate
+ mov %o7, %g6 ! Get current back.
+ ldx [%g6 + TI_TASK], %g4 ! Finish it.
+ call mem_address_unaligned
+ add %sp, PTREGS_OFF, %o0
+
+ b,pt %xcc, rtrap
+ nop ! yes, the nop is correct
+spill_fixup_mna:
+ ldx [%g6 + TI_FLAGS], %g1
+ andcc %g1, _TIF_32BIT, %g0
+ ldub [%g6 + TI_WSAVED], %g1
+ sll %g1, 3, %g3
+ add %g6, %g3, %g3
+ stx %sp, [%g3 + TI_RWIN_SPTRS]
+
+ sll %g1, 7, %g3
+ bne,pt %xcc, 1f
+ add %g6, %g3, %g3
+ stx %l0, [%g3 + TI_REG_WINDOW + 0x00]
+ stx %l1, [%g3 + TI_REG_WINDOW + 0x08]
+ stx %l2, [%g3 + TI_REG_WINDOW + 0x10]
+ stx %l3, [%g3 + TI_REG_WINDOW + 0x18]
+ stx %l4, [%g3 + TI_REG_WINDOW + 0x20]
+
+ stx %l5, [%g3 + TI_REG_WINDOW + 0x28]
+ stx %l6, [%g3 + TI_REG_WINDOW + 0x30]
+ stx %l7, [%g3 + TI_REG_WINDOW + 0x38]
+ stx %i0, [%g3 + TI_REG_WINDOW + 0x40]
+ stx %i1, [%g3 + TI_REG_WINDOW + 0x48]
+ stx %i2, [%g3 + TI_REG_WINDOW + 0x50]
+ stx %i3, [%g3 + TI_REG_WINDOW + 0x58]
+ stx %i4, [%g3 + TI_REG_WINDOW + 0x60]
+
+ stx %i5, [%g3 + TI_REG_WINDOW + 0x68]
+ stx %i6, [%g3 + TI_REG_WINDOW + 0x70]
+ stx %i7, [%g3 + TI_REG_WINDOW + 0x78]
+ b,pt %xcc, 2f
+ add %g1, 1, %g1
+1: std %l0, [%g3 + TI_REG_WINDOW + 0x00]
+ std %l2, [%g3 + TI_REG_WINDOW + 0x08]
+ std %l4, [%g3 + TI_REG_WINDOW + 0x10]
+
+ std %l6, [%g3 + TI_REG_WINDOW + 0x18]
+ std %i0, [%g3 + TI_REG_WINDOW + 0x20]
+ std %i2, [%g3 + TI_REG_WINDOW + 0x28]
+ std %i4, [%g3 + TI_REG_WINDOW + 0x30]
+ std %i6, [%g3 + TI_REG_WINDOW + 0x38]
+ add %g1, 1, %g1
+2: stb %g1, [%g6 + TI_WSAVED]
+
+ saved
+ retry
+
Added: openbios-devel/config/examples/cross-sparc64_config.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc64_config.xml (rev 0)
+++ openbios-devel/config/examples/cross-sparc64_config.xml 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<config>
+
+ <!-- generic -->
+ <option name="CONFIG_SPARC" type="boolean" value="true"/>
+ <option name="CONFIG_SPARC64" type="boolean" value="true"/>
+ <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/>
+
+ <!-- kernel binaries (SPARC64) -->
+ <option name="CONFIG_IMAGE_ELF" type="boolean" value="true"/>
+ <option name="CONFIG_IMAGE_ELF_EMBEDDED" type="boolean" value="true"/>
+ <option name="CONFIG_IMAGE_ELF_MULTIBOOT" type="boolean" value="true"/>
+
+ <!-- Build hosted UNIX Binary -->
+ <option name="CONFIG_HOST_UNIX" type="boolean" value="false"/>
+ <option name="CONFIG_UNIX_QT" type="boolean" value="false"/>
+ <option name="CONFIG_PLUGINS" type="boolean" value="false"/>
+
+ <!-- Kernel Debugging -->
+ <option name="CONFIG_DEBUG" type="boolean" value="true"/>
+ <option name="CONFIG_DEBUG_BOOT" type="boolean" value="true"/>
+ <option name="CONFIG_DEBUG_DSTACK" type="boolean" value="false"/>
+ <option name="CONFIG_DEBUG_RSTACK" type="boolean" value="false"/>
+ <option name="CONFIG_DEBUG_DICTIONARY" type="boolean" value="false"/>
+ <option name="CONFIG_DEBUG_INTERNAL" type="boolean" value="false"/>
+ <option name="CONFIG_DEBUG_INTERPRETER" type="boolean" value="false"/>
+ <option name="CONFIG_DEBUG_CONSOLE" type="boolean" value="true"/>
+ <option name="CONFIG_DEBUG_CONSOLE_SERIAL" type="boolean" value="true"/>
+ <option name="CONFIG_DEBUG_SUN_PARTS" type="boolean" value="false"/>
+ <option name="CONFIG_SERIAL_PORT" type="integer" value="0"/>
+ <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/>
+ <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/>
+
+
+ <!-- Module Configuration -->
+ <option name="CONFIG_CMDLINE" type="boolean" value="true"/>
+ <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/>
+
+
+ <!-- Filesystem Configuration -->
+ <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/>
+ <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/>
+ <option name="CONFIG_PC_PARTS" type="boolean" value="false"/>
+ <option name="CONFIG_SUN_PARTS" type="boolean" value="true"/>
+ <option name="CONFIG_FS" type="boolean" value="true"/>
+ <option name="CONFIG_HFS" type="boolean" value="false"/>
+ <option name="CONFIG_HFSP" type="boolean" value="true"/>
+ <option name="CONFIG_GRUBFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_FAT" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_JFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_MINIX" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_REISERFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_XFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_UFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_ISO9660" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_FFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/>
+ <option name="CONFIG_FSYS_AFFS" type="boolean" value="true"/>
+ <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/>
+ <option name="CONFIG_DEBUG_EXT2FS" type="boolean" value="false"/>
+
+ <!-- Miscellaneous -->
+ <option name="CONFIG_LINUXBIOS" type="boolean" value="false"/>
+
+ <!-- Drivers -->
+ <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/>
+ <option name="CONFIG_DEBUG_PCI" type="boolean" value="true"/>
+ <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/>
+ <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/>
+ <option name="CONFIG_DEBUG_IDE" type="boolean" value="true"/>
+ <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/>
+
+</config>
+
Added: openbios-devel/config/examples/cross-sparc64_rules.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc64_rules.xml (rev 0)
+++ openbios-devel/config/examples/cross-sparc64_rules.xml 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,82 @@
+<rules>
+
+<pre><![CDATA[
+#
+# Autogenerated OpenBIOS Makefile
+# (C) 2004-2006 by the OpenBIOS team
+#
+
+ARCH := sparc64
+ODIR := obj-$(ARCH)
+HOSTCC := gcc
+CROSSCFLAGS := -DNATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH -DSWAP_ENDIANNESS
+HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS)
+HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
+
+CC := sparc-linux-gcc
+AS := sparc-linux-as
+AR := sparc-linux-ar
+LD := sparc-linux-ld
+NM := sparc-linux-nm
+STRIP := sparc-linux-strip
+RANLIB := sparc-linux-ranlib
+CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g
+CFLAGS+= -Wa,-xarch=v9 -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany
+CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations
+CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing
+INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
+AS_FLAGS := -Wa,-xarch=v9 -Wa,-64 -g
+
+#
+# pre rules
+#
+
+all: versions dictionaries host-libraries target-libraries host-executables target-executables
+
+VERSION := "1.0RC1"
+
+versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs
+
+$(ODIR)/forth/version.fs:
+ @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \
+ ( echo ": builddate \" $$DATE\" ; " ; \
+ echo ": version \" $(VERSION)\" ; " ; ) \
+ > $(dir $(a))/version.fs
+
+$(ODIR)/target/include/openbios-version.h:
+ @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \
+ ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \
+ echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \
+ echo "#define OPENBIOS_RELEASE \"$(VERSION)\"" ; ) \
+ > $(dir $(a))/openbios-version.h
+]]></pre>
+
+ <!-- host compiler build rules -->
+
+<rule target="host" entity="executable">
+ $(HOSTCC) $(HOSTCFLAGS) -o $@ $^
+</rule>
+
+<rule target="host" entity="object">
+ $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^
+</rule>
+
+<rule target="host" entity="library">
+ $(AR) cru $@ $^; $(RANLIB) $@
+</rule>
+
+ <!-- target/cross compiler build rules -->
+
+<rule target="target" entity="executable">
+ $(CC) $(CFLAGS) -o $@ $^
+</rule>
+
+<rule target="target" entity="object">
+ $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^
+</rule>
+
+<rule target="target" entity="library">
+ $(AR) cru $@ $^; $(RANLIB) $@
+</rule>
+
+</rules>
Added: openbios-devel/config/examples/sparc64_config.xml
===================================================================
--- openbios-devel/config/examples/sparc64_config.xml (rev 0)
+++ openbios-devel/config/examples/sparc64_config.xml 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<config>
+
+ <!-- generic -->
+ <option name="CONFIG_SPARC" type="boolean" value="true"/>
+ <option name="CONFIG_SPARC64" type="boolean" value="true"/>
+ <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/>
+
+ <!-- kernel binaries (SPARC64) -->
+ <option name="CONFIG_IMAGE_ELF" type="boolean" value="true"/>
+ <option name="CONFIG_IMAGE_ELF_EMBEDDED" type="boolean" value="true"/>
+ <option name="CONFIG_IMAGE_ELF_MULTIBOOT" type="boolean" value="true"/>
+
+ <!-- Build hosted UNIX Binary -->
+ <option name="CONFIG_HOST_UNIX" type="boolean" value="true"/>
+ <option name="CONFIG_UNIX_QT" type="boolean" value="false"/>
+ <option name="CONFIG_PLUGINS" type="boolean" value="false"/>
+
+ <!-- Kernel Debugging -->
+ <option name="CONFIG_DEBUG" type="boolean" value="true"/>
+ <option name="CONFIG_DEBUG_BOOT" type="boolean" value="true"/>
+ <option name="CONFIG_DEBUG_DSTACK" type="boolean" value="false"/>
+ <option name="CONFIG_DEBUG_RSTACK" type="boolean" value="false"/>
+ <option name="CONFIG_DEBUG_DICTIONARY" type="boolean" value="false"/>
+ <option name="CONFIG_DEBUG_INTERNAL" type="boolean" value="false"/>
+ <option name="CONFIG_DEBUG_INTERPRETER" type="boolean" value="false"/>
+ <option name="CONFIG_DEBUG_CONSOLE" type="boolean" value="true"/>
+ <option name="CONFIG_DEBUG_CONSOLE_SERIAL" type="boolean" value="true"/>
+ <option name="CONFIG_DEBUG_SUN_PARTS" type="boolean" value="false"/>
+ <option name="CONFIG_SERIAL_PORT" type="integer" value="0"/>
+ <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/>
+ <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/>
+
+
+ <!-- Module Configuration -->
+ <option name="CONFIG_CMDLINE" type="boolean" value="true"/>
+ <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/>
+
+
+ <!-- Filesystem Configuration -->
+ <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/>
+ <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/>
+ <option name="CONFIG_PC_PARTS" type="boolean" value="false"/>
+ <option name="CONFIG_SUN_PARTS" type="boolean" value="true"/>
+ <option name="CONFIG_FS" type="boolean" value="true"/>
+ <option name="CONFIG_HFS" type="boolean" value="false"/>
+ <option name="CONFIG_HFSP" type="boolean" value="true"/>
+ <option name="CONFIG_GRUBFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_FAT" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_JFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_MINIX" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_REISERFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_XFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_UFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_ISO9660" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_FFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/>
+ <option name="CONFIG_FSYS_AFFS" type="boolean" value="true"/>
+ <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/>
+ <option name="CONFIG_DEBUG_EXT2FS" type="boolean" value="false"/>
+
+ <!-- Miscellaneous -->
+ <option name="CONFIG_LINUXBIOS" type="boolean" value="false"/>
+
+ <!-- Drivers -->
+ <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/>
+ <option name="CONFIG_DEBUG_PCI" type="boolean" value="true"/>
+ <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/>
+ <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/>
+ <option name="CONFIG_DEBUG_IDE" type="boolean" value="true"/>
+ <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/>
+
+</config>
+
Added: openbios-devel/config/examples/sparc64_rules.xml
===================================================================
--- openbios-devel/config/examples/sparc64_rules.xml (rev 0)
+++ openbios-devel/config/examples/sparc64_rules.xml 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,88 @@
+<rules>
+
+<pre><![CDATA[
+#
+# Autogenerated OpenBIOS Makefile
+# (C) 2004-2006 by the OpenBIOS team
+#
+
+ARCH := sparc64
+ODIR := obj-$(ARCH)
+HOSTCC := gcc
+CROSSCFLAGS := -DNATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH -USWAP_ENDIANNESS
+HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS)
+HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
+
+CC := gcc
+AS := as
+AR := ar
+LD := ld
+NM := nm
+STRIP := strip
+RANLIB := ranlib
+INSTALL := install
+
+ifeq ($(shell uname), Linux)
+ LIBDL_LDFLAGS=-ldl
+endif
+
+CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g
+CFLAGS+= -Wa,-xarch=v9 -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany
+CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations
+CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing
+INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
+AS_FLAGS := -Wa,-xarch=v9 -Wa,-64 -g
+
+#
+# pre rules
+#
+
+all: versions dictionaries host-libraries target-libraries host-executables target-executables
+
+VERSION := "1.0RC1"
+
+versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs
+
+$(ODIR)/forth/version.fs:
+ @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \
+ ( echo ": builddate \" $$DATE\" ; " ; \
+ echo ": version \" $(VERSION)\" ; " ; ) \
+ > $(dir $(a))/version.fs
+
+$(ODIR)/target/include/openbios-version.h:
+ @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \
+ ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \
+ echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \
+ echo "#define OPENBIOS_RELEASE \"$(VERSION)\"" ; ) \
+ > $(dir $(a))/openbios-version.h
+]]></pre>
+
+ <!-- host compiler build rules -->
+
+<rule target="host" entity="executable">
+ $(HOSTCC) $(HOSTCFLAGS) -o $@ $^
+</rule>
+
+<rule target="host" entity="object">
+ $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^
+</rule>
+
+<rule target="host" entity="library">
+ $(AR) cru $@ $^; $(RANLIB) $@
+</rule>
+
+ <!-- target/cross compiler build rules -->
+
+<rule target="target" entity="executable">
+ $(CC) $(CFLAGS) -o $@ $^
+</rule>
+
+<rule target="target" entity="object">
+ $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^
+</rule>
+
+<rule target="target" entity="library">
+ $(AR) cru $@ $^; $(RANLIB) $@
+</rule>
+
+</rules>
Added: openbios-devel/include/sparc64/elf.h
===================================================================
--- openbios-devel/include/sparc64/elf.h (rev 0)
+++ openbios-devel/include/sparc64/elf.h 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,5 @@
+#define ARCH_ELF_CLASS ELFCLASS64
+#define ARCH_ELF_DATA ELFDATA2MSB
+#define ARCH_ELF_MACHINE_OK(x) ((x)==EM_SPARCV9)
+typedef Elf64_Ehdr Elf_ehdr;
+typedef Elf64_Phdr Elf_phdr;
Added: openbios-devel/include/sparc64/io.h
===================================================================
--- openbios-devel/include/sparc64/io.h (rev 0)
+++ openbios-devel/include/sparc64/io.h 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,203 @@
+#ifndef _ASM_IO_H
+#define _ASM_IO_H
+
+#include "asm/types.h"
+
+extern unsigned long va_shift; // Set in entry.S
+extern char _start, _data, _heap, _eheap, _stack, _estack, _end,
+ _vmem, _evmem,_iomem; // Defined in ldscript
+
+static inline unsigned long
+va2pa(unsigned long va)
+{
+ if ((va >= (unsigned long)&_data) &&
+ (va < (unsigned long)&_end))
+ return va - va_shift;
+ else
+ return va;
+}
+
+static inline unsigned long
+pa2va(unsigned long pa)
+{
+ if ((pa + va_shift >= (unsigned long)&_data) &&
+ (pa + va_shift< (unsigned long)&_end))
+ return pa + va_shift;
+ else
+ return pa;
+}
+
+// XXX check use and merge
+#define phys_to_virt(phys) ((void *) ((unsigned long) (phys)))
+#define virt_to_phys(virt) ((unsigned long) (virt))
+
+#ifndef BOOTSTRAP
+
+#ifndef _IO_BASE
+#define _IO_BASE 0x1fe02000000ULL
+#endif
+
+/*
+ * The insw/outsw/insl/outsl macros don't do byte-swapping.
+ * They are only used in practice for transferring buffers which
+ * are arrays of bytes, and byte-swapping is not appropriate in
+ * that case. - paulus
+ */
+#define insw(port, buf, ns) _insw_ns((uint16_t *)((port)+_IO_BASE), (buf), (ns))
+#define outsw(port, buf, ns) _outsw_ns((uint16_t *)((port)+_IO_BASE), (buf), (ns))
+
+#define inb(port) in_8((uint8_t *)((port)+_IO_BASE))
+#define outb(val, port) out_8((uint8_t *)((port)+_IO_BASE), (val))
+#define inw(port) in_le16((uint16_t *)((port)+_IO_BASE))
+#define outw(val, port) out_le16((uint16_t *)((port)+_IO_BASE), (val))
+#define inl(port) in_le32((uint32_t *)((port)+_IO_BASE))
+#define outl(val, port) out_le32((uint32_t *)((port)+_IO_BASE), (val))
+
+/*
+ * 8, 16 and 32 bit, big and little endian I/O operations, with barrier.
+ */
+static inline int in_8(volatile unsigned char *addr)
+{
+ int ret;
+
+ __asm__ __volatile__("lduba [%1] 0x15, %0\n\t"
+ :"=r"(ret):"r"(addr):"memory");
+
+ return ret;
+}
+
+static inline void out_8(volatile unsigned char *addr, int val)
+{
+ __asm__ __volatile__("stba %0, [%1] 0x15\n\t"
+ : : "r"(val), "r"(addr):"memory");
+}
+
+static inline int in_le16(volatile unsigned short *addr)
+{
+ int ret;
+
+ // XXX
+ __asm__ __volatile__("lduha [%1] 0x15, %0\n\t"
+ :"=r"(ret):"r"(addr):"memory");
+
+ return ret;
+}
+
+static inline int in_be16(volatile unsigned short *addr)
+{
+ int ret;
+
+ __asm__ __volatile__("lduha [%1] 0x15, %0\n\t"
+ :"=r"(ret):"r"(addr):"memory");
+
+ return ret;
+}
+
+static inline void out_le16(volatile unsigned short *addr, int val)
+{
+ // XXX
+ __asm__ __volatile__("stha %0, [%1] 0x15\n\t"
+ : : "r"(val), "r"(addr):"memory");
+}
+
+static inline void out_be16(volatile unsigned short *addr, int val)
+{
+ __asm__ __volatile__("stha %0, [%1] 0x15\n\t"
+ : : "r"(val), "r"(addr):"memory");
+}
+
+static inline unsigned in_le32(volatile unsigned *addr)
+{
+ unsigned ret;
+
+ // XXX
+ __asm__ __volatile__("lduwa [%1] 0x15, %0\n\t"
+ :"=r"(ret):"r"(addr):"memory");
+
+ return ret;
+}
+
+static inline unsigned in_be32(volatile unsigned *addr)
+{
+ unsigned ret;
+
+ __asm__ __volatile__("lduwa [%1] 0x15, %0\n\t"
+ :"=r"(ret):"r"(addr):"memory");
+
+ return ret;
+}
+
+static inline void out_le32(volatile unsigned *addr, int val)
+{
+ // XXX
+ __asm__ __volatile__("stwa %0, [%1] 0x15\n\t"
+ : : "r"(val), "r"(addr):"memory");
+}
+
+static inline void out_be32(volatile unsigned *addr, int val)
+{
+ __asm__ __volatile__("stwa %0, [%1] 0x15\n\t"
+ : : "r"(val), "r"(addr):"memory");
+}
+
+static inline void _insw_ns(volatile uint16_t * port, void *buf, int ns)
+{
+ uint16_t *b = (uint16_t *) buf;
+
+ while (ns > 0) {
+ *b++ = in_le16(port);
+ ns--;
+ }
+}
+
+static inline void _outsw_ns(volatile uint16_t * port, const void *buf,
+ int ns)
+{
+ uint16_t *b = (uint16_t *) buf;
+
+ while (ns > 0) {
+ out_le16(port, *b++);
+ ns--;
+ }
+}
+
+static inline void _insw(volatile uint16_t * port, void *buf, int ns)
+{
+ uint16_t *b = (uint16_t *) buf;
+
+ while (ns > 0) {
+ *b++ = in_be16(port);
+ ns--;
+ }
+}
+
+static inline void _outsw(volatile uint16_t * port, const void *buf,
+ int ns)
+{
+ uint16_t *b = (uint16_t *) buf;
+
+ while (ns > 0) {
+ out_be16(port, *b++);
+ ns--;
+ }
+}
+#else /* BOOTSTRAP */
+#ifdef FCOMPILER
+#define inb(reg) ((u8)0xff)
+#define inw(reg) ((u16)0xffff)
+#define inl(reg) ((u32)0xffffffff)
+#define outb(reg, val) do{} while(0)
+#define outw(reg, val) do{} while(0)
+#define outl(reg, val) do{} while(0)
+#else
+extern u8 inb(u32 reg);
+extern u16 inw(u32 reg);
+extern u32 inl(u32 reg);
+extern void insw(u32 reg, void *addr, unsigned long count);
+extern void outb(u32 reg, u8 val);
+extern void outw(u32 reg, u16 val);
+extern void outl(u32 reg, u32 val);
+extern void outsw(u32 reg, const void *addr, unsigned long count);
+#endif
+#endif
+#endif /* _ASM_IO_H */
Added: openbios-devel/include/sparc64/types.h
===================================================================
--- openbios-devel/include/sparc64/types.h (rev 0)
+++ openbios-devel/include/sparc64/types.h 2006-06-10 01:37:53 UTC (rev 58)
@@ -0,0 +1,39 @@
+/* tag: data types for forth engine
+ *
+ * Copyright (C) 2003-2005 Patrick Mauritz, Stefan Reinauer
+ *
+ * See the file "COPYING" for further information about
+ * the copyright and warranty status of this work.
+ */
+
+#ifndef __TYPES_H
+#define __TYPES_H
+
+#include "mconfig.h"
+
+#include <stdint.h>
+
+/* cell based types */
+typedef int64_t cell;
+typedef uint64_t ucell;
+typedef long long dcell;
+typedef unsigned long long ducell;
+
+#define bitspercell (sizeof(cell)<<3)
+#define bitsperdcell (sizeof(dcell)<<3)
+
+#define BITS 64
+
+/* size named types */
+
+typedef unsigned char u8;
+typedef unsigned short u16;
+typedef unsigned int u32;
+typedef unsigned long u64;
+
+typedef signed char s8;
+typedef short s16;
+typedef int s32;
+typedef long s64;
+
+#endif
1
0
I'm adding Sparc64 support, now we get this far:
OpenBIOS for Sparc64
boot arg = 0x1ff004b8000
00000000-08000000
RAM 128 MB
Unhandled Exception 0x0000000000000000
PC = 0x000001fff0017314 NPC = 0x000001fff0017318
Stopping execution
This happens because there is no Forth dictionary, I'm using plainboot.
Forth dictionary doesn't compile:
Dumping final dictionary to 'obj-sparc64/openbios.dict'
Using source dictionary 'obj-sparc64/bootstrap.dict'
Compiling dictionary 1/2
Compiling dictionary 2/2
panic: Maximum include depth reached!
make[1]: *** [obj-sparc64/openbios.dict] Error 1
I tried 32-bit values in types.h, but that didn't help. IA64 and AMD64 have
(u)int128_t, but I don't think Sparc64 has these.
VGA should work, but it doesn't, except for I/O port accesses. I found a bug
in Qemu's Sparc64 implementation, udivx and mulx didn't work at all.
This patch replaces patch-24.
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
2
1
r57 - in openbios-devel: arch/sparc32 config/examples include/openbios
by svn＠openbios.org 10 Jun '06
by svn＠openbios.org 10 Jun '06
10 Jun '06
Author: stepan
Date: 2006-06-10 03:31:30 +0200 (Sat, 10 Jun 2006)
New Revision: 57
Modified:
openbios-devel/arch/sparc32/console.c
openbios-devel/arch/sparc32/entry.S
openbios-devel/arch/sparc32/openbios.c
openbios-devel/arch/sparc32/tree.fs
openbios-devel/config/examples/cross-sparc32_rules.xml
openbios-devel/config/examples/sparc32_rules.xml
openbios-devel/include/openbios/drivers.h
Log:
non-sparc64 part of -25
Modified: openbios-devel/arch/sparc32/console.c
===================================================================
--- openbios-devel/arch/sparc32/console.c 2006-06-10 01:27:11 UTC (rev 56)
+++ openbios-devel/arch/sparc32/console.c 2006-06-10 01:31:30 UTC (rev 57)
@@ -41,9 +41,12 @@
#define BRENAB 1 /* Baud rate generator enable */
#define BRSRC 2 /* Baud rate generator source */
+/* Read Register 0 */
+#define Rx_CH_AV 0x1 /* Rx Character Available */
+
static int uart_charav(int port)
{
- return ((inb(CTRL(port)) & 1) != 0);
+ return ((inb(CTRL(port)) & Rx_CH_AV) != 0);
}
static char uart_getchar(int port)
Modified: openbios-devel/arch/sparc32/entry.S
===================================================================
--- openbios-devel/arch/sparc32/entry.S 2006-06-10 01:27:11 UTC (rev 56)
+++ openbios-devel/arch/sparc32/entry.S 2006-06-10 01:31:30 UTC (rev 57)
@@ -30,11 +30,6 @@
/* Switch to our main context.
* Main context is statically defined in C.
*/
- /*
- call __switch_context_nosave
- nop
- */
- /* XXX no switching yet */
! Check if this not the first SMP CPU, if so, bypass PROM entirely
set PHYS_JJ_EEPROM + 0x2E, %g1
Modified: openbios-devel/arch/sparc32/openbios.c
===================================================================
--- openbios-devel/arch/sparc32/openbios.c 2006-06-10 01:27:11 UTC (rev 56)
+++ openbios-devel/arch/sparc32/openbios.c 2006-06-10 01:31:30 UTC (rev 57)
@@ -21,8 +21,8 @@
void tcx_init(unsigned long base);
#define IOMMU_BASE 0x10000000 /* First page of sun4m IOMMU */
+#define SBUS_BASE 0x10001000
#define SLAVIO_BASE 0x71000000
-#define MACIO_BASE 0x70000000
#define TCX_BASE 0x50000000
static unsigned char intdict[256 * 1024];
@@ -49,15 +49,12 @@
modules_init();
#ifdef CONFIG_DRIVER_SBUS
ob_init_mmu(IOMMU_BASE);
- ob_sbus_init();
+ ob_sbus_init(SBUS_BASE);
#ifdef CONFIG_DEBUG_CONSOLE_VIDEO
init_video();
#endif
#endif
-#ifdef CONFIG_DRIVER_ESP
- ob_esp_init(MACIO_BASE);
-#endif
#ifdef CONFIG_DRIVER_OBIO
ob_obio_init(SLAVIO_BASE);
nvram_init();
Modified: openbios-devel/arch/sparc32/tree.fs
===================================================================
--- openbios-devel/arch/sparc32/tree.fs 2006-06-10 01:27:11 UTC (rev 56)
+++ openbios-devel/arch/sparc32/tree.fs 2006-06-10 01:31:30 UTC (rev 57)
@@ -58,14 +58,12 @@
h# 01443fd0 encode-int " clock-frequency" property
h# 1c encode-int " slot-address-bits" property
h# 3f encode-int " burst-sizes" property
- h# ffee7000 encode-int " address" property
h# 0 encode-int h# 0 encode-int encode+ h# 0 encode-int encode+ h# 30000000 encode-int encode+ h# 10000000 encode-int encode+
h# 1 encode-int encode+ h# 0 encode-int encode+ h# 0 encode-int encode+ h# 40000000 encode-int encode+ h# 10000000 encode-int encode+
h# 2 encode-int encode+ h# 0 encode-int encode+ h# 0 encode-int encode+ h# 50000000 encode-int encode+ h# 10000000 encode-int encode+
h# 3 encode-int encode+ h# 0 encode-int encode+ h# 0 encode-int encode+ h# 60000000 encode-int encode+ h# 10000000 encode-int encode+
h# 4 encode-int encode+ h# 0 encode-int encode+ h# 0 encode-int encode+ h# 70000000 encode-int encode+ h# 10000000 encode-int encode+
" ranges" property
- h# 0 encode-int h# 10001000 encode-int encode+ h# 00000028 encode-int encode+ " reg" property
external
: open ( cr ." opening SBus" cr) true ;
: close ;
Modified: openbios-devel/config/examples/cross-sparc32_rules.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc32_rules.xml 2006-06-10 01:27:11 UTC (rev 56)
+++ openbios-devel/config/examples/cross-sparc32_rules.xml 2006-06-10 01:31:30 UTC (rev 57)
@@ -13,17 +13,19 @@
HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS)
HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
-CC := sparc-linux-gcc -Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc
-AS := sparc-linux-as -Wa,-xarch=v8 -Wa,-32 -g
+CC := sparc-linux-gcc
+AS := sparc-linux-as
AR := sparc-linux-ar
LD := sparc-linux-ld
NM := sparc-linux-nm
STRIP := sparc-linux-strip
RANLIB := sparc-linux-ranlib
CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g
+CFLAGS+= -Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc
CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations
CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing
INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
+AS_FLAGS := -Wa,-xarch=v8 -Wa,-32 -g
#
# pre rules
Modified: openbios-devel/config/examples/sparc32_rules.xml
===================================================================
--- openbios-devel/config/examples/sparc32_rules.xml 2006-06-10 01:27:11 UTC (rev 56)
+++ openbios-devel/config/examples/sparc32_rules.xml 2006-06-10 01:31:30 UTC (rev 57)
@@ -13,8 +13,8 @@
HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS)
HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
-CC := gcc -Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc
-AS := as -Wa,-xarch=v8 -Wa,-32 -g
+CC := gcc
+AS := as
AR := ar
LD := ld
NM := nm
@@ -27,9 +27,11 @@
endif
CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g
+CFLAGS+= -Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc
CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations
CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing
INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
+AS_FLAGS := -Wa,-xarch=v8 -Wa,-32 -g
#
# pre rules
Modified: openbios-devel/include/openbios/drivers.h
===================================================================
--- openbios-devel/include/openbios/drivers.h 2006-06-10 01:27:11 UTC (rev 56)
+++ openbios-devel/include/openbios/drivers.h 2006-06-10 01:31:30 UTC (rev 57)
@@ -15,7 +15,7 @@
int ob_pci_init(void);
#endif
#ifdef CONFIG_DRIVER_SBUS
-int ob_sbus_init(void);
+int ob_sbus_init(unsigned long base);
#endif
#ifdef CONFIG_DRIVER_IDE
int ob_ide_init(void);
1
0
Author: stepan
Date: 2006-06-10 03:27:11 +0200 (Sat, 10 Jun 2006)
New Revision: 56
Modified:
openbios-devel/drivers/iommu.c
openbios-devel/drivers/obio.c
openbios-devel/drivers/sbus.c
Log:
-25 driver updates
Modified: openbios-devel/drivers/iommu.c
===================================================================
--- openbios-devel/drivers/iommu.c 2006-06-09 15:55:34 UTC (rev 55)
+++ openbios-devel/drivers/iommu.c 2006-06-10 01:27:11 UTC (rev 56)
@@ -18,6 +18,9 @@
#include "pgtsrmmu.h"
#include "iommu.h"
+#define IOMMU_REGS 0x300
+#define NCTX_SWIFT 0x100
+
#define IOPERM (IOPTE_CACHE | IOPTE_WRITE | IOPTE_VALID)
#define MKIOPTE(phys) (((((phys)>>4) & IOPTE_PAGE) | IOPERM) & ~IOPTE_WAZ)
#define LOWMEMSZ 32 * 1024 * 1024
@@ -57,14 +60,14 @@
};
struct iommu ciommu;
+static struct iommu_regs *regs;
-#define NCTX_SWIFT 0x100
-
static void iommu_init(struct iommu *t, unsigned long base);
static void
-iommu_invalidate(struct iommu_regs *regs) {
- regs->tlbflush = 0;
+iommu_invalidate(struct iommu_regs *iregs)
+{
+ iregs->tlbflush = 0;
}
/*
@@ -233,7 +236,7 @@
PUSH(base);
fword("encode-int");
fword("encode+");
- PUSH(0x300);
+ PUSH(IOMMU_REGS);
fword("encode-int");
fword("encode+");
push_str("reg");
@@ -259,8 +262,16 @@
fword("encode+");
push_str("available");
fword("property");
+
+ push_str("/iommu");
+ fword("find-device");
+ PUSH((unsigned long)regs);
+ fword("encode-int");
+ push_str("address");
+ fword("property");
}
+
/*
* Switch page tables.
*/
@@ -381,11 +392,11 @@
{
unsigned int *ptab;
int ptsize;
- struct iommu_regs *regs =NULL;
unsigned int impl, vers;
unsigned int tmp;
- if ((regs = map_io(base, sizeof(struct iommu_regs))) == 0) {
+ regs = map_io(base, IOMMU_REGS);
+ if (regs == 0) {
DPRINTF("Cannot map IOMMU\n");
for (;;) { }
}
Modified: openbios-devel/drivers/obio.c
===================================================================
--- openbios-devel/drivers/obio.c 2006-06-09 15:55:34 UTC (rev 55)
+++ openbios-devel/drivers/obio.c 2006-06-10 01:27:11 UTC (rev 56)
@@ -537,6 +537,9 @@
ob_obio_init(unsigned long slavio_base)
{
+ // All devices were integrated to NCR89C105, see
+ // http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR89C105.t…
+
//printk("Initializing OBIO devices...\n");
#if 0 // XXX
REGISTER_NAMED_NODE(ob_obio, "/obio");
@@ -544,13 +547,16 @@
ob_set_obio_ranges(slavio_base);
#endif
+ // Zilog Z8530 serial ports, see http://www.zilog.com
// Must be before zs@0,0 or Linux won't boot
ob_zs_init(slavio_base, SLAVIO_ZS1, ZS_INTR, 0, 0);
ob_zs_init(slavio_base, SLAVIO_ZS, ZS_INTR, 1, 1);
+ // M48T08 NVRAM, see http://www.st.com
ob_nvram_init(slavio_base, SLAVIO_NVRAM);
+ // 82078 FDC
ob_fd_init(slavio_base, SLAVIO_FD, FD_INTR);
ob_sconfig_init(slavio_base, SLAVIO_SCONFIG);
Modified: openbios-devel/drivers/sbus.c
===================================================================
--- openbios-devel/drivers/sbus.c 2006-06-09 15:55:34 UTC (rev 55)
+++ openbios-devel/drivers/sbus.c 2006-06-10 01:27:11 UTC (rev 56)
@@ -18,7 +18,77 @@
#include "openbios/drivers.h"
+#define SBUS_REGS 0x28
+#define SBUS_SLOTS 5
+
static void
+ob_sbus_node_init(unsigned long base)
+{
+ void *regs;
+
+ push_str("/iommu/sbus");
+ fword("find-device");
+
+ PUSH(0);
+ fword("encode-int");
+ PUSH(base);
+ fword("encode-int");
+ fword("encode+");
+ PUSH(SBUS_REGS);
+ fword("encode-int");
+ fword("encode+");
+ push_str("reg");
+ fword("property");
+
+ regs = map_io(base, SBUS_REGS);
+ PUSH((unsigned long)regs);
+ fword("encode-int");
+ push_str("address");
+ fword("property");
+}
+
+static void
+ob_macio_init(unsigned int slot, unsigned long base)
+{
+ // All devices were integrated to NCR89C100, see
+ // http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR89C100.t…
+
+ // NCR 53c9x, aka ESP. See
+ // http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR53C9X.txt
+#ifdef CONFIG_DRIVER_ESP
+ ob_esp_init(base);
+#endif
+
+ // NCR 92C990, Am7990, Lance. See http://www.amd.com
+ //ob_le_init(base);
+
+ // Parallel port
+ //ob_bpp_init(base);
+
+ // Power management
+ //ob_power_init(base);
+}
+
+static void
+sbus_probe_slot(unsigned int slot, unsigned long base)
+{
+ // OpenBIOS and Qemu don't know how to do Sbus probing
+ switch(slot) {
+ case 2: // SUNW,tcx
+ //ob_tcx_init(slot, base);
+ break;
+ case 3: // SUNW,CS4231
+ //ob_cs4231_init(slot, base);
+ break;
+ case 4: // MACIO: le, esp, bpp, power-management
+ ob_macio_init(slot, base);
+ break;
+ default:
+ break;
+ }
+}
+
+static void
ob_sbus_open(int *idx)
{
int ret=1;
@@ -43,10 +113,23 @@
{ "close", ob_sbus_close },
};
+static const unsigned long sbus_offset[SBUS_SLOTS] = {
+ 0x30000000,
+ 0x40000000,
+ 0x50000000,
+ 0x60000000,
+ 0x70000000,
+};
-int ob_sbus_init(void)
+int ob_sbus_init(unsigned long base)
{
- //printk("Initializing SBus devices...\n");
-
- return 0;
+ unsigned int slot;
+
+ ob_sbus_node_init(base);
+
+ for (slot = 0; slot < SBUS_SLOTS; slot++) {
+ sbus_probe_slot(slot, sbus_offset[slot]);
+ }
+
+ return 0;
}
1
0
Re: [OpenBIOS] Numerous problems running Makefile for sparc32 tar get
by Armistead, Jason 10 Jun '06
by Armistead, Jason 10 Jun '06
10 Jun '06
Blue swirl wrote:
>>1. Permissions in the config/scripts directory do not have execute "x" bit
>>set. I needed to do a
>>
>>chmod 755 config/scripts/*
>They have x bit set in the distribution, maybe there was some error in
>unpacking sources?
I am doing a very standard
wget
http://www.openbios.org/viewcvs/openbios-devel.tar.gz?root=OpenBIOS&view=tar
which is the latest snapshot file from development page
then
gunzip -c openbios-devel.tar.gz | tar xvf -
Again, something that works out-of-the-box for 99.9% of all open source
projects.
I did it again just now, and still, there is no "x" bit set on these files.
Here is what I can see in the tar file
# gunzip -c openbios-devel.tar.gz | tar tvf - | grep scripts
drwxr-xr-x 0/0 0 May 7 04:49 2006 openbios-devel/config/scripts/
-rw-r--r-- 0/0 365 May 7 04:48 2006
openbios-devel/config/scripts/archname
-rw-r--r-- 0/0 245 Apr 27 01:08 2006
openbios-devel/config/scripts/reldir
-rw-r--r-- 0/0 267 May 7 04:49 2006
openbios-devel/config/scripts/switch-arch
#
No "x" bits getting into the snapshot at all.
Regards
Jason
3
2
10 Jun '06
I'm behind a corporate proxy and still haven't figured out svn yet. That's
why I used wget and more traditional means.
-----Original Message-----
From: openbios-bounces(a)openbios.org
[mailto:openbios-bounces@openbios.org]On Behalf Of Blue Swirl
Sent: Saturday, 10 June 2006 7:57 AM
To: openbios(a)openbios.org
Subject: Re: [OpenBIOS] Numerous problems running Makefile for
sparc32tar get
>wget
>http://www.openbios.org/viewcvs/openbios-devel.tar.gz?root=OpenBIOS&view=ta
r
You're right, with this method I don't see the x bits either. I'm using svn,
and then the bits are there.
_________________________________________________________________
Don't just search. Find. Check out the new MSN Search!
http://search.msn.com/
--
OpenBIOS http://openbios.org/
Mailinglist: http://lists.openbios.org/mailman/listinfo
Free your System - May the Forth be with you
1
0
Taking the current snapshot from the OpenBIOS web site, I get a few problems
trying to build OpenBIOS for sparc32 as per the README file. I am using
Solaris 10 on Sparc64 (Enterprise 220R) with GCC 3.4.3
1. Permissions in the config/scripts directory do not have execute "x" bit
set. I needed to do a
chmod 755 config/scripts/*
to fix this. Otherwise I can't get past the first step in the README file
of running
config/scripts/switch-arch sparc32
2. The Makefile uses $(PWD) which is not available under "sh" shell. To get
this to work right you apparently need bash shell. Without it, the line
@ln -s $(PWD)/include/$(ARCH) $(ODIR)/target/include/asm
for the "directories" target actually links to /include/$(ARCH) because
$(PWD) is an empty string. This of course causes the make process to fail
hopelessly because the links aren't established correctly. So, there should
be a note in the README warning about this, or else the Makefile needs to be
more tolerant. I've built a lot of open source software lately as I have
been configuring my Enterprise 220R box, and OpenBIOS is the only package so
far that has failed because the shell for make was sh. Maybe bash has
become the de-facto standard shell on Linux, but on Solaris it's sh by
default, and on MinGW, it is also sh.
3. Even with all that done, I am still getting problems, this time running
make gives
bash-3.00# make
Building OpenBIOS on sparc64 for sparc32
Cleaning up... ok
Initializing build tree...ok.
Creating target Makefile...ok.
Creating config files...ok.
Building...error:
make[1]: Entering directory `/software/source/openbios-devel'
gcc -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP
-DNATIVE_BITWIDTH_SMALLER_THAN_HOST_
BITWIDTH -USWAP_ENDIANNESS -Iinclude -Ikernel/include
-Iobj-sparc32/target/include -c -o obj-sparc32/host/kernel/bootstrap.o
kernel/bootstrap.c
In file included from include/openbios/sysinclude.h:5,
from kernel/bootstrap.c:9:
obj-sparc32/target/include/asm/types.h:18:20: endian.h: No such file or
directory
make[1]: *** [obj-sparc32/host/kernel/bootstrap.o] Error 1
make[1]: Leaving directory `/software/source/openbios-devel'
bash-3.00#
In other words, now endian.h is missing.
The only place I could find it was
bash-3.00# find ./ -name endian.h
./utils/ofclient/endian.h
bash-3.00#
Now, according to mconfig.h, we have
/* Define to 1 if you have the <endian.h> header file. */
#define HAVE_ENDIAN_H 1
so it should be doing a
#include <endian.h>
in types.h
Doing a
cp -p utils/ofclient/endian.h kernel/include
fixes the problem and I get a bit further
4. Now I get
gcc -Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc $EXTRACFLAGS -Os -Wall -W
-DNATI
VE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g
-Wredundant-d
ecls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations
-Wundef
-Wendif-labels -Wstrict-aliasing -Iinclude -Ikernel/include
-Iobj-sparc32/targe
t/include -c -o obj-sparc32/target/drivers/iommu.o drivers/iommu.c
drivers/iommu.c:15:21: asm/asi.h: No such file or directory
Again, another reference to an include file under
obj-sparc32/target/include/asm is missing.
The asi.h file can be found under arch/sparc32 directory. Maybe we need a
filesystem link added or else to copy asi.h or change the #include reference
in iommu.c
5. Finally, GCC is picking up on lots of unused variables. Do we need to
review the build.log files and do a bit of spring cleaning ?
Anyhow, that's a long enough e-mail for now.
Comments please !
Thanks
Jason
Regards,
Jason Armistead
Senior Systems & Software Engineer
Otis Elevator Company Pty Ltd
50 Airds Rd Minto NSW 2566 AUSTRALIA
+61-2-9827-3742 (direct)
+61-418-499-568 (mobile)
+61-2-9827-3606 (fax)
Jason.Armistead(a)otis.com
at your service
For further information on our products and services please visit us at
www.otis.com
3
2
r55 - in openbios-devel: config/examples include/amd64 include/sparc32
by svn＠openbios.org 09 Jun '06
by svn＠openbios.org 09 Jun '06
09 Jun '06
Author: stepan
Date: 2006-06-09 17:55:34 +0200 (Fri, 09 Jun 2006)
New Revision: 55
Modified:
openbios-devel/config/examples/cross-sparc32_config.xml
openbios-devel/include/amd64/types.h
openbios-devel/include/sparc32/types.h
Log:
drop OS includes. The endianess is already defined in config.xml
Modified: openbios-devel/config/examples/cross-sparc32_config.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc32_config.xml 2006-06-07 10:18:24 UTC (rev 54)
+++ openbios-devel/config/examples/cross-sparc32_config.xml 2006-06-09 15:55:34 UTC (rev 55)
@@ -71,7 +71,7 @@
<option name="CONFIG_DRIVER_SBUS" type="boolean" value="true"/>
<option name="CONFIG_DRIVER_OBIO" type="boolean" value="true"/>
<option name="CONFIG_DRIVER_ESP" type="boolean" value="true"/>
- <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/>
+ <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="false"/>
</config>
Modified: openbios-devel/include/amd64/types.h
===================================================================
--- openbios-devel/include/amd64/types.h 2006-06-07 10:18:24 UTC (rev 54)
+++ openbios-devel/include/amd64/types.h 2006-06-09 15:55:34 UTC (rev 55)
@@ -14,7 +14,7 @@
#include <stdint.h>
/* endianess */
-#include <endian.h>
+#include "autoconf.h"
/* cell based types */
Modified: openbios-devel/include/sparc32/types.h
===================================================================
--- openbios-devel/include/sparc32/types.h 2006-06-07 10:18:24 UTC (rev 54)
+++ openbios-devel/include/sparc32/types.h 2006-06-09 15:55:34 UTC (rev 55)
@@ -14,11 +14,7 @@
#include <stdint.h>
/* endianess */
-#ifdef HAVE_ENDIAN_H
-#include <endian.h>
-#else
-#include <machine/endian.h>
-#endif
+#include "autoconf.h"
/* cell based types */
1
0
How about this version, does the memory allocation work?
I changed the build rules a bit so that it's easier to override the
compiler.
_________________________________________________________________
FREE pop-up blocking with the new MSN Toolbar - get it now!
http://toolbar.msn.click-url.com/go/onm00200415ave/direct/01/
1
0
Can you please advise the "right way" to extract an ISO CD-ROM image from
the SunOS distribution media under Windows (not Solaris / Unix / Linux !)
I've extracted SunOS 4.1.4 installation CD using Nero to get track 1 (the
only track) but it isn't giving me the same boot-up sequence as those that
have been posted to the list.
Because I'm running QEMU on Win32, I don't seem to be able to get -nographic
to work (a problem opening stdio by QEMU), so perhaps this makes the
OpenBIOS console behave differently.
Thanks
Jason
1
0
I changed the obp_dumb_memalloc code to use malloc and iommu/sbus code to do
real mapping, do they still work?
I also added links to chipset documentation and rearranged Sbus code.
Initial reaction from Qemu developers about switching to OpenBIOS was very
positive.
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
3
2
>> It seems it wants something like
>> /iommu@0,10000000/sbus@0,10001000/espdma@4,8400000/esp@4,8800000/sd@2,0:b
>> as the device
>
>Weird:
>
>device[sd(0,2,0):b] ("halt" to halt): cdrom
>boot (press RETURN to try default list): netbsd
>Booting netbsd
>-
>device[cdrom] ("halt" to halt):
>
>
>It prints no error, but does not do anything either.
It tried to boot from the cdrom but didn't find anything it liked there.
Or it failed to expand the alias. I seem to recall that Solaris etc use
the comma-separated args in the boot command rather than space-separated
args. Perhaps NetBSD is looking for something similar.
I think you're going to have to go grub around in the NetBSD code. :)
--
__
/__)_ _ _ _ Q: How many heterosexual males does it take to screw in a
/ (// (/(/ light bulb in San Francisco? A: Both of them.
_/
1
0
>NetBSD booting from CD:
>
> [sparc] Booting file 'cdrom' without parameters.
> Loading a.out image...
> Loaded 8388615 bytes
> entry point is 0x4000
> Jumping to entry point...
> obmem:>> NetBSD/sparc Secondary Boot, Revision 1.15
> >> (builds(a)b3.netbsd.org, Mon Dec 19 03:43:03 UTC 2005)
> Booting diag
> Cannot load diag: error=20
>
> device[sd(0,2,0):b] ("halt" to halt):
Interesting - it seems to be picking up the diag-file setting from OF
- the name "diag" - perhaps because "diag-switch?" is set to true. That
implies that the loader is making calls into OF and getting at least
some stuff it likes.
In any case, it's now at the BSD device prompt, which is also good. You
should be able to type in a BSD-style boot-spec here to disk, partition,
and name of the kernel here. Unfortunately Sparc-to-BSD device mapping
is a bit funky so you may have to grep through the BSD docs for details.
If you typed in "bsd" at the above prompt, it should try to load the
file named "bsd" from the default device listed above in square
brackets.
>NetBSD kernel directly:
>
> [sparc] Kernel already loaded
> OBP version 3, revision 2.25 (plugin rev 2)
> Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
> The NetBSD Foundation, Inc. All rights reserved.
> Copyright (c) 1982, 1986, 1989, 1991, 1993
> The Regents of the University of California. All rights reserved.
>
> NetBSD 3.0 (GENERIC) #0: Mon Dec 19 04:01:27 UTC 2005
> builds@b3.netbsd.org:/home/builds/ab/netbsd-3-0-RELEASE/sparc/200512182024Z-
>obj/home/builds/ab/netbsd-3-0-RELEASE/src/sys/arch/sparc/compile/GENERIC
> total memory = 127 MB
> avail memory = 120 MB
> bootpath:
> data fault: pc=0xf02a4f3c addr=0x7ff000
> sfsr=126<PERR=0,LVL=1,AT=1,FT=1,FAV,OW>
> panic: kernel fault
> halted
As a guess it's trying to print or create the "bootpath" and hit a bad
or uninitialized pointer - 0x7ff000. It got the total and available
memory, so at least that's good. Pity it halted instead of dropping
into the BSD debugger - you could get a stack-trace then.
It may be trying to get args from the OF "boot" command, which should
pass args to the loaded image. Perhaps it doesn't have any args, or
perhaps they're bogus?
--
__
/__)_ _ _ _ "Grub first, then ethics." -- Bertolt Brecht
/ (// (/(/
_/
2
2
>Can someone just give me a quick overview of the "right way" to start up
>QEMU so that it will load the OpenBIOS firmware instead of PROLL, and how
>to
>point QEMU to my Solaris installation CD image file.
Just rename openbios-builtin.elf.nostrip to proll.elf. I don't know if
OpenBIOS can be compiled in Solaris, please report if you try.
>Do I need any hacks / patches to QEMU to use OpenBIOS instead of PROLL ?
The attached patch to CVS version of Qemu fixes several critical problems in
Sparc emulation.
>What debugging switches should I enable with QEMU to help me figure out why
>things aren't working when trying to boot the SunOS 4.1.4 (Solaris 1.1.2)
>installation CD ?
>
>Is there a "best way" to build OpenBIOS to ensure maximum useful debugging
>information is produced ?
I don't think Qemu debugging switches are that helpful, but enabling
CONFIG_DEBUG_OBP in OpenBIOS shows the OBP calls.
>If I'm repeating a whole lot of old questions, is there a FAQ for the QEMU
>+
>OpenBIOS (Sparc32) combination that someone can point me to ?
Well, the combination didn't even exist a couple of months ago...
_________________________________________________________________
FREE pop-up blocking with the new MSN Toolbar - get it now!
http://toolbar.msn.click-url.com/go/onm00200415ave/direct/01/
2
3
Version of GCC and other GNU tools required to build OpenBIOS Spa rc32
by Armistead, Jason 07 Jun '06
by Armistead, Jason 07 Jun '06
07 Jun '06
What version of GCC do I need to build OpenBIOS Sparc32 ?
What about the other GNU tools - what is the minimum set needed ?
I would like to either cross-compile on Windows 2000 (under MINGW or
CYGWIN), or to build on Solaris (choice of systems from Solaris 2.5.1 to
Solaris 2.10 available).
Thanks
Jason
2
1
Re: [OpenBIOS] Old SunOS boot CDs / ISO images ( was: Starting QE MU with OpenBIOS for Sparc32)
by Armistead, Jason 07 Jun '06
by Armistead, Jason 07 Jun '06
07 Jun '06
Stefan wrote:
>If someone has boot CDs or ISO images of SunOS 4 / Solaris 2.4 or older,
>any help in testing is very welcome.
I have a Solaris 1.1.2 (SunOS 4.1.4) boxed kit sitting in my office, plus
some Sparcstation IPX and ELC hardware running Sunos 4.1.3 / 4.1.4.
Possibly I have Solaris 1.1.1 (SunOS 4.1.3) media somewhere too (it would be
in a pile of inherited stuff I got when I got the Sparcstations - sigh !)
So, if you want some files, extracted from these systems or CDs let me know
EXACTLY what you want - go easy on me, I'm still a newbie !
As soon as I can figure out how to make QEMU work best for me (presently
under Windows) I will let you know. I've managed to get it to build under
MINGW, after working around the dependence on fsync() function calls in some
of the disk image handling modules (which does not exist on Win32). Which
reminds me, I need to feed this back to the QEMU developers !
Alternatively, I can try building QEMU under Solaris 10, 8, 7, 6 or 5, all
of which are running on one or more of the workstations in the office - I
probably need to sort out the right GCC and GNU tools to use for these
though, so any help appreciated.
My long term goal is to be able to switch off the Sparcstations entirely so
that we can retire the ageing hardware, and fire up a "virtual Sparc"
whenever I need to do some legacy work. I've had similar success with DEC
hardware guru Bob Supnik's SIMH, a VAX emulator, which runs the entire VMS
operating system on it (see http://simh.trailing-edge.com) or can also
emulate a number of other interesting nostalgic CPUs and systems. I reckon
if they can make VMS run reliably in an emulator, that's VERY impressive.
Hopefully one day QEMU / OpenBIOS can be so good.
The only downside with QEMU and SIMH seems to be that they eat 100% of my
CPU because the target CPUs do not use any sort of HLT mechanism to pause
the CPU when idle - at least on a hyper threading CPU it is only running at
50% according to task manager !
Regards
Jason
2
1
Author: stepan
Date: 2006-06-07 12:18:24 +0200 (Wed, 07 Jun 2006)
New Revision: 54
Modified:
openbios-devel/arch/sparc32/romvec.c
Log:
fix prototype
Modified: openbios-devel/arch/sparc32/romvec.c
===================================================================
--- openbios-devel/arch/sparc32/romvec.c 2006-06-07 09:19:11 UTC (rev 53)
+++ openbios-devel/arch/sparc32/romvec.c 2006-06-07 10:18:24 UTC (rev 54)
@@ -285,6 +285,7 @@
unsigned int mva;
DPRINTF("obp_dumb_mmap: virta 0x%x, which_io %d, paddr 0x%x, sz %d\n", (unsigned int)va, which_io, pa, size);
+
off = pa & (PAGE_SIZE-1);
npages = (off + size + (PAGE_SIZE-1)) / PAGE_SIZE;
pa &= ~(PAGE_SIZE-1);
@@ -366,9 +367,9 @@
return ret;
}
-static int obp_dumb_memfree()
+static void obp_dumb_memfree(char *va, unsigned sz)
{
- printk("obp_dumb_memfree\n");
+ DPRINTF("obp_dumb_memfree 0x%x(%d)\n", va, sz);
}
static char * obp_dumb_memalloc(char *va, unsigned size)
1
0
Linux:
always assumes it is booted from the serial console, so you need to
specify "console=tty1" if you boot graphically
NetBSD booting from CD:
[sparc] Booting file 'cdrom' without parameters.
Loading a.out image...
Loaded 8388615 bytes
entry point is 0x4000
Jumping to entry point...
obmem:>> NetBSD/sparc Secondary Boot, Revision 1.15
>> (builds(a)b3.netbsd.org, Mon Dec 19 03:43:03 UTC 2005)
Booting diag
Cannot load diag: error=20
device[sd(0,2,0):b] ("halt" to halt):
NetBSD kernel directly:
[sparc] Kernel already loaded
OBP version 3, revision 2.25 (plugin rev 2)
Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
The NetBSD Foundation, Inc. All rights reserved.
Copyright (c) 1982, 1986, 1989, 1991, 1993
The Regents of the University of California. All rights reserved.
NetBSD 3.0 (GENERIC) #0: Mon Dec 19 04:01:27 UTC 2005
builds@b3.netbsd.org:/home/builds/ab/netbsd-3-0-RELEASE/sparc/200512182024Z-obj/home/builds/ab/netbsd-3-0-RELEASE/src/sys/arch/sparc/compile/GENERIC
total memory = 127 MB
avail memory = 120 MB
bootpath:
data fault: pc=0xf02a4f3c addr=0x7ff000
sfsr=126<PERR=0,LVL=1,AT=1,FT=1,FAV,OW>
panic: kernel fault
halted
Solaris 8 iso:
[sparc] Booting file 'cdrom' without parameters.
Loading a.out image...
Loaded 7680 bytes
entry point is 0x4000
Jumping to entry point...
device iommu size -1
device sbus size -1
device eeprom address prop too big
device auxio size -1
qemu: fatal: Trying to execute code outside RAM or ROM at 0xff00000d
Stefan
--
coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br.
Tel.: +49 761 7668825 • Fax: +49 761 7664613
Email: info(a)coresystems.de • http://www.coresystems.de/
1
2
Author: stepan
Date: 2006-06-07 11:19:11 +0200 (Wed, 07 Jun 2006)
New Revision: 53
Modified:
openbios-devel/arch/sparc32/tree.fs
openbios-devel/drivers/obio.c
Log:
"fix" some solaris boot errors
Modified: openbios-devel/arch/sparc32/tree.fs
===================================================================
--- openbios-devel/arch/sparc32/tree.fs 2006-06-07 08:49:15 UTC (rev 52)
+++ openbios-devel/arch/sparc32/tree.fs 2006-06-07 09:19:11 UTC (rev 53)
@@ -2,11 +2,17 @@
" /" find-device
2 encode-int " #address-cells" property
1 encode-int " #size-cells" property
+
" SUNW,SPARCstation-5" encode-string " name" property
" SPARCstation 5" encode-string " banner-name" property
" sun4m" encode-string " compatible" property
+ " SUNW,501-3059" encode-string " model" property
+ h# 0a21fe80 encode-int " clock-frequency" property
+
" /obio/zs@0,100000:a" encode-string " stdin-path" property
" /obio/zs@0,100000:a" encode-string " stdout-path" property
+
+
: encode-unit encode-unit-sbus ;
: decode-unit decode-unit-sbus ;
@@ -32,6 +38,9 @@
" iommu" device-name
2 encode-int " #address-cells" property
1 encode-int " #size-cells" property
+ h# 1000 encode-int " page-size" property
+ 0 encode-int " cache-coherence?" property
+ h# ffee8000 encode-int " address" property
h# 0 encode-int h# 10000000 encode-int encode+ h# 00000300 encode-int encode+ " reg" property
external
: open ( cr ." opening iommu" cr) true ;
@@ -46,6 +55,10 @@
" hierarchical" device-type
2 encode-int " #address-cells" property
1 encode-int " #size-cells" property
+ h# 01443fd0 encode-int " clock-frequency" property
+ h# 1c encode-int " slot-address-bits" property
+ h# 3f encode-int " burst-sizes" property
+ h# ffee7000 encode-int " address" property
h# 0 encode-int h# 0 encode-int encode+ h# 0 encode-int encode+ h# 30000000 encode-int encode+ h# 10000000 encode-int encode+
h# 1 encode-int encode+ h# 0 encode-int encode+ h# 0 encode-int encode+ h# 40000000 encode-int encode+ h# 10000000 encode-int encode+
h# 2 encode-int encode+ h# 0 encode-int encode+ h# 0 encode-int encode+ h# 50000000 encode-int encode+ h# 10000000 encode-int encode+
Modified: openbios-devel/drivers/obio.c
===================================================================
--- openbios-devel/drivers/obio.c 2006-06-07 08:49:15 UTC (rev 52)
+++ openbios-devel/drivers/obio.c 2006-06-07 09:19:11 UTC (rev 53)
@@ -154,6 +154,11 @@
nvram = (char *)ob_reg(base, offset, NVRAM_SIZE, 1);
+ PUSH((unsigned long)nvram);
+ fword("encode-int");
+ push_str("address");
+ fword("property");
+
memcpy(&nv_info, nvram, sizeof(nv_info));
printk("Nvram id %s, version %d\n", nv_info.id_string, nv_info.version);
@@ -251,6 +256,22 @@
push_str("icache-associativity");
fword("property");
+
+ PUSH(0x20);
+ fword("encode-int");
+ push_str("ecache-line-size");
+ fword("property");
+
+ PUSH(0x4000);
+ fword("encode-int");
+ push_str("ecache-nlines");
+ fword("property");
+
+ PUSH(1);
+ fword("encode-int");
+ push_str("ecache-associativity");
+ fword("property");
+
PUSH(2);
fword("encode-int");
push_str("ncaches");
@@ -276,6 +297,8 @@
push_str("mid");
fword("property");
+
+
fword("finish-device");
}
}
1
0
Author: stepan
Date: 2006-06-07 10:49:15 +0200 (Wed, 07 Jun 2006)
New Revision: 52
Modified:
openbios-devel/drivers/obio.c
Log:
more solaris..
Modified: openbios-devel/drivers/obio.c
===================================================================
--- openbios-devel/drivers/obio.c 2006-06-07 07:47:37 UTC (rev 51)
+++ openbios-devel/drivers/obio.c 2006-06-07 08:49:15 UTC (rev 52)
@@ -352,11 +352,17 @@
push_str("reg");
fword("property");
- fword("finish-device");
regs = map_io(base + offset, sizeof(*regs));
regs->l10_timer_limit = (((1000000/100) + 1) << 10);
regs->cpu_timers[0].l14_timer_limit = 0;
+
+ PUSH((unsigned long)regs);
+ fword("encode-int");
+ push_str("address");
+ fword("property");
+
+ fword("finish-device");
}
static volatile struct sun4m_intregs *intregs;
1
0
Stefan wrote:
>Generally you can start with using http://openbios.org/~stepan/proll.elf
>as a replacement for the default proll.elf file that came with qemu.
Do you keep this proll.elf (which is really OpenBIOS) up to date with the
latest SVN snapshot ?
If not, maybe you could generate a proll-svn.elf file which contains the
latest from SVN for people without access to the cross tools (and leave the
proll.elf as the latest "stable" version)
>NOTE: This one only works with -nographic, as the framebuffer handling
>code keeps most OS boots hanging.
On Windows, starting QEMU with -nographic is not possible because it keeps
on saying
qemu: could not open monitor device 'stdio'
I'm guessing it works OK on Linux and Unix QEMU, but what to do on Windows
where the concept of "stdio" is not as well defined ? Is there a workaroumd
/ hack for QEMU or something I need to configure on Windows ?
Thanks
Jason
2
1
Hi all,
A very very crude patch to get the Solaris boot to go a bit further. We are missing the definition and code for vector v2_dumb_mem_alloc. I have tested with various addresses for the dumb memory alloc, but I am sure there are others on the list who know enough to do this properly!
I now get errors about device sizes after the Solaris kernel boots. I even get the rotating cursor for a little while!
Regards,
2
1
Author: stepan
Date: 2006-06-07 09:47:37 +0200 (Wed, 07 Jun 2006)
New Revision: 51
Modified:
openbios-devel/drivers/obio.c
Log:
fix netbsd again
Modified: openbios-devel/drivers/obio.c
===================================================================
--- openbios-devel/drivers/obio.c 2006-06-07 07:44:40 UTC (rev 50)
+++ openbios-devel/drivers/obio.c 2006-06-07 07:47:37 UTC (rev 51)
@@ -391,7 +391,8 @@
intregs->set = ~SUN4M_INT_MASKALL;
intregs->cpu_intregs[0].clear = ~0x17fff;
- PUSH(0);
+ // Is this correct? It works for NetBSD at least
+ PUSH((int)intregs);
fword("encode-int");
PUSH((int)intregs);
fword("encode-int");
1
0
Author: stepan
Date: 2006-06-07 09:44:40 +0200 (Wed, 07 Jun 2006)
New Revision: 50
Modified:
openbios-devel/arch/sparc32/romvec.c
Log:
get solaris boot to show error messages again :-))
This also gets us further with netbsd
Modified: openbios-devel/arch/sparc32/romvec.c
===================================================================
--- openbios-devel/arch/sparc32/romvec.c 2006-06-06 22:23:04 UTC (rev 49)
+++ openbios-devel/arch/sparc32/romvec.c 2006-06-07 07:44:40 UTC (rev 50)
@@ -366,6 +366,21 @@
return ret;
}
+static int obp_dumb_memfree()
+{
+ printk("obp_dumb_memfree\n");
+}
+
+static char * obp_dumb_memalloc(char *va, unsigned size)
+{
+ static char *pa = 0x4000000;
+
+ DPRINTF("obp_dumb_memalloc req 0x%x of %d at 0x%x\n", va, size, pa);
+ obp_dumb_mmap(va, 1, pa, size);
+ pa += size;
+ return va;
+}
+
extern int start_cpu(unsigned int pc, unsigned int context_ptr,
unsigned int context, int cpu);
@@ -474,6 +489,8 @@
romvec0.pv_v0bootargs = &obp_argp;
romvec0.pv_fortheval.v2_eval = obp_fortheval_v2;
romvec0.pv_v2devops.v2_inst2pkg = obp_inst2pkg;
+ romvec0.pv_v2devops.v2_dumb_mem_alloc = obp_dumb_memalloc;
+ romvec0.pv_v2devops.v2_dumb_mem_free = obp_dumb_memfree;
romvec0.pv_v2devops.v2_dumb_mmap = obp_dumb_mmap;
romvec0.pv_v2devops.v2_dumb_munmap = obp_dumb_munmap;
romvec0.pv_v2devops.v2_dev_open = obp_devopen;
1
0
>>Interesting. Loading the kernel at once. The ELF kernel loads fine, but
>>the CD comes with an a.out kernel that has a wrong "text" size and no
>>data size. Since it loads directly from the CD device as opposed to from
>>a filesystem I have no idea how much data to load and how to parse it.
>>:-(
Oh yeah - SF also has an AOUT loader, and a COFF loader, along with some
dumpaout and dumpcoff (and dumpelf) utils. They're handy to root around
inside the various files to figure out where stuff needs to be loaded.
(They're under the "exe" dir.)
--
__
/__)_ _ _ _ While it may be true that a watched pot never boils, the
/ (// (/(/ one you don't keep an eye on can make an awful mess of
_/ your stove. -- Edward Stevenson
1
0
>This part seems very different on Sparc32. I did not know some weeks
>ago, but OpenBoot until very late versions does not use the client
>interface but a data structure called "romvec" (arch/sparc32/romvec.c)
>that contains several data pointers and callbacks to different OF
>functions
I haven't looked at NetBSD/Sparc, unfortunately. Just NetBSD/PowerPC
with Open Firmware support for Macs, old Moto stuf, etc, which makes
proper call-backs, plus has specs in nauseating detail.
Have you looked at the other BSDs (Free/Open) to see if their Sparc32
boot is any different, perhaps simpler?
>Interesting. Loading the kernel at once. The ELF kernel loads fine, but
>the CD comes with an a.out kernel that has a wrong "text" size and no
>data size. Since it loads directly from the CD device as opposed to from
>a filesystem I have no idea how much data to load and how to parse it.
>:-(
Yeah, the first trick is building that ELF netbsd kernel and not the
bootstrap a.out thingie. A standard ELF kernel may lurk lower down on
the CD somewhere. Otherwise it's cross-compile time.
The SF trick short-circuits the loaders (at least initially) by
directly loading the ELF image, then passing it the magic args that it
expects. The args are hard-wired inside a C array, just to get things
rolling. Works surprisingly well for system bring-up.
>Does a version of Smart Firmware boot Solaris on Sparc? Any chance
>there's some hint?
Unfortunately the version of SF that boots Solaris contains a LOT of
proprietary Sun code, some in C, some in Forth/Fcode. Even we never had
a copy of it - it all stayed on Sun's machines.
The Solaris versions Sun's SF was booting involved loading and running a
variety of their Fcode loaders, which loaded other Fcode, which
sometimes loaded even more Fcode, which eventually loaded a kernel,
which would then run, making a bunch of callbacks all the while.
A variety of subtle bugs and bug-compatibility modes in the SF code are
#ifdef-ed SUN_COMPATIBILITY, but other than that, there's not much else.
--
__
/__)_ _ _ _ "What do you give a man who has everything?" the
/ (// (/(/ pretty teenager asked her mother. "Encouragement, dear,"
_/ she replied.
1
0
Author: stepan
Date: 2006-06-07 00:23:04 +0200 (Wed, 07 Jun 2006)
New Revision: 49
Modified:
openbios-devel/arch/sparc32/console.c
openbios-devel/arch/sparc32/entry.S
openbios-devel/arch/sparc32/ldscript
openbios-devel/arch/sparc32/romvec.c
openbios-devel/arch/sparc32/tree.fs
openbios-devel/drivers/obio.c
openbios-devel/drivers/obio.h
Log:
openbios.patch-22.bz2 from blueswirl
Modified: openbios-devel/arch/sparc32/console.c
===================================================================
--- openbios-devel/arch/sparc32/console.c 2006-06-05 20:34:53 UTC (rev 48)
+++ openbios-devel/arch/sparc32/console.c 2006-06-06 22:23:04 UTC (rev 49)
@@ -153,17 +153,7 @@
void tcx_init(unsigned long base)
{
-#if 1
- unsigned int i;
-
- // Create 1:1 mapping for video memory
- for (i = 0; i < VMEM_SIZE; i += 4096) {
- map_page(base + VMEM_BASE + i, base + VMEM_BASE + i, 0);
- }
- vmem = (char *)base + VMEM_BASE;
-#else
vmem = map_io(base + VMEM_BASE, VMEM_SIZE);
-#endif
dac = map_io(base + DAC_BASE, DAC_SIZE);
console_init();
Modified: openbios-devel/arch/sparc32/entry.S
===================================================================
--- openbios-devel/arch/sparc32/entry.S 2006-06-05 20:34:53 UTC (rev 48)
+++ openbios-devel/arch/sparc32/entry.S 2006-06-06 22:23:04 UTC (rev 49)
@@ -11,7 +11,8 @@
#include "asi.h"
#include "asm/crs.h"
-#define PHYS_JJ_EEPROM 0x71200000
+#define PHYS_JJ_EEPROM 0x71200000 /* [2000] MK48T08 */
+#define PHYS_JJ_INTR0 0x71E00000 /* CPU0 interrupt control registers */
#define WRITE_PAUSE nop; nop; nop; /* Have to do this after %wim/%psr chg */
@@ -35,6 +36,35 @@
*/
/* XXX no switching yet */
+ ! Check if this not the first SMP CPU, if so, bypass PROM entirely
+ set PHYS_JJ_EEPROM + 0x2E, %g1
+ lduba [%g1] ASI_M_BYPASS, %g2
+ tst %g2
+ bz first_cpu
+ nop
+
+ set PHYS_JJ_INTR0 + 0x04, %g1
+ sll %g2, 12, %g2
+ add %g1, %g2, %g2
+ set 0xffffffff, %g1
+ sta %g1, [%g2] ASI_M_BYPASS ! clear softints
+ add %g2, 4, %g2
+ sta %g0, [%g2] ASI_M_BYPASS ! clear softints
+ set PHYS_JJ_EEPROM + 0x3C, %g1
+ lda [%g1] ASI_M_BYPASS, %g1
+ set AC_M_CTPR, %g2
+ sta %g1, [%g2] ASI_M_MMUREGS ! set ctx table ptr
+ set PHYS_JJ_EEPROM + 0x40, %g1
+ lda [%g1] ASI_M_BYPASS, %g1
+ set AC_M_CXR, %g2
+ sta %g1, [%g2] ASI_M_MMUREGS ! set context
+ set PHYS_JJ_EEPROM + 0x38, %g1
+ lda [%g1] ASI_M_BYPASS, %g2
+ set 1, %g1
+ jmp %g2 ! jump to kernel
+ sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu
+
+first_cpu:
set PHYS_JJ_EEPROM + 0x30, %g1
lda [%g1] ASI_M_BYPASS, %g1
! map PROLDATA to PROLBASE+PROLSIZE to end of ram
Modified: openbios-devel/arch/sparc32/ldscript
===================================================================
--- openbios-devel/arch/sparc32/ldscript 2006-06-05 20:34:53 UTC (rev 48)
+++ openbios-devel/arch/sparc32/ldscript 2006-06-06 22:23:04 UTC (rev 49)
@@ -14,7 +14,7 @@
HEAP_SIZE = 16384;
STACK_SIZE = 16384;
VMEM_SIZE = 128 * 1024;
-IOMEM_SIZE = 256 * 1024;
+IOMEM_SIZE = 256 * 1024 + 768 * 1024;
SECTIONS
{
Modified: openbios-devel/arch/sparc32/romvec.c
===================================================================
--- openbios-devel/arch/sparc32/romvec.c 2006-06-05 20:34:53 UTC (rev 48)
+++ openbios-devel/arch/sparc32/romvec.c 2006-06-06 22:23:04 UTC (rev 49)
@@ -366,30 +366,27 @@
return ret;
}
+extern int start_cpu(unsigned int pc, unsigned int context_ptr,
+ unsigned int context, int cpu);
+
static int obp_cpustart(__attribute__((unused))unsigned int whichcpu,
__attribute__((unused))int ctxtbl_ptr,
__attribute__((unused))int thiscontext,
__attribute__((unused))char *prog_counter)
{
- //int cpu, found;
-#ifdef CONFIG_DEBUG_OBP
+ int cpu, found;
struct linux_prom_registers *smp_ctable = (void *)ctxtbl_ptr;
-#endif
DPRINTF("obp_cpustart: cpu %d, ctxptr 0x%x, ctx %d, pc 0x%x\n", whichcpu,
smp_ctable->phys_addr, thiscontext, (unsigned int)prog_counter);
-#if 0
+
found = obp_getprop(whichcpu, "mid", (char *)&cpu);
if (found == -1)
return -1;
- st_bypass(PHYS_JJ_EEPROM + 0x38, (unsigned int)prog_counter);
- st_bypass(PHYS_JJ_EEPROM + 0x3C, ((unsigned int)smp_ctable->phys_addr) >> 4);
- st_bypass(PHYS_JJ_EEPROM + 0x40, thiscontext);
- DPRINTF("obp_cpustart: sending interrupt to CPU %d\n", cpu);
- st_bypass(PHYS_JJ_INTR0 + 0x1000 * cpu + 8, 0x40000000);
-#endif
+ DPRINTF("cpu found, id %d -> cpu %d\n", whichcpu, cpu);
- return 0;
+ return start_cpu((unsigned int)prog_counter, ((unsigned int)smp_ctable->phys_addr) >> 4,
+ thiscontext, cpu);
}
static int obp_cpustop(__attribute__((unused)) unsigned int whichcpu)
Modified: openbios-devel/arch/sparc32/tree.fs
===================================================================
--- openbios-devel/arch/sparc32/tree.fs 2006-06-05 20:34:53 UTC (rev 48)
+++ openbios-devel/arch/sparc32/tree.fs 2006-06-06 22:23:04 UTC (rev 49)
@@ -29,35 +29,6 @@
finish-device
new-device
- " FMI,MB86904" device-name
- " cpu" device-type
-
- \ 0 encode-int 0 encode-int encode+ 0 encode-int encode+ " context-table" property
- 0 encode-int " implementation" property
- d# 4 encode-int " version" property
-
- d# 32 encode-int " cache-line-size" property
- d# 512 encode-int " cache-nlines" property
-
- d# 4096 encode-int " page-size" property
-
- d# 16 encode-int " dcache-line-size" property
- d# 512 encode-int " dcache-nlines" property
- d# 1 encode-int " dcache-associativity" property
-
- d# 16 encode-int " icache-line-size" property
- d# 512 encode-int " icache-nlines" property
- d# 1 encode-int " icache-associativity" property
-
- d# 2 encode-int " ncaches" property
- d# 256 encode-int " mmu-nctx" property
- d# 8 encode-int " sparc-version" property
- d# 37 encode-int " mask_rev" property
-
- \ 1 encode-int " mid" property
-finish-device
-
-new-device
" iommu" device-name
2 encode-int " #address-cells" property
1 encode-int " #size-cells" property
Modified: openbios-devel/drivers/obio.c
===================================================================
--- openbios-devel/drivers/obio.c 2006-06-05 20:34:53 UTC (rev 48)
+++ openbios-devel/drivers/obio.c 2006-06-06 22:23:04 UTC (rev 49)
@@ -148,6 +148,8 @@
extern uint32_t cmdline_size;
extern char boot_device;
+ unsigned int i;
+
ob_new_obio_device("eeprom", NULL);
nvram = (char *)ob_reg(base, offset, NVRAM_SIZE, 1);
@@ -170,6 +172,7 @@
fword("finish-device");
+ // Add /idprom
push_str("/");
fword("find-device");
@@ -178,6 +181,103 @@
fword("encode-bytes");
push_str("idprom");
fword("property");
+
+ // Add cpus
+ printk("CPUs: %x\n", nv_info.smp_cpus);
+ for (i = 0; i < (unsigned int)nv_info.smp_cpus; i++) {
+ push_str("/");
+ fword("find-device");
+
+ fword("new-device");
+
+ push_str("FMI,MB86904");
+ fword("device-name");
+
+ push_str("cpu");
+ fword("device-type");
+
+ PUSH(0);
+ fword("encode-int");
+ push_str("implementation");
+ fword("property");
+
+ PUSH(4);
+ fword("encode-int");
+ push_str("version");
+ fword("property");
+
+ PUSH(32);
+ fword("encode-int");
+ push_str("cache-line-size");
+ fword("property");
+
+ PUSH(512);
+ fword("encode-int");
+ push_str("cache-nlines");
+ fword("property");
+
+ PUSH(4096);
+ fword("encode-int");
+ push_str("page-size");
+ fword("property");
+
+ PUSH(16);
+ fword("encode-int");
+ push_str("dcache-line-size");
+ fword("property");
+
+ PUSH(512);
+ fword("encode-int");
+ push_str("dcache-nlines");
+ fword("property");
+
+ PUSH(1);
+ fword("encode-int");
+ push_str("dcache-associativity");
+ fword("property");
+
+ PUSH(16);
+ fword("encode-int");
+ push_str("icache-line-size");
+ fword("property");
+
+ PUSH(512);
+ fword("encode-int");
+ push_str("icache-nlines");
+ fword("property");
+
+ PUSH(1);
+ fword("encode-int");
+ push_str("icache-associativity");
+ fword("property");
+
+ PUSH(2);
+ fword("encode-int");
+ push_str("ncaches");
+ fword("property");
+
+ PUSH(256);
+ fword("encode-int");
+ push_str("mmu-nctx");
+ fword("property");
+
+ PUSH(8);
+ fword("encode-int");
+ push_str("sparc-version");
+ fword("property");
+
+ PUSH(37);
+ fword("encode-int");
+ push_str("mask_rev");
+ fword("property");
+
+ PUSH(i << 3);
+ fword("encode-int");
+ push_str("mid");
+ fword("property");
+
+ fword("finish-device");
+ }
}
static void
@@ -259,10 +359,11 @@
regs->cpu_timers[0].l14_timer_limit = 0;
}
+static volatile struct sun4m_intregs *intregs;
+
static void
ob_interrupt_init(unsigned long base, unsigned long offset)
{
- volatile struct sun4m_intregs *regs;
ob_new_obio_device("interrupt", NULL);
@@ -286,21 +387,35 @@
push_str("reg");
fword("property");
- regs = map_io(base + offset, sizeof(*regs));
- regs->set = ~SUN4M_INT_MASKALL;
- regs->cpu_intregs[0].clear = ~0x17fff;
-
- // is this really correct?
- PUSH(regs);
+ intregs = map_io(base + offset, sizeof(*intregs));
+ intregs->set = ~SUN4M_INT_MASKALL;
+ intregs->cpu_intregs[0].clear = ~0x17fff;
+
+ PUSH(0);
fword("encode-int");
- PUSH(regs);
+ PUSH((int)intregs);
fword("encode-int");
fword("encode+");
push_str("address");
fword("property");
fword("finish-device");
+}
+int
+start_cpu(unsigned int pc, unsigned int context_ptr, unsigned int context, int cpu)
+{
+ if (!cpu)
+ return -1;
+
+ nvram[0x38] = pc;
+ nvram[0x3c] = context_ptr;
+ nvram[0x40] = context;
+ nvram[0x2e] = cpu & 0xff;
+
+ intregs->cpu_intregs[cpu].set = SUN4M_SOFT_INT(14);
+
+ return 0;
}
Modified: openbios-devel/drivers/obio.h
===================================================================
--- openbios-devel/drivers/obio.h 2006-06-05 20:34:53 UTC (rev 48)
+++ openbios-devel/drivers/obio.h 2006-06-06 22:23:04 UTC (rev 49)
@@ -37,6 +37,7 @@
uint32_t nvram_size; // not used in Sun4m
char unused1[8];
char arch[12];
+ char curr_cpu;
char smp_cpus;
char unused2;
char nographic;
1
0
Stefan Reinauer wrote:
>Welcome to OpenBIOS v1.0RC1 built on Jun 5 2006 15:07
> Type 'help' for detailed information
>
>[sparc] Kernel already loaded
>OBP version 3, revision 2.25 (plugin rev 2)
>Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
> The NetBSD Foundation, Inc. All rights reserved.
>Copyright (c) 1982, 1986, 1989, 1991, 1993
> The Regents of the University of California. All rights reserved.
>
>NetBSD 3.0 (GENERIC) #0: Mon Dec 19 04:01:27 UTC 2005
> builds@b3.netbsd.org:/home/builds/ab/netbsd-3-0-RELEASE/sparc/200512182024Z-ob
>j/home/builds/ab/netbsd-3-0-RELEASE/src/sys/arch/sparc/compile/GENERIC
>total memory = 127 MB
>avail memory = 120 MB
>bootpath:
>data fault: pc=0xf02a4f3c addr=0x7ff000
>sfsr=126<PERR=0,LVL=1,AT=1,FT=1,FAV,OW>
>panic: kernel fault
>halted
It's been quite a while since I last played with NetBSD and OF. The
last was with a PowerPC board. As I recall, NetBSD makes heavy use of
the client-interface callbacks to get some important info.
One of my tricks with SmartFirmware was to load the entire NetBSD
kernel (builtin ELF loader), turn on tracing, then try to boot. Any
callbacks etc would nicely print out as they were executed, so it was a
lot easier to see at which point it was failing.
I also added dprintfs in the NBSD routines that performed the various
calls to OF. The usual debugging stuff. 'Course this requires having a
cross-compile environment handy to build custom NBSD kernels to test.
Booting Solaris was a whole new level of pain. A lot of Sun's
intermediate boot-loaders made heinous use of Forth and required all
sorts of Sun-specific hacks to get them to run.
>Booting from the NetBSD 3.0 CD (sparccd-3.0.iso) I got an exception,
>since the a.out header shows some weird values:
>
>Welcome to OpenBIOS v1.0RC1 built on Jun 5 2006 15:07
> Type 'help' for detailed information
>
>[sparc] Booting file 'cdrom' with parameters '<NULL>'
>Loading a.out image...
> N_TXTADDR: 0x00002000 (0x30800007 bytes)
> N_TXTOFF : 0x00000020 (0x00000200)
> N_DATADDR: 0x30802007 (0 bytes)
>Loaded 8388615(0x30800007) bytes
>entry point is 0x4000
>Jumping to entry point...
>Unhandled Exception 0x00000002
>PC = 0x00000000 NPC = 0x00000004
>Stopping execution
This sure looks like it's trying to jump through a NULL pointer.
--
__
/__)_ _ _ _ There are three things I always forget. Names, faces --
/ (// (/(/ the third I can't remember. -- Italo Svevo
_/
--
__
/__)_ _ _ _ Iron Law of Distribution: Them that has, gets.
/ (// (/(/
_/
2
1
I fixed the TCX mapping problem and added SMP support from Proll.
SMP is not working fully (neither was Proll), probably some problem with
Qemu. I think earlier it worked. The idea is to send a soft interrupt to a
halted CPU, which then awakes and begins execution. Now the CPU gets the
interrupt (Qemu monitor commands info pic, info cpus confirm this) but it
does not awaken.
Now the only missing functionality that Proll had is TFTP booting support.
It could be possible to reuse Proll's slirp stack, but I'm not sure if it is
worth the trouble. In Qemu environment booting from network is not that
useful, because you can preload the kernel.
Otherwise OpenBIOS matches or exceeds Proll's capabilities. I'll propose
switching to OpenBIOS to Qemu developers.
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
1
0
I should specifically add that I would like to get QEMU running under a
Windows environment.
I've managed to build QEMU using MinGW / MSYS etc as detailed in the QEMU
HOWTOs.
Now I just need to get that friendly Openboot-style prompt happening and
I'll be on my way.
Jason
-----Original Message-----
From: openbios-bounces(a)openbios.org
[mailto:openbios-bounces@openbios.org]On Behalf Of Armistead, Jason
Sent: Tuesday, 6 June 2006 12:42 PM
To: 'openbios(a)lists.openbios.org'
Subject: [OpenBIOS] Starting QEMU with OpenBIOS for Sparc32
Sorry for such a newbie question
Can someone just give me a quick overview of the "right way" to start up
QEMU so that it will load the OpenBIOS firmware instead of PROLL, and how to
point QEMU to my Solaris installation CD image file.
Do I need any hacks / patches to QEMU to use OpenBIOS instead of PROLL ?
What debugging switches should I enable with QEMU to help me figure out why
things aren't working when trying to boot the SunOS 4.1.4 (Solaris 1.1.2)
installation CD ?
Is there a "best way" to build OpenBIOS to ensure maximum useful debugging
information is produced ?
If I'm repeating a whole lot of old questions, is there a FAQ for the QEMU +
OpenBIOS (Sparc32) combination that someone can point me to ?
Thanks
Jason
--
OpenBIOS http://openbios.org/
Mailinglist: http://lists.openbios.org/mailman/listinfo
Free your System - May the Forth be with you
2
1
Sorry for such a newbie question
Can someone just give me a quick overview of the "right way" to start up
QEMU so that it will load the OpenBIOS firmware instead of PROLL, and how to
point QEMU to my Solaris installation CD image file.
Do I need any hacks / patches to QEMU to use OpenBIOS instead of PROLL ?
What debugging switches should I enable with QEMU to help me figure out why
things aren't working when trying to boot the SunOS 4.1.4 (Solaris 1.1.2)
installation CD ?
Is there a "best way" to build OpenBIOS to ensure maximum useful debugging
information is produced ?
If I'm repeating a whole lot of old questions, is there a FAQ for the QEMU +
OpenBIOS (Sparc32) combination that someone can point me to ?
Thanks
Jason
1
0
Author: stepan
Date: 2006-06-05 22:34:53 +0200 (Mon, 05 Jun 2006)
New Revision: 48
Modified:
openbios-devel/arch/sparc32/init.fs
openbios-devel/arch/sparc32/romvec.c
openbios-devel/forth/admin/reset.fs
Log:
add reset-all and reset for sparc32
Modified: openbios-devel/arch/sparc32/init.fs
===================================================================
--- openbios-devel/arch/sparc32/init.fs 2006-06-05 20:02:44 UTC (rev 47)
+++ openbios-devel/arch/sparc32/init.fs 2006-06-05 20:34:53 UTC (rev 48)
@@ -51,6 +51,13 @@
; CONSOLE-IN-initializer
device-end
+
+: sparc32-reset-all
+ h# 71f00000 1 iow!
+ ;
+
+' sparc32-reset-all to reset-all
+
: rmap@ ( virt -- rmentry )
drop 0
;
Modified: openbios-devel/arch/sparc32/romvec.c
===================================================================
--- openbios-devel/arch/sparc32/romvec.c 2006-06-05 20:02:44 UTC (rev 47)
+++ openbios-devel/arch/sparc32/romvec.c 2006-06-05 20:34:53 UTC (rev 48)
@@ -413,7 +413,7 @@
return 0;
}
-void v2_eval(char *str)
+static void obp_fortheval_v2(char *str)
{
// for now, move something to the stack so we
// don't get a stack underrun.
@@ -422,11 +422,10 @@
//
fword("0");
fword("0");
- DPRINTF("\n---------------\n");
- DPRINTF(" %s", str);
- DPRINTF("\n---------------\n");
- feval(str);
- DPRINTF("\n---------------\n");
+
+ DPRINTF("obp_fortheval_v2(%s)\n", str);
+ push_str(str);
+ fword("eval");
}
void *
@@ -476,7 +475,7 @@
romvec0.pv_halt = obp_halt;
romvec0.pv_synchook = &sync_hook;
romvec0.pv_v0bootargs = &obp_argp;
- romvec0.pv_fortheval.v2_eval = v2_eval;
+ romvec0.pv_fortheval.v2_eval = obp_fortheval_v2;
romvec0.pv_v2devops.v2_inst2pkg = obp_inst2pkg;
romvec0.pv_v2devops.v2_dumb_mmap = obp_dumb_mmap;
romvec0.pv_v2devops.v2_dumb_munmap = obp_dumb_munmap;
Modified: openbios-devel/forth/admin/reset.fs
===================================================================
--- openbios-devel/forth/admin/reset.fs 2006-06-05 20:02:44 UTC (rev 47)
+++ openbios-devel/forth/admin/reset.fs 2006-06-05 20:34:53 UTC (rev 48)
@@ -1,5 +1,14 @@
\ 7.4.7 Reset
-: reset-all ( -- )
+defer reset-all ( -- )
+
+: no-reset-all
+ s" reset-all is not available on this platform." type cr
;
+' no-reset-all to reset-all
+
+\ OpenBOOT knows reset as well.
+: reset reset-all ;
+
+
1
0
Author: stepan
Date: 2006-06-05 22:02:44 +0200 (Mon, 05 Jun 2006)
New Revision: 47
Modified:
openbios-devel/drivers/esp.c
openbios-devel/drivers/obio.c
Log:
add quick and dirty hack to esp.c to get further with solaris.
add interrupt information to obio.c to boot netbsd
Modified: openbios-devel/drivers/esp.c
===================================================================
--- openbios-devel/drivers/esp.c 2006-06-05 19:49:53 UTC (rev 46)
+++ openbios-devel/drivers/esp.c 2006-06-05 20:02:44 UTC (rev 47)
@@ -511,6 +511,8 @@
add_alias(nodebuff, aliasbuff);
sprintf(aliasbuff, "sd(0,%d,0)", id);
add_alias(nodebuff, aliasbuff);
+ sprintf(aliasbuff, "sd(0,%d,0)@0,0", id);
+ add_alias(nodebuff, aliasbuff);
(*counter_ptr)++;
}
DPRINTF("done\n");
Modified: openbios-devel/drivers/obio.c
===================================================================
--- openbios-devel/drivers/obio.c 2006-06-05 19:49:53 UTC (rev 46)
+++ openbios-devel/drivers/obio.c 2006-06-05 20:02:44 UTC (rev 47)
@@ -286,11 +286,21 @@
push_str("reg");
fword("property");
- fword("finish-device");
-
regs = map_io(base + offset, sizeof(*regs));
regs->set = ~SUN4M_INT_MASKALL;
regs->cpu_intregs[0].clear = ~0x17fff;
+
+ // is this really correct?
+ PUSH(regs);
+ fword("encode-int");
+ PUSH(regs);
+ fword("encode-int");
+ fword("encode+");
+ push_str("address");
+ fword("property");
+
+ fword("finish-device");
+
}
1
0
Author: stepan
Date: 2006-06-05 21:49:53 +0200 (Mon, 05 Jun 2006)
New Revision: 46
Modified:
openbios-devel/arch/sparc32/romvec.c
openbios-devel/arch/sparc32/tree.fs
Log:
we're on the way: solaris fails a lot later now:
Modified: openbios-devel/arch/sparc32/romvec.c
===================================================================
--- openbios-devel/arch/sparc32/romvec.c 2006-06-05 19:41:28 UTC (rev 45)
+++ openbios-devel/arch/sparc32/romvec.c 2006-06-05 19:49:53 UTC (rev 46)
@@ -48,7 +48,7 @@
static struct linux_arguments_v0 obp_arg;
static const struct linux_arguments_v0 * const obp_argp = &obp_arg;
-static void (*synch_hook)(void);
+static void (*sync_hook)(void);
static struct linux_romvec romvec0;
@@ -332,7 +332,7 @@
fword("$call-method");
ret = POP();
- DPRINTF("obp_devwrite(fd 0x%x, buf %s, nbytes %d) = %d\n", dev_desc, buf, nbytes, ret);
+ //DPRINTF("obp_devwrite(fd 0x%x, buf %s, nbytes %d) = %d\n", dev_desc, buf, nbytes, ret);
return nbytes;
}
@@ -413,6 +413,22 @@
return 0;
}
+void v2_eval(char *str)
+{
+ // for now, move something to the stack so we
+ // don't get a stack underrun.
+ //
+ // FIXME: find out why solaris doesnt put its stuff on the stack
+ //
+ fword("0");
+ fword("0");
+ DPRINTF("\n---------------\n");
+ DPRINTF(" %s", str);
+ DPRINTF("\n---------------\n");
+ feval(str);
+ DPRINTF("\n---------------\n");
+}
+
void *
init_openprom(unsigned long memsize, const char *cmdline, char boot_device)
{
@@ -438,8 +454,8 @@
// Linux wants a R/W romvec table
romvec0.pv_magic_cookie = LINUX_OPPROM_MAGIC;
romvec0.pv_romvers = 3;
- romvec0.pv_plugin_revision = 77;
- romvec0.pv_printrev = 0x10203;
+ romvec0.pv_plugin_revision = 2;
+ romvec0.pv_printrev = 0x20019;
romvec0.pv_v0mem.v0_totphys = &ptphys;
romvec0.pv_v0mem.v0_prommap = &ptmap;
romvec0.pv_v0mem.v0_available = &ptavail;
@@ -458,8 +474,9 @@
romvec0.pv_printf = (void (*)(const char *fmt, ...))printk;
romvec0.pv_abort = obp_abort;
romvec0.pv_halt = obp_halt;
- romvec0.pv_synchook = &synch_hook;
+ romvec0.pv_synchook = &sync_hook;
romvec0.pv_v0bootargs = &obp_argp;
+ romvec0.pv_fortheval.v2_eval = v2_eval;
romvec0.pv_v2devops.v2_inst2pkg = obp_inst2pkg;
romvec0.pv_v2devops.v2_dumb_mmap = obp_dumb_mmap;
romvec0.pv_v2devops.v2_dumb_munmap = obp_dumb_munmap;
@@ -482,7 +499,10 @@
break;
case 'd':
obp_arg.boot_dev_unit = 2;
- obp_arg.argv[0] = "sd(0,2,0):d";
+ // FIXME: hardcoding this looks almost definitely wrong.
+ // With sd(0,2,0):b we get to see the solaris kernel though
+ //obp_arg.argv[0] = "sd(0,2,0):d";
+ obp_arg.argv[0] = "sd(0,2,0):b";
// Fall through
case 'c':
obp_arg.boot_dev[0] = 's';
Modified: openbios-devel/arch/sparc32/tree.fs
===================================================================
--- openbios-devel/arch/sparc32/tree.fs 2006-06-05 19:41:28 UTC (rev 45)
+++ openbios-devel/arch/sparc32/tree.fs 2006-06-05 19:49:53 UTC (rev 46)
@@ -29,12 +29,32 @@
finish-device
new-device
- " STP1012PGA" device-name
+ " FMI,MB86904" device-name
" cpu" device-type
- d# 256 encode-int " mmu-nctx" property
+
+ \ 0 encode-int 0 encode-int encode+ 0 encode-int encode+ " context-table" property
+ 0 encode-int " implementation" property
+ d# 4 encode-int " version" property
+
d# 32 encode-int " cache-line-size" property
d# 512 encode-int " cache-nlines" property
- 1 encode-int " mid" property
+
+ d# 4096 encode-int " page-size" property
+
+ d# 16 encode-int " dcache-line-size" property
+ d# 512 encode-int " dcache-nlines" property
+ d# 1 encode-int " dcache-associativity" property
+
+ d# 16 encode-int " icache-line-size" property
+ d# 512 encode-int " icache-nlines" property
+ d# 1 encode-int " icache-associativity" property
+
+ d# 2 encode-int " ncaches" property
+ d# 256 encode-int " mmu-nctx" property
+ d# 8 encode-int " sparc-version" property
+ d# 37 encode-int " mask_rev" property
+
+ \ 1 encode-int " mid" property
finish-device
new-device
1
0
Author: stepan
Date: 2006-06-05 21:41:28 +0200 (Mon, 05 Jun 2006)
New Revision: 45
Modified:
openbios-devel/arch/sparc32/init.fs
Log:
add dummy rmap@
Modified: openbios-devel/arch/sparc32/init.fs
===================================================================
--- openbios-devel/arch/sparc32/init.fs 2006-06-05 19:40:05 UTC (rev 44)
+++ openbios-devel/arch/sparc32/init.fs 2006-06-05 19:41:28 UTC (rev 45)
@@ -49,5 +49,9 @@
:noname
" keyboard" input
; CONSOLE-IN-initializer
-
+
+device-end
+: rmap@ ( virt -- rmentry )
+ drop 0
+ ;
1
0
Author: stepan
Date: 2006-06-05 21:40:05 +0200 (Mon, 05 Jun 2006)
New Revision: 44
Modified:
openbios-devel/arch/sparc32/aoutload.c
openbios-devel/arch/sparc32/elfload.c
openbios-devel/arch/sparc32/linux_load.c
openbios-devel/arch/sparc32/loadfs.c
Log:
safe filedescriptors
Modified: openbios-devel/arch/sparc32/aoutload.c
===================================================================
--- openbios-devel/arch/sparc32/aoutload.c 2006-06-05 19:30:59 UTC (rev 43)
+++ openbios-devel/arch/sparc32/aoutload.c 2006-06-05 19:40:05 UTC (rev 44)
@@ -139,5 +139,6 @@
retval = 0;
out:
+ file_close();
return retval;
}
Modified: openbios-devel/arch/sparc32/elfload.c
===================================================================
--- openbios-devel/arch/sparc32/elfload.c 2006-06-05 19:30:59 UTC (rev 43)
+++ openbios-devel/arch/sparc32/elfload.c 2006-06-05 19:40:05 UTC (rev 44)
@@ -127,6 +127,7 @@
}
}
out:
+ file_close();
if (buf)
free(buf);
return retval;
@@ -402,6 +403,7 @@
retval = 0;
out:
+ file_close();
if (phdr)
free(phdr);
if (boot_notes)
Modified: openbios-devel/arch/sparc32/linux_load.c
===================================================================
--- openbios-devel/arch/sparc32/linux_load.c 2006-06-05 19:30:59 UTC (rev 43)
+++ openbios-devel/arch/sparc32/linux_load.c 2006-06-05 19:40:05 UTC (rev 44)
@@ -589,8 +589,10 @@
return -1;
kern_addr = load_linux_header(&hdr);
- if (kern_addr == 0)
+ if (kern_addr == 0) {
+ file_close();
return LOADER_NOT_SUPPORT;
+ }
params = phys_to_virt(LINUX_PARAM_LOC);
init_linux_params(params, &hdr);
Modified: openbios-devel/arch/sparc32/loadfs.c
===================================================================
--- openbios-devel/arch/sparc32/loadfs.c 2006-06-05 19:30:59 UTC (rev 43)
+++ openbios-devel/arch/sparc32/loadfs.c 2006-06-05 19:40:05 UTC (rev 44)
@@ -13,6 +13,15 @@
return load_fd>-1;
}
+void file_close(void)
+{
+ if(load_fd==-1)
+ return;
+
+ close_io(load_fd);
+ load_fd=-1;
+}
+
int lfile_read(void *buf, unsigned long len)
{
int ret = 0;
1
0
Author: stepan
Date: 2006-06-05 21:30:59 +0200 (Mon, 05 Jun 2006)
New Revision: 43
Modified:
openbios-devel/forth/bootstrap/interpreter.fs
openbios-devel/forth/device/package.fs
Log:
small fixes/enhancements for solaris
Modified: openbios-devel/forth/bootstrap/interpreter.fs
===================================================================
--- openbios-devel/forth/bootstrap/interpreter.fs 2006-06-05 17:02:59 UTC (rev 42)
+++ openbios-devel/forth/bootstrap/interpreter.fs 2006-06-05 19:30:59 UTC (rev 43)
@@ -92,6 +92,7 @@
-21 of s" undefined method." type endof
-22 of s" no such device." type endof
dup s" Exception #" type .
+ 0 state !
endcase
else
state @ 0= if
Modified: openbios-devel/forth/device/package.fs
===================================================================
--- openbios-devel/forth/device/package.fs 2006-06-05 17:02:59 UTC (rev 42)
+++ openbios-devel/forth/device/package.fs 2006-06-05 19:30:59 UTC (rev 43)
@@ -10,7 +10,7 @@
\ variable last-package 0 last-package !
\ 0 value active-package
-
+: current-device active-package ;
\
\ 5.3.4.1 Open/Close packages (part 1)
1
0
Author: stepan
Date: 2006-06-05 19:02:59 +0200 (Mon, 05 Jun 2006)
New Revision: 42
Modified:
openbios-devel/arch/sparc32/boot.c
Log:
remove <null> output
Modified: openbios-devel/arch/sparc32/boot.c
===================================================================
--- openbios-devel/arch/sparc32/boot.c 2006-06-05 12:37:25 UTC (rev 41)
+++ openbios-devel/arch/sparc32/boot.c 2006-06-05 17:02:59 UTC (rev 42)
@@ -66,8 +66,13 @@
param = (char *)cmdline;
}
- printk("[sparc] Booting file '%s' with parameters '%s'\n",path, param);
+ printk("[sparc] Booting file '%s' ", path);
+ if(param)
+ printk("with parameters '%s'\n", param);
+ else
+ printk("without parameters.\n");
+
if (elf_load(&sys_info, path, param) == LOADER_NOT_SUPPORT)
if (linux_load(&sys_info, path, param) == LOADER_NOT_SUPPORT)
if (aout_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) {
1
0
Hi
We have some legacy Sparcstation IPX and ELC models that are running SunOS
4.1.3 / 4.1.4
Obviously, these machines are getting toward their use-by dates. But the
many applications that exist on the Sparcstations are simply impossible to
port single-handed to another Unix or even re-validate with Solaris 10 (or
maybe a few versions earlier) on more modern Sparc hardware. Some of the
original tools that they use are no longer available. In other words, any
move is going to be painful and possibly not be completely faithful to the
existing environment.
Therefore, emulation is the approach I'd really like to pursue if it's
possible.
Has anyone got SunOS 4.x to boot under QEMU using the latest OpenBIOS
firmware instead of PROLL ?
Is anyone out there even working on this possibility. or is the focus on
Linux or one of the NetBSD / OpenBSD implementations ?
Thanks
Jason
2
1
Author: stepan
Date: 2006-06-05 14:37:25 +0200 (Mon, 05 Jun 2006)
New Revision: 41
Modified:
openbios-devel/arch/sparc32/console.c
openbios-devel/arch/sparc32/openbios.c
openbios-devel/config/examples/cross-sparc32_config.xml
openbios-devel/config/examples/sparc32_config.xml
Log:
sparc32 -20 merge remainder
Modified: openbios-devel/arch/sparc32/console.c
===================================================================
--- openbios-devel/arch/sparc32/console.c 2006-06-05 12:35:11 UTC (rev 40)
+++ openbios-devel/arch/sparc32/console.c 2006-06-05 12:37:25 UTC (rev 41)
@@ -17,10 +17,30 @@
#ifdef CONFIG_DEBUG_CONSOLE_SERIAL
+#define KBD_BASE 0x71000004
#define SERIAL_BASE 0x71100004
#define CTRL(port) (SERIAL_BASE + (port) * 2 + 0)
#define DATA(port) (SERIAL_BASE + (port) * 2 + 2)
+/* Conversion routines to/from brg time constants from/to bits
+ * per second.
+ */
+#define BRG_TO_BPS(brg, freq) ((freq) / 2 / ((brg) + 2))
+#define BPS_TO_BRG(bps, freq) ((((freq) + (bps)) / (2 * (bps))) - 2)
+
+#define ZS_CLOCK 4915200 /* Zilog input clock rate. */
+#define ZS_CLOCK_DIVISOR 16 /* Divisor this driver uses. */
+
+/* Write Register 3 */
+#define RxENAB 0x1 /* Rx Enable */
+
+/* Write Register 5 */
+#define TxENAB 0x8 /* Tx Enable */
+
+/* Write Register 14 (Misc control bits) */
+#define BRENAB 1 /* Baud rate generator enable */
+#define BRSRC 2 /* Baud rate generator source */
+
static int uart_charav(int port)
{
return ((inb(CTRL(port)) & 1) != 0);
@@ -42,13 +62,20 @@
static void uart_init_line(int port, unsigned long baud)
{
- outb(3, CTRL(port)); // reg 3
- outb(1, CTRL(port)); // enable rx
+ outb(3, CTRL(port)); // reg 3
+ outb(RxENAB, CTRL(port)); // enable rx
- outb(5, CTRL(port)); // reg 5
- outb(8, CTRL(port)); // enable tx
+ outb(5, CTRL(port)); // reg 5
+ outb(TxENAB, CTRL(port)); // enable tx
- // XXX: baud rate
+ baud = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR);
+
+ outb(12, CTRL(port)); // reg 12
+ outb(baud & 0xff, CTRL(port));
+ outb(13, CTRL(port)); // reg 13
+ outb((baud >> 8) & 0xff, CTRL(port));
+ outb(14, CTRL(port)); // reg 14
+ outb(BRSRC | BRENAB, CTRL(port));
}
int uart_init(int port, unsigned long speed)
@@ -75,6 +102,143 @@
#endif
/* ******************************************************************
+ * simple polling video/keyboard console functions
+ * ****************************************************************** */
+
+#ifdef CONFIG_DEBUG_CONSOLE_VIDEO
+
+#define VMEM_BASE 0x00800000
+#define VMEM_SIZE (1024*768*1)
+#define DAC_BASE 0x00200000
+#define DAC_SIZE 16
+
+static unsigned char *vmem;
+static volatile uint32_t *dac;
+
+typedef struct osi_fb_info {
+ unsigned long mphys;
+ int rb, w, h, depth;
+} osi_fb_info_t;
+
+int TCX_GetFBInfo( osi_fb_info_t *fb )
+{
+ fb->w = 1024;
+ fb->h = 768;
+ fb->depth = 8;
+ fb->rb = 1024;
+ fb->mphys = vmem;
+
+ return 0;
+}
+
+#define openbios_GetFBInfo(x) TCX_GetFBInfo(x)
+
+#include "../../modules/video.c"
+#include "../../modules/console.c"
+
+static void video_putchar(int c)
+{
+ char buf[2];
+
+ buf[0] = c & 0xff;
+ buf[1] = 0;
+
+ console_draw_str(buf);
+}
+
+static void video_cls(void)
+{
+ memset((void *)vmem, 0, VMEM_SIZE);
+}
+
+void tcx_init(unsigned long base)
+{
+#if 1
+ unsigned int i;
+
+ // Create 1:1 mapping for video memory
+ for (i = 0; i < VMEM_SIZE; i += 4096) {
+ map_page(base + VMEM_BASE + i, base + VMEM_BASE + i, 0);
+ }
+ vmem = (char *)base + VMEM_BASE;
+#else
+ vmem = map_io(base + VMEM_BASE, VMEM_SIZE);
+#endif
+ dac = map_io(base + DAC_BASE, DAC_SIZE);
+
+ console_init();
+}
+
+static const unsigned char sunkbd_keycode[128] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', 0, 8,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
+ 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']',
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', '\\', 13,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/',
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ ' ',
+};
+
+static const unsigned char sunkbd_keycode_shifted[128] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+', 0, 8,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
+ 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}',
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '"', '|', 13,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?',
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ ' ',
+};
+
+static int shiftstate;
+
+static int
+keyboard_dataready(void)
+{
+ return ((inb(KBD_BASE) & 1) == 1);
+}
+
+static unsigned char
+keyboard_readdata(void)
+{
+ unsigned char ch;
+
+ while (!keyboard_dataready()) { }
+
+ do {
+ ch = inb(KBD_BASE + 2) & 0xff;
+ if (ch == 99)
+ shiftstate |= 1;
+ else if (ch == 110)
+ shiftstate |= 2;
+ else if (ch == 227)
+ shiftstate &= ~1;
+ else if (ch == 238)
+ shiftstate &= ~2;
+ //printk("getch: %d\n", ch);
+ }
+ while ((ch & 0x80) == 0 || ch == 238 || ch == 227); // Wait for key release
+ //printk("getch rel: %d\n", ch);
+ ch &= 0x7f;
+ if (shiftstate)
+ ch = sunkbd_keycode_shifted[ch];
+ else
+ ch = sunkbd_keycode[ch];
+ //printk("getch xlate: %d\n", ch);
+
+ return ch;
+}
+
+#endif
+
+/* ******************************************************************
* common functions, implementing simple concurrent console
* ****************************************************************** */
@@ -83,6 +247,9 @@
#ifdef CONFIG_DEBUG_CONSOLE_SERIAL
serial_putchar(c);
#endif
+#ifdef CONFIG_DEBUG_CONSOLE_VIDEO
+ video_putchar(c);
+#endif
return c;
}
@@ -92,6 +259,10 @@
if (uart_charav(CONFIG_SERIAL_PORT))
return 1;
#endif
+#ifdef CONFIG_DEBUG_CONSOLE_VIDEO
+ if (keyboard_dataready())
+ return 1;
+#endif
return 0;
}
@@ -101,6 +272,10 @@
if (uart_charav(CONFIG_SERIAL_PORT))
return (uart_getchar(CONFIG_SERIAL_PORT));
#endif
+#ifdef CONFIG_DEBUG_CONSOLE_VIDEO
+ if (keyboard_dataready())
+ return (keyboard_readdata());
+#endif
return 0;
}
@@ -109,6 +284,10 @@
#ifdef CONFIG_DEBUG_CONSOLE_SERIAL
serial_cls();
#endif
+#ifdef CONFIG_DEBUG_CONSOLE_VIDEO
+ video_cls();
+#endif
}
+
#endif // CONFIG_DEBUG_CONSOLE
Modified: openbios-devel/arch/sparc32/openbios.c
===================================================================
--- openbios-devel/arch/sparc32/openbios.c 2006-06-05 12:35:11 UTC (rev 40)
+++ openbios-devel/arch/sparc32/openbios.c 2006-06-05 12:37:25 UTC (rev 41)
@@ -18,10 +18,12 @@
void boot(void);
void ob_ide_init(void);
+void tcx_init(unsigned long base);
#define IOMMU_BASE 0x10000000 /* First page of sun4m IOMMU */
#define SLAVIO_BASE 0x71000000
#define MACIO_BASE 0x70000000
+#define TCX_BASE 0x50000000
static unsigned char intdict[256 * 1024];
@@ -46,10 +48,13 @@
modules_init();
#ifdef CONFIG_DRIVER_SBUS
- init_mmu_swift(IOMMU_BASE);
-
+ ob_init_mmu(IOMMU_BASE);
ob_sbus_init();
+
+#ifdef CONFIG_DEBUG_CONSOLE_VIDEO
+ init_video();
#endif
+#endif
#ifdef CONFIG_DRIVER_ESP
ob_esp_init(MACIO_BASE);
#endif
@@ -68,10 +73,16 @@
extern struct mem cmem;
mem_init(&cmem, (char *) &_vmem, (char *)&_evmem);
+#ifdef CONFIG_DRIVER_SBUS
+ init_mmu_swift(IOMMU_BASE);
+#endif
#ifdef CONFIG_DEBUG_CONSOLE
#ifdef CONFIG_DEBUG_CONSOLE_SERIAL
uart_init(CONFIG_SERIAL_PORT, CONFIG_SERIAL_SPEED);
#endif
+#ifdef CONFIG_DEBUG_CONSOLE_VIDEO
+ tcx_init(TCX_BASE);
+#endif
/* Clear the screen. */
cls();
#endif
@@ -83,9 +94,6 @@
(unsigned long)sys_info.dict_end
- (unsigned long)sys_info.dict_start);
-#ifdef CONFIG_DEBUG_CONSOLE_VIDEO
- video_init();
-#endif
#ifdef CONFIG_DEBUG_BOOT
printk("forth started.\n");
printk("initializing memory...");
Modified: openbios-devel/config/examples/cross-sparc32_config.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc32_config.xml 2006-06-05 12:35:11 UTC (rev 40)
+++ openbios-devel/config/examples/cross-sparc32_config.xml 2006-06-05 12:37:25 UTC (rev 41)
@@ -26,6 +26,7 @@
<option name="CONFIG_DEBUG_INTERPRETER" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_CONSOLE" type="boolean" value="true"/>
<option name="CONFIG_DEBUG_CONSOLE_SERIAL" type="boolean" value="true"/>
+ <option name="CONFIG_DEBUG_CONSOLE_VIDEO" type="boolean" value="true"/>
<option name="CONFIG_DEBUG_ESP" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_SUN_PARTS" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_OBP" type="boolean" value="false"/>
Modified: openbios-devel/config/examples/sparc32_config.xml
===================================================================
--- openbios-devel/config/examples/sparc32_config.xml 2006-06-05 12:35:11 UTC (rev 40)
+++ openbios-devel/config/examples/sparc32_config.xml 2006-06-05 12:37:25 UTC (rev 41)
@@ -26,6 +26,7 @@
<option name="CONFIG_DEBUG_INTERPRETER" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_CONSOLE" type="boolean" value="true"/>
<option name="CONFIG_DEBUG_CONSOLE_SERIAL" type="boolean" value="true"/>
+ <option name="CONFIG_DEBUG_CONSOLE_VIDEO" type="boolean" value="true"/>
<option name="CONFIG_DEBUG_ESP" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_SUN_PARTS" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_OBP" type="boolean" value="false"/>
1
0
Author: stepan
Date: 2006-06-05 14:35:11 +0200 (Mon, 05 Jun 2006)
New Revision: 40
Modified:
openbios-devel/drivers/esp.c
openbios-devel/drivers/iommu.c
openbios-devel/include/sparc32/io.h
Log:
-20
Modified: openbios-devel/drivers/esp.c
===================================================================
--- openbios-devel/drivers/esp.c 2006-06-05 10:57:48 UTC (rev 39)
+++ openbios-devel/drivers/esp.c 2006-06-05 12:35:11 UTC (rev 40)
@@ -263,7 +263,7 @@
fword("my-unit");
id = POP();
- POP(); // unit id is 2 ints but we only need one.
+ //POP(); // unit id is 2 ints but we only need one.
*sd = &global_esp->sd[id];
#ifdef CONFIG_DEBUG_ESP
Modified: openbios-devel/drivers/iommu.c
===================================================================
--- openbios-devel/drivers/iommu.c 2006-06-05 10:57:48 UTC (rev 39)
+++ openbios-devel/drivers/iommu.c 2006-06-05 12:35:11 UTC (rev 40)
@@ -195,15 +195,10 @@
return (void *)((unsigned int)va + off);
}
-/*
- * Switch page tables.
- */
void
-init_mmu_swift(unsigned long base)
+ob_init_mmu(unsigned long base)
{
extern unsigned int qemu_mem_size;
- unsigned int addr, i;
- unsigned long pa, va;
push_str("/memory");
fword("find-device");
@@ -264,7 +259,17 @@
fword("encode+");
push_str("available");
fword("property");
+}
+/*
+ * Switch page tables.
+ */
+void
+init_mmu_swift(unsigned long base)
+{
+ unsigned int addr, i;
+ unsigned long pa, va;
+
mem_init(&cio, (char *)&_end, (char *)&_iomem);
context_table = mem_zalloc(&cmem, NCTX_SWIFT * sizeof(int), NCTX_SWIFT * sizeof(int));
Modified: openbios-devel/include/sparc32/io.h
===================================================================
--- openbios-devel/include/sparc32/io.h 2006-06-05 10:57:48 UTC (rev 39)
+++ openbios-devel/include/sparc32/io.h 2006-06-05 12:35:11 UTC (rev 40)
@@ -38,6 +38,7 @@
void *mem_zalloc(struct mem *t, int size, int align);
int map_page(unsigned long va, unsigned long epa, int type);
void *map_io(unsigned pa, int size);
+void ob_init_mmu(unsigned long base);
void init_mmu_swift(unsigned long base);
void *dvma_alloc(int size, unsigned int *pphys);
1
0
Author: stepan
Date: 2006-06-05 12:57:48 +0200 (Mon, 05 Jun 2006)
New Revision: 39
Modified:
openbios-devel/arch/sparc32/aoutload.c
Log:
fix loading silo - is this number correct?
Modified: openbios-devel/arch/sparc32/aoutload.c
===================================================================
--- openbios-devel/arch/sparc32/aoutload.c 2006-06-05 10:51:31 UTC (rev 38)
+++ openbios-devel/arch/sparc32/aoutload.c 2006-06-05 10:57:48 UTC (rev 39)
@@ -87,6 +87,9 @@
size = addr_fixup(ehdr.a_text) + addr_fixup(ehdr.a_data);
}
+ if (size < 7680)
+ size = 7680;
+
start = 0x4000; // N_TXTADDR(ehdr);
if (!check_mem_ranges(info, start, size))
1
0
Author: stepan
Date: 2006-06-05 12:51:31 +0200 (Mon, 05 Jun 2006)
New Revision: 38
Modified:
openbios-devel/arch/x86/console.c
openbios-devel/modules/console.c
openbios-devel/modules/video.c
Log:
sparc32 merge 20 part 1
Modified: openbios-devel/arch/x86/console.c
===================================================================
--- openbios-devel/arch/x86/console.c 2006-05-31 20:20:10 UTC (rev 37)
+++ openbios-devel/arch/x86/console.c 2006-06-05 10:51:31 UTC (rev 38)
@@ -251,7 +251,7 @@
* keyboard driver
*/
-static char normal[] = {
+static const char normal[] = {
0x0, 0x1b, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-',
'=', '\b', '\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o',
'p', '[', ']', 0xa, 0x0, 'a', 's', 'd', 'f', 'g', 'h', 'j',
@@ -261,7 +261,7 @@
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, '0', 0x7f
};
-static char shifted[] = {
+static const char shifted[] = {
0x0, 0x1b, '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_',
'+', '\b', '\t', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O',
'P', '{', '}', 0xa, 0x0, 'A', 'S', 'D', 'F', 'G', 'H', 'J',
Modified: openbios-devel/modules/console.c
===================================================================
--- openbios-devel/modules/console.c 2006-05-31 20:20:10 UTC (rev 37)
+++ openbios-devel/modules/console.c 2006-06-05 10:51:31 UTC (rev 38)
@@ -165,7 +165,7 @@
int
console_draw_str( const char *str )
{
- static char *ignore[] = { "[1;37m", "[2;40m", NULL };
+ static const char *ignore[] = { "[1;37m", "[2;40m", NULL };
int ch, y, x, i;
if( !cons.inited && console_init() )
Modified: openbios-devel/modules/video.c
===================================================================
--- openbios-devel/modules/video.c 2006-05-31 20:20:10 UTC (rev 37)
+++ openbios-devel/modules/video.c 2006-06-05 10:51:31 UTC (rev 38)
@@ -172,6 +172,13 @@
#ifdef CONFIG_MOL
if( video.fb.depth == 8 )
OSI_SetColor( ind, color );
+#elif CONFIG_SPARC32
+ if( video.fb.depth == 8 ) {
+ dac[0] = ind << 24;
+ dac[1] = ((color >> 16) & 0xff) << 24; // Red
+ dac[1] = ((color >> 8) & 0xff) << 24; // Green
+ dac[1] = (color & 0xff) << 24; // Blue
+ }
#endif
}
1
0
I implemeted a graphical console including a Sun keyboard, please have a
look at the screenshot.
Other changes include: baud rate programming (no effect in Qemu), made some
tables readonly, and the older patches for HD boot & workaround to stack
corruption.
Linux hangs if the graphical console is enabled, maybe the romvec mapping
tables need to include the framebuffer.
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
1
0
SILO a.out header gives a bit too short value. The following allows booting
directly from HD succeed, maybe it helps other OSes.
I installed Debian 3.1r1 from CD image, with this patch I can boot from the
HD.
diff -ru openbios-ref-19/arch/sparc32/aoutload.c
openbios-patch-19/arch/sparc32/aoutload.c
--- openbios-ref-19/arch/sparc32/aoutload.c 2006-05-26
11:50:28.000000000 +0000
+++ openbios-patch-19/arch/sparc32/aoutload.c 2006-06-03
11:11:13.000000000 +0000
@@ -87,6 +87,9 @@
size = addr_fixup(ehdr.a_text) + addr_fixup(ehdr.a_data);
}
+ if (size < 7680)
+ size = 7680;
+
start = 0x4000; // N_TXTADDR(ehdr);
if (!check_mem_ranges(info, start, size))
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
1
0
Using the latest version of esp.c, I get exception at boot. But if I disable
the POP(), boot succeeds. I understand that my-unit should push two ints, so
there must be a stack messing error (maybe extra POP?) later.
Index: drivers/esp.c
===================================================================
--- drivers/esp.c (revision 37)
+++ drivers/esp.c (working copy)
@@ -263,7 +263,7 @@
fword("my-unit");
id = POP();
- POP(); // unit id is 2 ints but we only need one.
+ //POP(); // unit id is 2 ints but we only need one.
*sd = &global_esp->sd[id];
#ifdef CONFIG_DEBUG_ESP
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
1
0
Hello, I'm new to openbios.
I love playing around in openfirmware, and I'm sad
that apple is discontinuing its usage by switching to
EFI, so I would love to help out in any way possible.
I'm starting to feel a bit of Nastalgia already for
the soon-to-be-legacy platform of openfirmware +
powerpc + macosx so anything I can do to keep the
system alive I will :)
Andrew Robbins
__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around
http://mail.yahoo.com
1
0
Author: stepan
Date: 2006-05-31 22:20:10 +0200 (Wed, 31 May 2006)
New Revision: 37
Modified:
openbios-devel/drivers/esp.c
Log:
keep stack clean
Modified: openbios-devel/drivers/esp.c
===================================================================
--- openbios-devel/drivers/esp.c 2006-05-31 18:09:18 UTC (rev 36)
+++ openbios-devel/drivers/esp.c 2006-05-31 20:20:10 UTC (rev 37)
@@ -144,7 +144,7 @@
short len, short sect_offset)
{
DPRINTF("ob_sd_read_sectors id %d %lx sector=%d len=%d soff %d\n",
- sd->id, (unsigned long)dest, offset, len, sect_offset);
+ sd->id, (unsigned long)dest, offset, len, sect_offset);
// Setup command = Read(10)
memset(esp->buffer, 0, 10);
@@ -262,7 +262,8 @@
phandle_t ph;
fword("my-unit");
- id = POP();
+ id = POP();
+ POP(); // unit id is 2 ints but we only need one.
*sd = &global_esp->sd[id];
#ifdef CONFIG_DEBUG_ESP
1
0
Author: stepan
Date: 2006-05-31 20:09:18 +0200 (Wed, 31 May 2006)
New Revision: 36
Modified:
openbios-devel/arch/sparc32/tree.fs
Log:
have the name match a real sparcstation (solaris wants that)
Modified: openbios-devel/arch/sparc32/tree.fs
===================================================================
--- openbios-devel/arch/sparc32/tree.fs 2006-05-28 18:48:47 UTC (rev 35)
+++ openbios-devel/arch/sparc32/tree.fs 2006-05-31 18:09:18 UTC (rev 36)
@@ -2,8 +2,8 @@
" /" find-device
2 encode-int " #address-cells" property
1 encode-int " #size-cells" property
- " SUNW,SparcStation-5" encode-string " name" property
- " SparcStation" encode-string " banner-name" property
+ " SUNW,SPARCstation-5" encode-string " name" property
+ " SPARCstation 5" encode-string " banner-name" property
" sun4m" encode-string " compatible" property
" /obio/zs@0,100000:a" encode-string " stdin-path" property
" /obio/zs@0,100000:a" encode-string " stdout-path" property
1
0
Author: stepan
Date: 2006-05-28 20:48:47 +0200 (Sun, 28 May 2006)
New Revision: 35
Modified:
openbios-devel/arch/sparc32/boot.c
openbios-devel/arch/sparc32/romvec.c
openbios-devel/drivers/esp.c
openbios-devel/drivers/iommu.c
openbios-devel/drivers/obio.c
Log:
blueswirl's sparc32 patches - boots linux.
Modified: openbios-devel/arch/sparc32/boot.c
===================================================================
--- openbios-devel/arch/sparc32/boot.c 2006-05-26 11:14:20 UTC (rev 34)
+++ openbios-devel/arch/sparc32/boot.c 2006-05-28 18:48:47 UTC (rev 35)
@@ -25,6 +25,7 @@
void boot(void)
{
char *path=pop_fstr_copy(), *param;
+ char altpath[256];
if (kernel_size) {
extern unsigned int qemu_mem_size;
@@ -69,8 +70,15 @@
if (elf_load(&sys_info, path, param) == LOADER_NOT_SUPPORT)
if (linux_load(&sys_info, path, param) == LOADER_NOT_SUPPORT)
- if (aout_load(&sys_info, path, param) == LOADER_NOT_SUPPORT)
- printk("Unsupported image format\n");
+ if (aout_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) {
+ sprintf(altpath, "%s:d", path);
+
+ if (elf_load(&sys_info, altpath, param) == LOADER_NOT_SUPPORT)
+ if (linux_load(&sys_info, altpath, param) == LOADER_NOT_SUPPORT)
+ if (aout_load(&sys_info, altpath, param) == LOADER_NOT_SUPPORT)
+ printk("Unsupported image format\n");
+ }
+
free(path);
}
Modified: openbios-devel/arch/sparc32/romvec.c
===================================================================
--- openbios-devel/arch/sparc32/romvec.c 2006-05-26 11:14:20 UTC (rev 34)
+++ openbios-devel/arch/sparc32/romvec.c 2006-05-28 18:48:47 UTC (rev 35)
@@ -26,418 +26,6 @@
#define PAGE_SIZE 4096
-struct ob_property {
- struct ob_property *next;
- char *name;
- char *value;
- int length;
-};
-
-struct ob_node {
- struct ob_node *next;
- struct ob_node *peer;
- struct ob_node *child;
- struct ob_property *prop;
- int id;
-};
-
-// Workarounds:
-
-// Proll device tree happens to work, why?
-#define PROLL_TREE
-
-// Build a static device tree to avoid Forth access from deep kernel
-//#define STATIC_TREE
-
-#ifdef PROLL_TREE
-struct property {
- const char *name;
- const char *value;
- int length;
-};
-
-struct node {
- const struct property *properties;
- /* short */ const int sibling;
- /* short */ const int child;
-};
-
-static const unsigned char obp_idprom[32] = { 1, 0x80, 0x52, 0x54, 0x00, 0x12, 0x34, 0x56,
- 0,0,0,0, 0,0,0, 0xf7 };
-static const struct property null_properties = { NULL, NULL, -1 };
-static const int prop_true = -1;
-
-static const struct property propv_root[] = {
- {"name", "SUNW,SparcStation-5", sizeof("SUNW,SparcStation-5") },
- {"idprom", (char *)obp_idprom, 32},
- {"banner-name", "SparcStation", sizeof("SparcStation")},
- {"compatible", "sun4m", 6},
- {NULL, NULL, -1}
-};
-
-static const int prop_iommu_reg[] = {
- 0x0, 0x10000000, 0x00000300,
-};
-static const struct property propv_iommu[] = {
- {"name", "iommu", sizeof("iommu")},
- {"reg", (char*)&prop_iommu_reg[0], sizeof(prop_iommu_reg) },
- {NULL, NULL, -1}
-};
-
-static const int prop_sbus_ranges[] = {
- 0x0, 0x0, 0x0, 0x30000000, 0x10000000,
- 0x1, 0x0, 0x0, 0x40000000, 0x10000000,
- 0x2, 0x0, 0x0, 0x50000000, 0x10000000,
- 0x3, 0x0, 0x0, 0x60000000, 0x10000000,
- 0x4, 0x0, 0x0, 0x70000000, 0x10000000,
-};
-static const struct property propv_sbus[] = {
- {"name", "sbus", 5},
- {"ranges", (char*)&prop_sbus_ranges[0], sizeof(prop_sbus_ranges)},
- {"device_type", "hierarchical", sizeof("hierarchical") },
- {NULL, NULL, -1}
-};
-
-static const int prop_tcx_regs[] = {
- 0x2, 0x00800000, 0x00100000,
- 0x2, 0x02000000, 0x00000001,
- 0x2, 0x04000000, 0x00800000,
- 0x2, 0x06000000, 0x00800000,
- 0x2, 0x0a000000, 0x00000001,
- 0x2, 0x0c000000, 0x00000001,
- 0x2, 0x0e000000, 0x00000001,
- 0x2, 0x00700000, 0x00001000,
- 0x2, 0x00200000, 0x00000004,
- 0x2, 0x00300000, 0x0000081c,
- 0x2, 0x00000000, 0x00010000,
- 0x2, 0x00240000, 0x00000004,
- 0x2, 0x00280000, 0x00000001,
-};
-
-#if 1 /* Zaitcev */
-static const int pixfreq = 0x03dfd240;
-static const int hbporch = 0xa0;
-static const int vfreq = 0x3c;
-#endif
-#if 0 /* Kevin Boone - 70Hz refresh */
-static const int pixfreq = 0x047868C0;
-static const int hbporch = 0x90;
-static const int vfreq = 0x46;
-#endif
-
-static const int vbporch = 0x1d;
-static const int vsync = 0x6;
-static const int hsync = 0x88;
-static const int vfporch = 0x3;
-static const int hfporch = 0x18;
-static const int height = 0x300;
-static const int width = 0x400;
-static const int linebytes = 0x400;
-static const int depth = 24;
-static const int tcx_intr[] = { 5, 0 };
-static const int tcx_interrupts = 5;
-static const struct property propv_sbus_tcx[] = {
- {"name", "SUNW,tcx", sizeof("SUNW,tcx")},
- {"vbporch", (char*)&vbporch, sizeof(int)},
- {"hbporch", (char*)&hbporch, sizeof(int)},
- {"vsync", (char*)&vsync, sizeof(int)},
- {"hsync", (char*)&hsync, sizeof(int)},
- {"vfporch", (char*)&vfporch, sizeof(int)},
- {"hfporch", (char*)&hfporch, sizeof(int)},
- {"pixfreq", (char*)&pixfreq, sizeof(int)},
- {"vfreq", (char*)&vfreq, sizeof(int)},
- {"height", (char*)&height, sizeof(int)},
- {"width", (char*)&width, sizeof(int)},
- {"linebytes", (char*)&linebytes, sizeof(int)},
- {"depth", (char*)&depth, sizeof(int)},
- {"reg", (char*)&prop_tcx_regs[0], sizeof(prop_tcx_regs)},
- {"tcx-8-bit", 0, -1},
- {"intr", (char*)&tcx_intr[0], sizeof(tcx_intr)},
- {"interrupts", (char*)&tcx_interrupts, sizeof(tcx_interrupts)},
- {"device_type", "display", sizeof("display")},
- {NULL, NULL, -1}
-};
-
-static const int prop_cs4231_reg[] = {
- 0x3, 0x0C000000, 0x00000040
-};
-static const int cs4231_interrupts = 5;
-static const int cs4231_intr[] = { 5, 0 };
-
-static const struct property propv_sbus_cs4231[] = {
- {"name", "SUNW,CS4231", sizeof("SUNW,CS4231") },
- {"intr", (char*)&cs4231_intr[0], sizeof(cs4231_intr) },
- {"interrupts", (char*)&cs4231_interrupts, sizeof(cs4231_interrupts) },
- {"reg", (char*)&prop_cs4231_reg[0], sizeof(prop_cs4231_reg) },
- {"device_type", "serial", sizeof("serial") },
- {"alias", "audio", sizeof("audio") },
- {NULL, NULL, -1}
-};
-
-static const int cpu_nctx = 256;
-static const int cpu_cache_line_size = 0x20;
-static const int cpu_cache_nlines = 0x200;
-static const struct property propv_cpu[] = {
- {"name", "STP1012PGA", sizeof("STP1012PGA") },
- {"device_type", "cpu", 4 },
- {"mmu-nctx", (char*)&cpu_nctx, sizeof(int)},
- {"cache-line-size", (char*)&cpu_cache_line_size, sizeof(int)},
- {"cache-nlines", (char*)&cpu_cache_nlines, sizeof(int)},
- {NULL, NULL, -1}
-};
-
-static const int prop_obio_ranges[] = {
- 0x0, 0x0, 0x0, 0x71000000, 0x01000000,
-};
-static const struct property propv_obio[] = {
- {"name", "obio", 5 },
- {"ranges", (char*)&prop_obio_ranges[0], sizeof(prop_obio_ranges) },
- {"device_type", "hierarchical", sizeof("hierarchical") },
- {NULL, NULL, -1}
-};
-
-static const int prop_auxio_reg[] = {
- 0x0, 0x00900000, 0x00000001,
-};
-static const struct property propv_obio_auxio[] = {
- {"name", "auxio", sizeof("auxio") },
- {"reg", (char*)&prop_auxio_reg[0], sizeof(prop_auxio_reg) },
- {NULL, NULL, -1}
-};
-
-static const int prop_int_reg[] = {
- 0x0, 0x00e00000, 0x00000010,
- 0x0, 0x00e10000, 0x00000010,
-};
-static const struct property propv_obio_int[] = {
- {"name", "interrupt", sizeof("interrupt")},
- {"reg", (char*)&prop_int_reg[0], sizeof(prop_int_reg) },
- {NULL, NULL, -1}
-};
-
-static const int prop_cnt_reg[] = {
- 0x0, 0x00d00000, 0x00000010,
- 0x0, 0x00d10000, 0x00000010,
-};
-static const struct property propv_obio_cnt[] = {
- {"name", "counter", sizeof("counter")},
- {"reg", (char*)&prop_cnt_reg[0], sizeof(prop_cnt_reg) },
- {NULL, NULL, -1}
-};
-
-static const int prop_eeprom_reg[] = {
- 0x0, 0x00200000, 0x00002000,
-};
-static const struct property propv_obio_eep[] = {
- {"name", "eeprom", sizeof("eeprom")},
- {"reg", (char*)&prop_eeprom_reg[0], sizeof(prop_eeprom_reg) },
- {"model", "mk48t08", sizeof("mk48t08")},
- {NULL, NULL, -1}
-};
-
-static const int prop_su_reg[] = {
- 0x0, 0x003002f8, 0x00000008,
-};
-static const struct property propv_obio_su[] = {
- {"name", "su", sizeof("su")},
- {"reg", (char*)&prop_su_reg[0], sizeof(prop_su_reg) },
- {NULL, NULL, -1}
-};
-
-static const int prop_zs_intr[] = { 0x2c, 0x0 };
-static const int prop_zs_reg[] = {
- 0x0, 0x00000000, 0x00000008,
-};
-static void *prop_zs_addr;
-static const int prop_zs_slave = 1;
-static const struct property propv_obio_zs[] = {
- {"name", "zs", sizeof("zs")},
- {"reg", (char*)&prop_zs_reg[0], sizeof(prop_zs_reg) },
- {"slave", (char*)&prop_zs_slave, sizeof(prop_zs_slave) },
- {"device_type", "serial", sizeof("serial") },
- {"intr", (char*)&prop_zs_intr[0], sizeof(prop_zs_intr) },
- {"address", (char*)&prop_zs_addr, sizeof(prop_zs_addr) },
- {"keyboard", (char*)&prop_true, 0},
- {"mouse", (char*)&prop_true, 0},
- {NULL, NULL, -1}
-};
-
-static const int prop_zs1_intr[] = { 0x2c, 0x0 };
-static const int prop_zs1_reg[] = {
- 0x0, 0x00100000, 0x00000008,
-};
-static void *prop_zs1_addr;
-static const int prop_zs1_slave = 0;
-static const struct property propv_obio_zs1[] = {
- {"name", "zs", sizeof("zs")},
- {"reg", (char*)&prop_zs1_reg[0], sizeof(prop_zs1_reg) },
- {"slave", (char*)&prop_zs1_slave, sizeof(prop_zs1_slave) },
- {"device_type", "serial", sizeof("serial") },
- {"intr", (char*)&prop_zs1_intr[0], sizeof(prop_zs1_intr) },
- {"address", (char*)&prop_zs1_addr, sizeof(prop_zs1_addr) },
- {NULL, NULL, -1}
-};
-
-static const int prop_ledma_reg[] = {
- 0x4, 0x08400010, 0x00000020,
-};
-static const int prop_ledma_burst = 0x3f;
-static const struct property propv_sbus_ledma[] = {
- {"name", "ledma", sizeof("ledma")},
- {"reg", (char*)&prop_ledma_reg[0], sizeof(prop_ledma_reg) },
- {"burst-sizes", (char*)&prop_ledma_burst, sizeof(int) },
- {NULL, NULL, -1}
-};
-
-static const int prop_le_reg[] = {
- 0x4, 0x08c00000, 0x00000004,
-};
-static const int prop_le_busmaster_regval = 0x7;
-static const int prop_le_intr[] = { 0x26, 0x0 };
-static const struct property propv_sbus_ledma_le[] = {
- {"name", "le", sizeof("le")},
- {"reg", (char*)&prop_le_reg[0], sizeof(prop_le_reg) },
- {"busmaster-regval", (char*)&prop_le_busmaster_regval, sizeof(int)},
- {"intr", (char*)&prop_le_intr[0], sizeof(prop_le_intr) },
- {NULL, NULL, -1}
-};
-
-static const int prop_espdma_reg[] = {
- 0x4, 0x08400000, 0x00000010,
-};
-
-static const struct property propv_sbus_espdma[] = {
- {"name", "espdma", sizeof("espdma")},
- {"reg", (char*)&prop_espdma_reg[0], sizeof(prop_espdma_reg) },
- {NULL, NULL, -1}
-};
-
-static const int prop_esp_reg[] = {
- 0x4, 0x08800000, 0x00000040,
-};
-static const int prop_esp_intr[] = { 0x24, 0x0 };
-static const struct property propv_sbus_espdma_esp[] = {
- {"name", "esp", sizeof("esp")},
- {"reg", (char*)&prop_esp_reg[0], sizeof(prop_esp_reg) },
- {"intr", (char*)&prop_esp_intr[0], sizeof(prop_esp_intr) },
- {NULL, NULL, -1}
-};
-
-static const int prop_bpp_reg[] = {
- 0x4, 0x0c800000, 0x0000001c,
-};
-static const int prop_bpp_intr[] = { 0x33, 0x0 };
-static const struct property propv_sbus_bpp[] = {
- {"name", "SUNW,bpp", sizeof("SUNW,bpp")},
- {"reg", (char*)&prop_bpp_reg[0], sizeof(prop_bpp_reg) },
- {"intr", (char*)&prop_bpp_intr[0], sizeof(prop_bpp_intr) },
- {NULL, NULL, -1}
-};
-
-static const int prop_apc_reg[] = {
- 0x4, 0x0a000000, 0x00000010,
-};
-static const struct property propv_sbus_apc[] = {
- {"name", "xxxpower-management", sizeof("xxxpower-management")},
- {"reg", (char*)&prop_apc_reg[0], sizeof(prop_apc_reg) },
- {NULL, NULL, -1}
-};
-
-static const int prop_fd_intr[] = { 0x2b, 0x0 };
-static const int prop_fd_reg[] = {
- 0x0, 0x00400000, 0x0000000f,
-};
-static const struct property propv_obio_fd[] = {
- {"name", "SUNW,fdtwo", sizeof("SUNW,fdtwo")},
- {"reg", (char*)&prop_fd_reg[0], sizeof(prop_fd_reg) },
- {"device_type", "block", sizeof("block") },
- {"intr", (char*)&prop_fd_intr[0], sizeof(prop_fd_intr) },
- {NULL, NULL, -1}
-};
-
-static const int prop_pw_intr[] = { 0x22, 0x0 };
-static const int prop_pw_reg[] = {
- 0x0, 0x00910000, 0x00000001,
-};
-static const struct property propv_obio_pw[] = {
- {"name", "power", sizeof("power")},
- {"reg", (char*)&prop_pw_reg[0], sizeof(prop_pw_reg) },
- {"intr", (char*)&prop_pw_intr[0], sizeof(prop_pw_intr) },
- {NULL, NULL, -1}
-};
-
-static const int prop_cf_reg[] = {
- 0x0, 0x00800000, 0x00000001,
-};
-static const struct property propv_obio_cf[] = {
- {"name", "slavioconfig", sizeof("slavioconfig")},
- {"reg", (char*)&prop_cf_reg[0], sizeof(prop_cf_reg) },
- {NULL, NULL, -1}
-};
-
-static const struct property propv_options[] = {
- {"name", "options", sizeof("options")},
- {"screen-#columns", "80", sizeof("80")},
- {"screen-#rows", "25", sizeof("25")},
- {"tpe-link-test?", (char *)&prop_true, 0},
- {"ttya-mode", "9600,8,n,1,-", sizeof("9600,8,n,1,-")},
- {"ttya-ignore-cd", (char *)&prop_true, 0},
- {"ttya-rts-dtr-off", 0, -1},
- {"ttyb-mode", "9600,8,n,1,-", sizeof("9600,8,n,1,-")},
- {"ttyb-ignore-cd", (char *)&prop_true, 0},
- {"ttyb-rts-dtr-off", 0, -1},
- {NULL, NULL, -1}
-};
-
-static int prop_mem_reg[3];
-static int prop_mem_avail[3];
-
-static const struct property propv_memory[] = {
- {"name", "memory", sizeof("memory")},
- {"reg", (char*)&prop_mem_reg[0], sizeof(prop_mem_reg) },
- {"available", (char*)&prop_mem_avail[0], sizeof(prop_mem_avail) },
- {NULL, NULL, -1}
-};
-
-static int prop_vmem_avail[6];
-
-static const struct property propv_vmemory[] = {
- {"name", "virtual-memory", sizeof("virtual-memory")},
- {"available", (char*)&prop_vmem_avail[0], sizeof(prop_vmem_avail) },
- {NULL, NULL, -1}
-};
-
-static const struct node nodes[] = {
- { &null_properties, 1, 0 }, /* 0 = big brother of root */
- { propv_root, 0, 2 }, /* 1 "/" */
- { propv_iommu, 12, 3 }, /* 2 "/iommu" */
- { propv_sbus, 0, 4 }, /* 3 "/iommu/sbus" */
- { propv_sbus_tcx, 5, 0 }, /* 4 "/iommu/sbus/SUNW,tcx" */
- { propv_sbus_ledma, 7, 6 }, /* 5 "/iommu/sbus/ledma" */
- { propv_sbus_ledma_le, 0, 0 }, /* 6 "/iommu/sbus/ledma/le" */
- { propv_sbus_cs4231, 8, 0 }, /* 7 "/iommu/sbus/SUNW,CS4231 */
- { propv_sbus_bpp, 9, 0 }, /* 8 "/iommu/sbus/SUNW,bpp */
- { propv_sbus_espdma, 11, 10 }, /* 9 "/iommu/sbus/espdma" */
- { propv_sbus_espdma_esp, 0, 0 }, /* 10 "/iommu/sbus/espdma/esp" */
- { propv_sbus_apc, 0, 0 }, /* 11 "/iommu/sbus/power-management */
- { propv_cpu, 13, 0 }, /* 12 "/STP1012PGA" */
- { propv_obio, 23, 14 }, /* 13 "/obio" */
- { propv_obio_int, 15, 0 }, /* 14 "/obio/interrupt" */
- { propv_obio_cnt, 16, 0 }, /* 15 "/obio/counter" */
- { propv_obio_eep, 17, 0 }, /* 16 "/obio/eeprom" */
- { propv_obio_auxio, 18, 0 }, /* 17 "/obio/auxio" */
- { propv_obio_zs1, 19, 0 }, /* 18 "/obio/zs@0,100000"
- Must be before zs@0,0! */
- { propv_obio_zs, 20, 0 }, /* 19 "/obio/zs@0,0" */
- { propv_obio_fd, 21, 0 }, /* 20 "/obio/SUNW,fdtwo" */
- { propv_obio_pw, 22, 0 }, /* 21 "/obio/power" */
- { propv_obio_cf, 0, 0 }, /* 22 "/obio/slavioconfig@0,800000" */
- { propv_options, 24, 0 }, /* 23 "/options" */
- { propv_memory, 25, 0 }, /* 24 "/memory" */
- { propv_vmemory, 0, 0 }, /* 25 "/virtual-memory" */
-};
-#endif
-
static struct linux_mlist_v0 totphys[1];
static struct linux_mlist_v0 totmap[1];
static struct linux_mlist_v0 totavail[1];
@@ -469,83 +57,8 @@
{
}
-#ifdef PROLL_TREE
-static const struct property *find_property(int node,char *name)
-{
- const struct property *prop = &nodes[node].properties[0];
- while (prop && prop->name) {
- if (strcmp(prop->name, name) == 0)
- return prop;
- prop++;
- }
- return NULL;
-}
-
static int obp_nextnode(int node)
{
- DPRINTF("obp_nextnode(%d) = %d\n", node, nodes[node].sibling);
- return nodes[node].sibling;
-}
-
-static int obp_child(int node)
-{
- DPRINTF("obp_child(%d) = %d\n", node, nodes[node].child);
- return nodes[node].child;
-}
-
-static int obp_proplen(int node, char *name)
-{
- const struct property *prop = find_property(node,name);
- if (prop) {
- DPRINTF("obp_proplen(%d, %s) = %d\n", node, name, prop->length);
- return prop->length;
- }
- DPRINTF("obp_proplen(%d, %s) (no prop)\n", node, name);
- return -1;
-}
-
-static int obp_getprop(int node, char *name, char *value)
-{
- const struct property *prop;
-
- if (!name || *name == '\0') {
- // NULL name means get first property
- DPRINTF("obp_getprop(%d, (NULL)) = %s\n", node,
- nodes[node].properties[0].name);
- return (int)nodes[node].properties[0].name;
- }
- prop = find_property(node,name);
- if (prop) {
- memcpy(value,prop->value,prop->length);
- DPRINTF("obp_getprop(%d, %s) = %s\n", node, name, value);
- return prop->length;
- }
- DPRINTF("obp_getprop(%d, %s): not found\n", node, name);
- return -1;
-}
-
-static const char *obp_nextprop(int node,char *name)
-{
- const struct property *prop;
-
- if (!name || *name == '\0') {
- // NULL name means get first property
- DPRINTF("obp_nextprop(%d, NULL) = %s\n", node,
- nodes[node].properties[0].name);
- return nodes[node].properties[0].name;
- }
- prop = find_property(node,name);
- if (prop && prop[1].name) {
- DPRINTF("obp_nextprop(%d, %s) = %s\n", node, name, prop[1].name);
- return prop[1].name;
- }
- DPRINTF("obp_nextprop(%d, %s): not found\n", node, name);
- return "";
-}
-
-#else
-static int obp_nextnode(int node)
-{
int peer;
PUSH(node);
@@ -668,209 +181,7 @@
return str;
}
}
-#endif
-#ifdef STATIC_TREE
-static void
-get_props(struct ob_node *node)
-{
- struct ob_property *currprop;
- const char *name;
-
- name = obp_nextprop(node->id, NULL);
- if (!name || (int)name == -1) {
- node->prop = NULL;
- return;
- }
- node->prop = malloc(sizeof(*node->prop));
- currprop = node->prop;
- for (;;) {
- currprop->length = obp_proplen(node->id, (char *)name);
- currprop->name = malloc(strlen(name) + 1);
- strcpy(currprop->name, name);
- if (currprop->length > 0) {
- currprop->value = malloc(currprop->length);
- obp_getprop(node->id, currprop->name, currprop->value);
- }
-
- name = obp_nextprop(node->id, currprop->name);
- if (!name || *name == '\0') {
- currprop->next = NULL;
- return;
- } else {
- currprop->next = malloc(sizeof(*currprop->next));
- currprop = currprop->next;
- }
- }
-}
-
-static struct ob_node *
-get_node(struct ob_node *tree)
-{
- struct ob_node *chain = tree;
- int node;
-
- if (tree->id)
- get_props(tree);
-
- DPRINTF("visiting 0x%x\n", tree->id);
- node = obp_child(tree->id);
- if (node) {
- DPRINTF("visiting 0x%x's child 0x%x\n", tree->id, node);
- tree->child = malloc(sizeof(*tree->child));
- tree->child->id = node;
- chain->next = tree->child;
- chain = get_node(tree->child);
- } else {
- tree->child = NULL;
- }
- node = obp_nextnode(tree->id);
- if (node) {
- DPRINTF("visiting 0x%x's peer 0x%x\n", tree->id, node);
- tree->peer = malloc(sizeof(*tree->peer));
- tree->peer->id = node;
- chain->next = tree->peer;
- chain = get_node(tree->peer);
- } else {
- tree->peer = NULL;
- }
- return chain;
-}
-
-static struct ob_node *tree;
-
-static void
-get_tree(void)
-{
- tree = malloc(sizeof(*tree));
- tree->id = 0;
- (void)get_node(tree);
- DPRINTF("Static tree finished.\n");
-}
-
-static struct ob_node *find_node(int node)
-{
- struct ob_node *onode;
-
- for (onode = tree; onode != NULL && onode->id != node; onode = onode->next);
-
- return onode;
-}
-
-static struct ob_property *find_static_property(int node, char *name)
-{
- struct ob_node *onode = find_node(node);
- struct ob_property *prop = onode->prop;
-
- while (prop && prop->name) {
- if (strcmp(prop->name, name) == 0)
- return prop;
- prop = prop->next;
- }
-
- return NULL;
-}
-
-static int obp_static_nextnode(int node)
-{
- int nextnode = -1;
- struct ob_node *onode = find_node(node);
-
- if (onode && onode->peer)
- nextnode = onode->peer->id;
-
- DPRINTF("obp_static_nextnode(%d) = %d\n", node, nextnode);
-
- return nextnode;
-}
-
-static int obp_static_child(int node)
-{
- int child = -1;
- struct ob_node *onode = find_node(node);
-
- if (onode && onode->child)
- child = onode->child->id;
-
- DPRINTF("obp_static_child(%d) = %d\n", node, child);
-
- return child;
-}
-
-static int obp_static_proplen(int node, char *name)
-{
- struct ob_property *prop = find_static_property(node, name);
-
- if (prop) {
- DPRINTF("obp_static_proplen(%d, %s) = %d\n", node, name, prop->length);
-
- return prop->length;
- }
-
- DPRINTF("obp_static_proplen(%d, %s) (no prop)\n", node, name);
-
- return -1;
-}
-
-static int obp_static_getprop(int node, char *name, char *value)
-{
- struct ob_node *currnode;
- struct ob_property *prop;
-
- if (!name || *name == '\0') {
- // NULL name means get first property
- currnode = find_node(node);
- if (!currnode->prop) {
- DPRINTF("obp_static_getprop(%d, (NULL)): not found\n", node);
- return -1;
- }
- name = "NULL";
- prop = currnode->prop;
- } else {
- prop = find_static_property(node, name);
- }
- if (prop && prop->length > 0) {
- memcpy(value, prop->value, prop->length);
- DPRINTF("obp_static_getprop(%d, %s) = %s\n", node, name, value);
-
- return prop->length;
- }
-
- DPRINTF("obp_static_getprop(%d, %s): not found\n", node, name);
-
- return -1;
-}
-
-static const char *obp_static_nextprop(int node, char *name)
-{
- struct ob_property *prop;
- struct ob_node *currnode = find_node(node);
-
- if (!name || *name == '\0') {
- // NULL name means get first property
- if (!currnode->prop) {
- DPRINTF("obp_static_nextprop(%d, (NULL)): not found\n", node);
- return "";
- }
- prop = currnode->prop;
- } else {
- prop = find_static_property(node, name);
- prop = prop->next;
- }
- if (prop && prop->name) {
- DPRINTF("obp_static_nextprop(%d, %s) = %s\n", node, name, prop->name);
- return prop->name;
- }
- DPRINTF("obp_static_nextprop(%d, %s): not found\n", node, name);
- return "";
-}
-#define obp_nextnode obp_static_nextnode
-#define obp_child obp_static_child
-#define obp_proplen obp_static_proplen
-#define obp_getprop obp_static_getprop
-#define obp_nextprop obp_static_nextprop
-#endif
-
static int obp_setprop(__attribute__((unused)) int node,
__attribute__((unused)) char *name,
__attribute__((unused)) char *value,
@@ -953,7 +264,7 @@
{
int ret, hi, lo, bs;
- bs = 512; // XXX: real blocksize?
+ bs = 512;
hi = ((uint64_t)offset * bs) >> 32;
lo = ((uint64_t)offset * bs) & 0xffffffff;
@@ -1118,30 +429,15 @@
totavail[0].theres_more = NULL;
totavail[0].start_adr = (char *) 0;
- totavail[0].num_bytes = memsize;
+ totavail[0].num_bytes = va2pa((int)&_data) - PAGE_SIZE;
totmap[0].theres_more = NULL;
totmap[0].start_adr = &_start;
- totmap[0].num_bytes = (unsigned long) &_iomem - (unsigned long) &_start;
+ totmap[0].num_bytes = (unsigned long) &_iomem - (unsigned long) &_start + PAGE_SIZE;
-#ifdef PROLL_TREE
- prop_mem_reg[0] = 0;
- prop_mem_reg[1] = 0;
- prop_mem_reg[2] = memsize;
- prop_mem_avail[0] = 0;
- prop_mem_avail[1] = 0;
- prop_mem_avail[2] = va2pa((int)&_data) - 1;
- prop_vmem_avail[0] = 0;
- prop_vmem_avail[1] = 0;
- prop_vmem_avail[2] = (int)&_start - 1;
- prop_vmem_avail[3] = 0;
- prop_vmem_avail[4] = 0xffe00000;
- prop_vmem_avail[5] = 0x00200000;
-#endif
-
// Linux wants a R/W romvec table
romvec0.pv_magic_cookie = LINUX_OPPROM_MAGIC;
- romvec0.pv_romvers = 0;
+ romvec0.pv_romvers = 3;
romvec0.pv_plugin_revision = 77;
romvec0.pv_printrev = 0x10203;
romvec0.pv_v0mem.v0_totphys = &ptphys;
@@ -1219,8 +515,5 @@
romvec0.v3_cpuidle = obp_cpuidle;
romvec0.v3_cpuresume = obp_cpuresume;
-#ifdef STATIC_TREE
- get_tree();
-#endif
return &romvec0;
}
Modified: openbios-devel/drivers/esp.c
===================================================================
--- openbios-devel/drivers/esp.c 2006-05-26 11:14:20 UTC (rev 34)
+++ openbios-devel/drivers/esp.c 2006-05-28 18:48:47 UTC (rev 35)
@@ -197,8 +197,7 @@
esp->buffer[0] = 0x80;
esp->buffer[1] = INQUIRY;
- esp->buffer[4] = BUFSIZE & 0xff;
- esp->buffer[5] = (BUFSIZE >> 8) & 0xff;
+ esp->buffer[5] = 36;
if (do_command(esp, sd, 7, 36)) {
sd->present = 0;
Modified: openbios-devel/drivers/iommu.c
===================================================================
--- openbios-devel/drivers/iommu.c 2006-05-26 11:14:20 UTC (rev 34)
+++ openbios-devel/drivers/iommu.c 2006-05-28 18:48:47 UTC (rev 35)
@@ -224,7 +224,7 @@
PUSH(0);
fword("encode-int");
fword("encode+");
- PUSH(va2pa((unsigned long)&_data) - 1);
+ PUSH(va2pa((unsigned long)&_data) - PAGE_SIZE);
fword("encode-int");
fword("encode+");
push_str("available");
@@ -249,7 +249,7 @@
PUSH(0);
fword("encode-int");
fword("encode+");
- PUSH(va2pa((unsigned long)&_start) - 1);
+ PUSH((unsigned long)&_start - PAGE_SIZE);
fword("encode-int");
fword("encode+");
Modified: openbios-devel/drivers/obio.c
===================================================================
--- openbios-devel/drivers/obio.c 2006-05-26 11:14:20 UTC (rev 34)
+++ openbios-devel/drivers/obio.c 2006-05-28 18:48:47 UTC (rev 35)
@@ -389,10 +389,11 @@
ob_set_obio_ranges(slavio_base);
#endif
+ // Must be before zs@0,0 or Linux won't boot
+ ob_zs_init(slavio_base, SLAVIO_ZS1, ZS_INTR, 0, 0);
+
ob_zs_init(slavio_base, SLAVIO_ZS, ZS_INTR, 1, 1);
- ob_zs_init(slavio_base, SLAVIO_ZS1, ZS_INTR, 0, 0);
-
ob_nvram_init(slavio_base, SLAVIO_NVRAM);
ob_fd_init(slavio_base, SLAVIO_FD, FD_INTR);
1
0
I finally remembered one trick I did in Proll, zs@0,0 must be after the
other zs node. This helped OpenBIOS also, now we get command prompt in Qemu
sparc-test using unbuffered Forth tree.
We can also bump the Prom version to 3, which was not possible before due to
mixed trees (inst2pkg didn't work with Proll ids).
Available memory length was not correct, and that caused memory corruption
problems.
Trying to boot from :d partition helps NetBSD booting.
The ESP fix is related to new SCSI handling code in Qemu CVS.
In my CD booting tests OpenBIOS matches Proll performance now, except Aurora
1.0 doesn't recognise the CDROM. The missing features remaining are
graphical console, SMP support (easy, but didn't work in Proll either) and
TFTP net booting (not very useful).
_________________________________________________________________
Don't just search. Find. Check out the new MSN Search!
http://search.msn.com/
1
0
Author: stepan
Date: 2006-05-26 13:14:20 +0200 (Fri, 26 May 2006)
New Revision: 34
Modified:
openbios-devel/arch/unix/unix.c
openbios-devel/forth/admin/devices.fs
openbios-devel/kernel/bootstrap.c
Log:
- update dates
- fix address output of ls
Modified: openbios-devel/arch/unix/unix.c
===================================================================
--- openbios-devel/arch/unix/unix.c 2006-05-26 10:37:37 UTC (rev 33)
+++ openbios-devel/arch/unix/unix.c 2006-05-26 11:14:20 UTC (rev 34)
@@ -350,7 +350,7 @@
* main loop
*/
-#define BANNER "OpenBIOS core. (C) 2003-2005 Patrick Mauritz, Stefan Reinauer\n"\
+#define BANNER "OpenBIOS core. (C) 2003-2006 Patrick Mauritz, Stefan Reinauer\n"\
"This software comes with absolutely no warranty. "\
"All rights reserved.\n\n"
Modified: openbios-devel/forth/admin/devices.fs
===================================================================
--- openbios-devel/forth/admin/devices.fs 2006-05-26 10:37:37 UTC (rev 33)
+++ openbios-devel/forth/admin/devices.fs 2006-05-26 11:14:20 UTC (rev 34)
@@ -2,7 +2,8 @@
\
\ this code implements IEEE 1275-1994
\
-\ Copyright (C) 2003 Samuel Rydh, Stefan Reinauer
+\ Copyright (C) 2003 Samuel Rydh
+\ Copyright (C) 2003-2006 Stefan Reinauer
\
\ See the file "COPYING" for further information about
\ the copyright and warranty status of this work.
@@ -204,7 +205,7 @@
cr
?active-package >dn.child @
begin dup while
- dup . dup pnodename type cr
+ dup u. dup pnodename type cr
>dn.peer @
repeat
drop
Modified: openbios-devel/kernel/bootstrap.c
===================================================================
--- openbios-devel/kernel/bootstrap.c 2006-05-26 10:37:37 UTC (rev 33)
+++ openbios-devel/kernel/bootstrap.c 2006-05-26 11:14:20 UTC (rev 34)
@@ -1,6 +1,6 @@
/* tag: forth bootstrap environment
*
- * Copyright (C) 2003-2005 Stefan Reinauer, Patrick Mauritz
+ * Copyright (C) 2003-2006 Stefan Reinauer, Patrick Mauritz
*
* See the file "COPYING" for further information about
* the copyright and warranty status of this work.
@@ -920,7 +920,7 @@
* main loop
*/
-#define BANNER "OpenBIOS bootstrap kernel. (C) 2003-2005 Patrick Mauritz, Stefan Reinauer\n"\
+#define BANNER "OpenBIOS bootstrap kernel. (C) 2003-2006 Patrick Mauritz, Stefan Reinauer\n"\
"This software comes with absolutely no warranty. "\
"All rights reserved.\n\n"
1
0
Author: stepan
Date: 2006-05-26 12:37:37 +0200 (Fri, 26 May 2006)
New Revision: 33
Modified:
openbios-devel/arch/sparc32/romvec.c
Log:
make sparc32 boot linux. This should be stripped down again
Modified: openbios-devel/arch/sparc32/romvec.c
===================================================================
--- openbios-devel/arch/sparc32/romvec.c 2006-05-25 21:02:53 UTC (rev 32)
+++ openbios-devel/arch/sparc32/romvec.c 2006-05-26 10:37:37 UTC (rev 33)
@@ -26,6 +26,418 @@
#define PAGE_SIZE 4096
+struct ob_property {
+ struct ob_property *next;
+ char *name;
+ char *value;
+ int length;
+};
+
+struct ob_node {
+ struct ob_node *next;
+ struct ob_node *peer;
+ struct ob_node *child;
+ struct ob_property *prop;
+ int id;
+};
+
+// Workarounds:
+
+// Proll device tree happens to work, why?
+#define PROLL_TREE
+
+// Build a static device tree to avoid Forth access from deep kernel
+//#define STATIC_TREE
+
+#ifdef PROLL_TREE
+struct property {
+ const char *name;
+ const char *value;
+ int length;
+};
+
+struct node {
+ const struct property *properties;
+ /* short */ const int sibling;
+ /* short */ const int child;
+};
+
+static const unsigned char obp_idprom[32] = { 1, 0x80, 0x52, 0x54, 0x00, 0x12, 0x34, 0x56,
+ 0,0,0,0, 0,0,0, 0xf7 };
+static const struct property null_properties = { NULL, NULL, -1 };
+static const int prop_true = -1;
+
+static const struct property propv_root[] = {
+ {"name", "SUNW,SparcStation-5", sizeof("SUNW,SparcStation-5") },
+ {"idprom", (char *)obp_idprom, 32},
+ {"banner-name", "SparcStation", sizeof("SparcStation")},
+ {"compatible", "sun4m", 6},
+ {NULL, NULL, -1}
+};
+
+static const int prop_iommu_reg[] = {
+ 0x0, 0x10000000, 0x00000300,
+};
+static const struct property propv_iommu[] = {
+ {"name", "iommu", sizeof("iommu")},
+ {"reg", (char*)&prop_iommu_reg[0], sizeof(prop_iommu_reg) },
+ {NULL, NULL, -1}
+};
+
+static const int prop_sbus_ranges[] = {
+ 0x0, 0x0, 0x0, 0x30000000, 0x10000000,
+ 0x1, 0x0, 0x0, 0x40000000, 0x10000000,
+ 0x2, 0x0, 0x0, 0x50000000, 0x10000000,
+ 0x3, 0x0, 0x0, 0x60000000, 0x10000000,
+ 0x4, 0x0, 0x0, 0x70000000, 0x10000000,
+};
+static const struct property propv_sbus[] = {
+ {"name", "sbus", 5},
+ {"ranges", (char*)&prop_sbus_ranges[0], sizeof(prop_sbus_ranges)},
+ {"device_type", "hierarchical", sizeof("hierarchical") },
+ {NULL, NULL, -1}
+};
+
+static const int prop_tcx_regs[] = {
+ 0x2, 0x00800000, 0x00100000,
+ 0x2, 0x02000000, 0x00000001,
+ 0x2, 0x04000000, 0x00800000,
+ 0x2, 0x06000000, 0x00800000,
+ 0x2, 0x0a000000, 0x00000001,
+ 0x2, 0x0c000000, 0x00000001,
+ 0x2, 0x0e000000, 0x00000001,
+ 0x2, 0x00700000, 0x00001000,
+ 0x2, 0x00200000, 0x00000004,
+ 0x2, 0x00300000, 0x0000081c,
+ 0x2, 0x00000000, 0x00010000,
+ 0x2, 0x00240000, 0x00000004,
+ 0x2, 0x00280000, 0x00000001,
+};
+
+#if 1 /* Zaitcev */
+static const int pixfreq = 0x03dfd240;
+static const int hbporch = 0xa0;
+static const int vfreq = 0x3c;
+#endif
+#if 0 /* Kevin Boone - 70Hz refresh */
+static const int pixfreq = 0x047868C0;
+static const int hbporch = 0x90;
+static const int vfreq = 0x46;
+#endif
+
+static const int vbporch = 0x1d;
+static const int vsync = 0x6;
+static const int hsync = 0x88;
+static const int vfporch = 0x3;
+static const int hfporch = 0x18;
+static const int height = 0x300;
+static const int width = 0x400;
+static const int linebytes = 0x400;
+static const int depth = 24;
+static const int tcx_intr[] = { 5, 0 };
+static const int tcx_interrupts = 5;
+static const struct property propv_sbus_tcx[] = {
+ {"name", "SUNW,tcx", sizeof("SUNW,tcx")},
+ {"vbporch", (char*)&vbporch, sizeof(int)},
+ {"hbporch", (char*)&hbporch, sizeof(int)},
+ {"vsync", (char*)&vsync, sizeof(int)},
+ {"hsync", (char*)&hsync, sizeof(int)},
+ {"vfporch", (char*)&vfporch, sizeof(int)},
+ {"hfporch", (char*)&hfporch, sizeof(int)},
+ {"pixfreq", (char*)&pixfreq, sizeof(int)},
+ {"vfreq", (char*)&vfreq, sizeof(int)},
+ {"height", (char*)&height, sizeof(int)},
+ {"width", (char*)&width, sizeof(int)},
+ {"linebytes", (char*)&linebytes, sizeof(int)},
+ {"depth", (char*)&depth, sizeof(int)},
+ {"reg", (char*)&prop_tcx_regs[0], sizeof(prop_tcx_regs)},
+ {"tcx-8-bit", 0, -1},
+ {"intr", (char*)&tcx_intr[0], sizeof(tcx_intr)},
+ {"interrupts", (char*)&tcx_interrupts, sizeof(tcx_interrupts)},
+ {"device_type", "display", sizeof("display")},
+ {NULL, NULL, -1}
+};
+
+static const int prop_cs4231_reg[] = {
+ 0x3, 0x0C000000, 0x00000040
+};
+static const int cs4231_interrupts = 5;
+static const int cs4231_intr[] = { 5, 0 };
+
+static const struct property propv_sbus_cs4231[] = {
+ {"name", "SUNW,CS4231", sizeof("SUNW,CS4231") },
+ {"intr", (char*)&cs4231_intr[0], sizeof(cs4231_intr) },
+ {"interrupts", (char*)&cs4231_interrupts, sizeof(cs4231_interrupts) },
+ {"reg", (char*)&prop_cs4231_reg[0], sizeof(prop_cs4231_reg) },
+ {"device_type", "serial", sizeof("serial") },
+ {"alias", "audio", sizeof("audio") },
+ {NULL, NULL, -1}
+};
+
+static const int cpu_nctx = 256;
+static const int cpu_cache_line_size = 0x20;
+static const int cpu_cache_nlines = 0x200;
+static const struct property propv_cpu[] = {
+ {"name", "STP1012PGA", sizeof("STP1012PGA") },
+ {"device_type", "cpu", 4 },
+ {"mmu-nctx", (char*)&cpu_nctx, sizeof(int)},
+ {"cache-line-size", (char*)&cpu_cache_line_size, sizeof(int)},
+ {"cache-nlines", (char*)&cpu_cache_nlines, sizeof(int)},
+ {NULL, NULL, -1}
+};
+
+static const int prop_obio_ranges[] = {
+ 0x0, 0x0, 0x0, 0x71000000, 0x01000000,
+};
+static const struct property propv_obio[] = {
+ {"name", "obio", 5 },
+ {"ranges", (char*)&prop_obio_ranges[0], sizeof(prop_obio_ranges) },
+ {"device_type", "hierarchical", sizeof("hierarchical") },
+ {NULL, NULL, -1}
+};
+
+static const int prop_auxio_reg[] = {
+ 0x0, 0x00900000, 0x00000001,
+};
+static const struct property propv_obio_auxio[] = {
+ {"name", "auxio", sizeof("auxio") },
+ {"reg", (char*)&prop_auxio_reg[0], sizeof(prop_auxio_reg) },
+ {NULL, NULL, -1}
+};
+
+static const int prop_int_reg[] = {
+ 0x0, 0x00e00000, 0x00000010,
+ 0x0, 0x00e10000, 0x00000010,
+};
+static const struct property propv_obio_int[] = {
+ {"name", "interrupt", sizeof("interrupt")},
+ {"reg", (char*)&prop_int_reg[0], sizeof(prop_int_reg) },
+ {NULL, NULL, -1}
+};
+
+static const int prop_cnt_reg[] = {
+ 0x0, 0x00d00000, 0x00000010,
+ 0x0, 0x00d10000, 0x00000010,
+};
+static const struct property propv_obio_cnt[] = {
+ {"name", "counter", sizeof("counter")},
+ {"reg", (char*)&prop_cnt_reg[0], sizeof(prop_cnt_reg) },
+ {NULL, NULL, -1}
+};
+
+static const int prop_eeprom_reg[] = {
+ 0x0, 0x00200000, 0x00002000,
+};
+static const struct property propv_obio_eep[] = {
+ {"name", "eeprom", sizeof("eeprom")},
+ {"reg", (char*)&prop_eeprom_reg[0], sizeof(prop_eeprom_reg) },
+ {"model", "mk48t08", sizeof("mk48t08")},
+ {NULL, NULL, -1}
+};
+
+static const int prop_su_reg[] = {
+ 0x0, 0x003002f8, 0x00000008,
+};
+static const struct property propv_obio_su[] = {
+ {"name", "su", sizeof("su")},
+ {"reg", (char*)&prop_su_reg[0], sizeof(prop_su_reg) },
+ {NULL, NULL, -1}
+};
+
+static const int prop_zs_intr[] = { 0x2c, 0x0 };
+static const int prop_zs_reg[] = {
+ 0x0, 0x00000000, 0x00000008,
+};
+static void *prop_zs_addr;
+static const int prop_zs_slave = 1;
+static const struct property propv_obio_zs[] = {
+ {"name", "zs", sizeof("zs")},
+ {"reg", (char*)&prop_zs_reg[0], sizeof(prop_zs_reg) },
+ {"slave", (char*)&prop_zs_slave, sizeof(prop_zs_slave) },
+ {"device_type", "serial", sizeof("serial") },
+ {"intr", (char*)&prop_zs_intr[0], sizeof(prop_zs_intr) },
+ {"address", (char*)&prop_zs_addr, sizeof(prop_zs_addr) },
+ {"keyboard", (char*)&prop_true, 0},
+ {"mouse", (char*)&prop_true, 0},
+ {NULL, NULL, -1}
+};
+
+static const int prop_zs1_intr[] = { 0x2c, 0x0 };
+static const int prop_zs1_reg[] = {
+ 0x0, 0x00100000, 0x00000008,
+};
+static void *prop_zs1_addr;
+static const int prop_zs1_slave = 0;
+static const struct property propv_obio_zs1[] = {
+ {"name", "zs", sizeof("zs")},
+ {"reg", (char*)&prop_zs1_reg[0], sizeof(prop_zs1_reg) },
+ {"slave", (char*)&prop_zs1_slave, sizeof(prop_zs1_slave) },
+ {"device_type", "serial", sizeof("serial") },
+ {"intr", (char*)&prop_zs1_intr[0], sizeof(prop_zs1_intr) },
+ {"address", (char*)&prop_zs1_addr, sizeof(prop_zs1_addr) },
+ {NULL, NULL, -1}
+};
+
+static const int prop_ledma_reg[] = {
+ 0x4, 0x08400010, 0x00000020,
+};
+static const int prop_ledma_burst = 0x3f;
+static const struct property propv_sbus_ledma[] = {
+ {"name", "ledma", sizeof("ledma")},
+ {"reg", (char*)&prop_ledma_reg[0], sizeof(prop_ledma_reg) },
+ {"burst-sizes", (char*)&prop_ledma_burst, sizeof(int) },
+ {NULL, NULL, -1}
+};
+
+static const int prop_le_reg[] = {
+ 0x4, 0x08c00000, 0x00000004,
+};
+static const int prop_le_busmaster_regval = 0x7;
+static const int prop_le_intr[] = { 0x26, 0x0 };
+static const struct property propv_sbus_ledma_le[] = {
+ {"name", "le", sizeof("le")},
+ {"reg", (char*)&prop_le_reg[0], sizeof(prop_le_reg) },
+ {"busmaster-regval", (char*)&prop_le_busmaster_regval, sizeof(int)},
+ {"intr", (char*)&prop_le_intr[0], sizeof(prop_le_intr) },
+ {NULL, NULL, -1}
+};
+
+static const int prop_espdma_reg[] = {
+ 0x4, 0x08400000, 0x00000010,
+};
+
+static const struct property propv_sbus_espdma[] = {
+ {"name", "espdma", sizeof("espdma")},
+ {"reg", (char*)&prop_espdma_reg[0], sizeof(prop_espdma_reg) },
+ {NULL, NULL, -1}
+};
+
+static const int prop_esp_reg[] = {
+ 0x4, 0x08800000, 0x00000040,
+};
+static const int prop_esp_intr[] = { 0x24, 0x0 };
+static const struct property propv_sbus_espdma_esp[] = {
+ {"name", "esp", sizeof("esp")},
+ {"reg", (char*)&prop_esp_reg[0], sizeof(prop_esp_reg) },
+ {"intr", (char*)&prop_esp_intr[0], sizeof(prop_esp_intr) },
+ {NULL, NULL, -1}
+};
+
+static const int prop_bpp_reg[] = {
+ 0x4, 0x0c800000, 0x0000001c,
+};
+static const int prop_bpp_intr[] = { 0x33, 0x0 };
+static const struct property propv_sbus_bpp[] = {
+ {"name", "SUNW,bpp", sizeof("SUNW,bpp")},
+ {"reg", (char*)&prop_bpp_reg[0], sizeof(prop_bpp_reg) },
+ {"intr", (char*)&prop_bpp_intr[0], sizeof(prop_bpp_intr) },
+ {NULL, NULL, -1}
+};
+
+static const int prop_apc_reg[] = {
+ 0x4, 0x0a000000, 0x00000010,
+};
+static const struct property propv_sbus_apc[] = {
+ {"name", "xxxpower-management", sizeof("xxxpower-management")},
+ {"reg", (char*)&prop_apc_reg[0], sizeof(prop_apc_reg) },
+ {NULL, NULL, -1}
+};
+
+static const int prop_fd_intr[] = { 0x2b, 0x0 };
+static const int prop_fd_reg[] = {
+ 0x0, 0x00400000, 0x0000000f,
+};
+static const struct property propv_obio_fd[] = {
+ {"name", "SUNW,fdtwo", sizeof("SUNW,fdtwo")},
+ {"reg", (char*)&prop_fd_reg[0], sizeof(prop_fd_reg) },
+ {"device_type", "block", sizeof("block") },
+ {"intr", (char*)&prop_fd_intr[0], sizeof(prop_fd_intr) },
+ {NULL, NULL, -1}
+};
+
+static const int prop_pw_intr[] = { 0x22, 0x0 };
+static const int prop_pw_reg[] = {
+ 0x0, 0x00910000, 0x00000001,
+};
+static const struct property propv_obio_pw[] = {
+ {"name", "power", sizeof("power")},
+ {"reg", (char*)&prop_pw_reg[0], sizeof(prop_pw_reg) },
+ {"intr", (char*)&prop_pw_intr[0], sizeof(prop_pw_intr) },
+ {NULL, NULL, -1}
+};
+
+static const int prop_cf_reg[] = {
+ 0x0, 0x00800000, 0x00000001,
+};
+static const struct property propv_obio_cf[] = {
+ {"name", "slavioconfig", sizeof("slavioconfig")},
+ {"reg", (char*)&prop_cf_reg[0], sizeof(prop_cf_reg) },
+ {NULL, NULL, -1}
+};
+
+static const struct property propv_options[] = {
+ {"name", "options", sizeof("options")},
+ {"screen-#columns", "80", sizeof("80")},
+ {"screen-#rows", "25", sizeof("25")},
+ {"tpe-link-test?", (char *)&prop_true, 0},
+ {"ttya-mode", "9600,8,n,1,-", sizeof("9600,8,n,1,-")},
+ {"ttya-ignore-cd", (char *)&prop_true, 0},
+ {"ttya-rts-dtr-off", 0, -1},
+ {"ttyb-mode", "9600,8,n,1,-", sizeof("9600,8,n,1,-")},
+ {"ttyb-ignore-cd", (char *)&prop_true, 0},
+ {"ttyb-rts-dtr-off", 0, -1},
+ {NULL, NULL, -1}
+};
+
+static int prop_mem_reg[3];
+static int prop_mem_avail[3];
+
+static const struct property propv_memory[] = {
+ {"name", "memory", sizeof("memory")},
+ {"reg", (char*)&prop_mem_reg[0], sizeof(prop_mem_reg) },
+ {"available", (char*)&prop_mem_avail[0], sizeof(prop_mem_avail) },
+ {NULL, NULL, -1}
+};
+
+static int prop_vmem_avail[6];
+
+static const struct property propv_vmemory[] = {
+ {"name", "virtual-memory", sizeof("virtual-memory")},
+ {"available", (char*)&prop_vmem_avail[0], sizeof(prop_vmem_avail) },
+ {NULL, NULL, -1}
+};
+
+static const struct node nodes[] = {
+ { &null_properties, 1, 0 }, /* 0 = big brother of root */
+ { propv_root, 0, 2 }, /* 1 "/" */
+ { propv_iommu, 12, 3 }, /* 2 "/iommu" */
+ { propv_sbus, 0, 4 }, /* 3 "/iommu/sbus" */
+ { propv_sbus_tcx, 5, 0 }, /* 4 "/iommu/sbus/SUNW,tcx" */
+ { propv_sbus_ledma, 7, 6 }, /* 5 "/iommu/sbus/ledma" */
+ { propv_sbus_ledma_le, 0, 0 }, /* 6 "/iommu/sbus/ledma/le" */
+ { propv_sbus_cs4231, 8, 0 }, /* 7 "/iommu/sbus/SUNW,CS4231 */
+ { propv_sbus_bpp, 9, 0 }, /* 8 "/iommu/sbus/SUNW,bpp */
+ { propv_sbus_espdma, 11, 10 }, /* 9 "/iommu/sbus/espdma" */
+ { propv_sbus_espdma_esp, 0, 0 }, /* 10 "/iommu/sbus/espdma/esp" */
+ { propv_sbus_apc, 0, 0 }, /* 11 "/iommu/sbus/power-management */
+ { propv_cpu, 13, 0 }, /* 12 "/STP1012PGA" */
+ { propv_obio, 23, 14 }, /* 13 "/obio" */
+ { propv_obio_int, 15, 0 }, /* 14 "/obio/interrupt" */
+ { propv_obio_cnt, 16, 0 }, /* 15 "/obio/counter" */
+ { propv_obio_eep, 17, 0 }, /* 16 "/obio/eeprom" */
+ { propv_obio_auxio, 18, 0 }, /* 17 "/obio/auxio" */
+ { propv_obio_zs1, 19, 0 }, /* 18 "/obio/zs@0,100000"
+ Must be before zs@0,0! */
+ { propv_obio_zs, 20, 0 }, /* 19 "/obio/zs@0,0" */
+ { propv_obio_fd, 21, 0 }, /* 20 "/obio/SUNW,fdtwo" */
+ { propv_obio_pw, 22, 0 }, /* 21 "/obio/power" */
+ { propv_obio_cf, 0, 0 }, /* 22 "/obio/slavioconfig@0,800000" */
+ { propv_options, 24, 0 }, /* 23 "/options" */
+ { propv_memory, 25, 0 }, /* 24 "/memory" */
+ { propv_vmemory, 0, 0 }, /* 25 "/virtual-memory" */
+};
+#endif
+
static struct linux_mlist_v0 totphys[1];
static struct linux_mlist_v0 totmap[1];
static struct linux_mlist_v0 totavail[1];
@@ -45,16 +457,6 @@
static int obp_devread(int dev_desc, char *buf, int nbytes);
static int obp_devseek(int dev_desc, int hi, int lo);
-static const struct linux_nodeops nodeops0 = {
- obp_nextnode, /* int (*no_nextnode)(int node); */
- obp_child, /* int (*no_child)(int node); */
- obp_proplen, /* int (*no_proplen)(int node, char *name); */
- obp_getprop, /* int (*no_getprop)(int node,char *name,char *val); */
- obp_setprop, /* int (*no_setprop)(int node, char *name,
- char *val, int len); */
- obp_nextprop /* char * (*no_nextprop)(int node, char *name); */
-};
-
static struct linux_arguments_v0 obp_arg;
static const struct linux_arguments_v0 * const obp_argp = &obp_arg;
@@ -67,8 +469,83 @@
{
}
+#ifdef PROLL_TREE
+static const struct property *find_property(int node,char *name)
+{
+ const struct property *prop = &nodes[node].properties[0];
+ while (prop && prop->name) {
+ if (strcmp(prop->name, name) == 0)
+ return prop;
+ prop++;
+ }
+ return NULL;
+}
+
static int obp_nextnode(int node)
{
+ DPRINTF("obp_nextnode(%d) = %d\n", node, nodes[node].sibling);
+ return nodes[node].sibling;
+}
+
+static int obp_child(int node)
+{
+ DPRINTF("obp_child(%d) = %d\n", node, nodes[node].child);
+ return nodes[node].child;
+}
+
+static int obp_proplen(int node, char *name)
+{
+ const struct property *prop = find_property(node,name);
+ if (prop) {
+ DPRINTF("obp_proplen(%d, %s) = %d\n", node, name, prop->length);
+ return prop->length;
+ }
+ DPRINTF("obp_proplen(%d, %s) (no prop)\n", node, name);
+ return -1;
+}
+
+static int obp_getprop(int node, char *name, char *value)
+{
+ const struct property *prop;
+
+ if (!name || *name == '\0') {
+ // NULL name means get first property
+ DPRINTF("obp_getprop(%d, (NULL)) = %s\n", node,
+ nodes[node].properties[0].name);
+ return (int)nodes[node].properties[0].name;
+ }
+ prop = find_property(node,name);
+ if (prop) {
+ memcpy(value,prop->value,prop->length);
+ DPRINTF("obp_getprop(%d, %s) = %s\n", node, name, value);
+ return prop->length;
+ }
+ DPRINTF("obp_getprop(%d, %s): not found\n", node, name);
+ return -1;
+}
+
+static const char *obp_nextprop(int node,char *name)
+{
+ const struct property *prop;
+
+ if (!name || *name == '\0') {
+ // NULL name means get first property
+ DPRINTF("obp_nextprop(%d, NULL) = %s\n", node,
+ nodes[node].properties[0].name);
+ return nodes[node].properties[0].name;
+ }
+ prop = find_property(node,name);
+ if (prop && prop[1].name) {
+ DPRINTF("obp_nextprop(%d, %s) = %s\n", node, name, prop[1].name);
+ return prop[1].name;
+ }
+ DPRINTF("obp_nextprop(%d, %s): not found\n", node, name);
+ return "";
+}
+
+#else
+static int obp_nextnode(int node)
+{
int peer;
PUSH(node);
@@ -117,16 +594,26 @@
static int obp_getprop(int node, char *name, char *value)
{
- int notfound;
+ int notfound, found;
+ int len;
+ char *str;
if (!name) {
// NULL name means get first property
- name = "NULL";
push_str("");
PUSH(node);
fword("next-property");
- notfound = POP();
- notfound = !notfound; // Different return value
+ found = POP();
+ if (found) {
+ len = POP();
+ str = (char *) POP();
+ DPRINTF("obp_getprop(0x%x, NULL) = %s\n", node, str);
+
+ return (int)str;
+ }
+ DPRINTF("obp_getprop(0x%x, NULL) (not found)\n", node);
+
+ return -1;
} else {
push_str(name);
PUSH(node);
@@ -138,12 +625,12 @@
return -1;
} else {
- int len;
- char *str;
-
len = POP();
str = (char *) POP();
- memcpy(value, str, len);
+ if (len > 0)
+ memcpy(value, str, len);
+ else
+ str = "NULL";
DPRINTF("obp_getprop(0x%x, %s) = %s\n", node, name, str);
@@ -151,16 +638,6 @@
}
}
-static int obp_setprop(__attribute__((unused)) int node,
- __attribute__((unused)) char *name,
- __attribute__((unused)) char *value,
- __attribute__((unused)) int len)
-{
- DPRINTF("obp_setprop(0x%x, %s) = %s (%d)\n", node, name, value, len);
-
- return -1;
-}
-
static const char *obp_nextprop(int node, char *name)
{
int found;
@@ -177,8 +654,6 @@
found = POP();
if (!found) {
DPRINTF("obp_nextprop(0x%x, %s) (not found)\n", node, name);
- (void) POP();
- (void) POP();
return "";
} else {
@@ -193,7 +668,229 @@
return str;
}
}
+#endif
+#ifdef STATIC_TREE
+static void
+get_props(struct ob_node *node)
+{
+ struct ob_property *currprop;
+ const char *name;
+
+ name = obp_nextprop(node->id, NULL);
+ if (!name || (int)name == -1) {
+ node->prop = NULL;
+ return;
+ }
+ node->prop = malloc(sizeof(*node->prop));
+ currprop = node->prop;
+ for (;;) {
+ currprop->length = obp_proplen(node->id, (char *)name);
+ currprop->name = malloc(strlen(name) + 1);
+ strcpy(currprop->name, name);
+ if (currprop->length > 0) {
+ currprop->value = malloc(currprop->length);
+ obp_getprop(node->id, currprop->name, currprop->value);
+ }
+
+ name = obp_nextprop(node->id, currprop->name);
+ if (!name || *name == '\0') {
+ currprop->next = NULL;
+ return;
+ } else {
+ currprop->next = malloc(sizeof(*currprop->next));
+ currprop = currprop->next;
+ }
+ }
+}
+
+static struct ob_node *
+get_node(struct ob_node *tree)
+{
+ struct ob_node *chain = tree;
+ int node;
+
+ if (tree->id)
+ get_props(tree);
+
+ DPRINTF("visiting 0x%x\n", tree->id);
+ node = obp_child(tree->id);
+ if (node) {
+ DPRINTF("visiting 0x%x's child 0x%x\n", tree->id, node);
+ tree->child = malloc(sizeof(*tree->child));
+ tree->child->id = node;
+ chain->next = tree->child;
+ chain = get_node(tree->child);
+ } else {
+ tree->child = NULL;
+ }
+ node = obp_nextnode(tree->id);
+ if (node) {
+ DPRINTF("visiting 0x%x's peer 0x%x\n", tree->id, node);
+ tree->peer = malloc(sizeof(*tree->peer));
+ tree->peer->id = node;
+ chain->next = tree->peer;
+ chain = get_node(tree->peer);
+ } else {
+ tree->peer = NULL;
+ }
+ return chain;
+}
+
+static struct ob_node *tree;
+
+static void
+get_tree(void)
+{
+ tree = malloc(sizeof(*tree));
+ tree->id = 0;
+ (void)get_node(tree);
+ DPRINTF("Static tree finished.\n");
+}
+
+static struct ob_node *find_node(int node)
+{
+ struct ob_node *onode;
+
+ for (onode = tree; onode != NULL && onode->id != node; onode = onode->next);
+
+ return onode;
+}
+
+static struct ob_property *find_static_property(int node, char *name)
+{
+ struct ob_node *onode = find_node(node);
+ struct ob_property *prop = onode->prop;
+
+ while (prop && prop->name) {
+ if (strcmp(prop->name, name) == 0)
+ return prop;
+ prop = prop->next;
+ }
+
+ return NULL;
+}
+
+static int obp_static_nextnode(int node)
+{
+ int nextnode = -1;
+ struct ob_node *onode = find_node(node);
+
+ if (onode && onode->peer)
+ nextnode = onode->peer->id;
+
+ DPRINTF("obp_static_nextnode(%d) = %d\n", node, nextnode);
+
+ return nextnode;
+}
+
+static int obp_static_child(int node)
+{
+ int child = -1;
+ struct ob_node *onode = find_node(node);
+
+ if (onode && onode->child)
+ child = onode->child->id;
+
+ DPRINTF("obp_static_child(%d) = %d\n", node, child);
+
+ return child;
+}
+
+static int obp_static_proplen(int node, char *name)
+{
+ struct ob_property *prop = find_static_property(node, name);
+
+ if (prop) {
+ DPRINTF("obp_static_proplen(%d, %s) = %d\n", node, name, prop->length);
+
+ return prop->length;
+ }
+
+ DPRINTF("obp_static_proplen(%d, %s) (no prop)\n", node, name);
+
+ return -1;
+}
+
+static int obp_static_getprop(int node, char *name, char *value)
+{
+ struct ob_node *currnode;
+ struct ob_property *prop;
+
+ if (!name || *name == '\0') {
+ // NULL name means get first property
+ currnode = find_node(node);
+ if (!currnode->prop) {
+ DPRINTF("obp_static_getprop(%d, (NULL)): not found\n", node);
+ return -1;
+ }
+ name = "NULL";
+ prop = currnode->prop;
+ } else {
+ prop = find_static_property(node, name);
+ }
+ if (prop && prop->length > 0) {
+ memcpy(value, prop->value, prop->length);
+ DPRINTF("obp_static_getprop(%d, %s) = %s\n", node, name, value);
+
+ return prop->length;
+ }
+
+ DPRINTF("obp_static_getprop(%d, %s): not found\n", node, name);
+
+ return -1;
+}
+
+static const char *obp_static_nextprop(int node, char *name)
+{
+ struct ob_property *prop;
+ struct ob_node *currnode = find_node(node);
+
+ if (!name || *name == '\0') {
+ // NULL name means get first property
+ if (!currnode->prop) {
+ DPRINTF("obp_static_nextprop(%d, (NULL)): not found\n", node);
+ return "";
+ }
+ prop = currnode->prop;
+ } else {
+ prop = find_static_property(node, name);
+ prop = prop->next;
+ }
+ if (prop && prop->name) {
+ DPRINTF("obp_static_nextprop(%d, %s) = %s\n", node, name, prop->name);
+ return prop->name;
+ }
+ DPRINTF("obp_static_nextprop(%d, %s): not found\n", node, name);
+ return "";
+}
+#define obp_nextnode obp_static_nextnode
+#define obp_child obp_static_child
+#define obp_proplen obp_static_proplen
+#define obp_getprop obp_static_getprop
+#define obp_nextprop obp_static_nextprop
+#endif
+
+static int obp_setprop(__attribute__((unused)) int node,
+ __attribute__((unused)) char *name,
+ __attribute__((unused)) char *value,
+ __attribute__((unused)) int len)
+{
+ DPRINTF("obp_setprop(0x%x, %s) = %s (%d)\n", node, name, value, len);
+
+ return -1;
+}
+
+static const struct linux_nodeops nodeops0 = {
+ obp_nextnode, /* int (*no_nextnode)(int node); */
+ obp_child, /* int (*no_child)(int node); */
+ obp_proplen, /* int (*no_proplen)(int node, char *name); */
+ obp_getprop, /* int (*no_getprop)(int node,char *name,char *val); */
+ obp_setprop, /* int (*no_setprop)(int node, char *name,
+ char *val, int len); */
+ obp_nextprop /* char * (*no_nextprop)(int node, char *name); */
+};
+
static int obp_nbgetchar(void)
{
return getchar();
@@ -209,21 +906,21 @@
static void obp_reboot(char *str)
{
printk("rebooting (%s)\n", str);
- outb(0x71f00000, 1);
+ outb(1, 0x71f00000);
for (;;) {}
}
static void obp_abort(void)
{
printk("abort, power off\n");
- outb(0x71910000, 1);
+ outb(1, 0x71910000);
for (;;) {}
}
static void obp_halt(void)
{
printk("halt, power off\n");
- outb(0x71910000, 1);
+ outb(1, 0x71910000);
for (;;) {}
}
@@ -427,6 +1124,21 @@
totmap[0].start_adr = &_start;
totmap[0].num_bytes = (unsigned long) &_iomem - (unsigned long) &_start;
+#ifdef PROLL_TREE
+ prop_mem_reg[0] = 0;
+ prop_mem_reg[1] = 0;
+ prop_mem_reg[2] = memsize;
+ prop_mem_avail[0] = 0;
+ prop_mem_avail[1] = 0;
+ prop_mem_avail[2] = va2pa((int)&_data) - 1;
+ prop_vmem_avail[0] = 0;
+ prop_vmem_avail[1] = 0;
+ prop_vmem_avail[2] = (int)&_start - 1;
+ prop_vmem_avail[3] = 0;
+ prop_vmem_avail[4] = 0xffe00000;
+ prop_vmem_avail[5] = 0x00200000;
+#endif
+
// Linux wants a R/W romvec table
romvec0.pv_magic_cookie = LINUX_OPPROM_MAGIC;
romvec0.pv_romvers = 0;
@@ -462,7 +1174,7 @@
romvec0.pv_v2devops.v2_dev_seek = obp_devseek;
obp_arg.boot_dev_ctrl = 0;
obp_arg.boot_dev_unit = 0;
- obp_arg.dev_partition = 4;
+ obp_arg.dev_partition = 0;
obp_arg.argv[0] = "sd(0,0,0):d";
switch(boot_device) {
@@ -473,7 +1185,7 @@
obp_arg.boot_dev[1] = 'd';
break;
case 'd':
- obp_arg.boot_dev_unit = '2';
+ obp_arg.boot_dev_unit = 2;
obp_arg.argv[0] = "sd(0,2,0):d";
// Fall through
case 'c':
@@ -507,5 +1219,8 @@
romvec0.v3_cpuidle = obp_cpuidle;
romvec0.v3_cpuresume = obp_cpuresume;
+#ifdef STATIC_TREE
+ get_tree();
+#endif
return &romvec0;
}
1
0
25 May '06
Author: stepan
Date: 2006-05-25 23:02:53 +0200 (Thu, 25 May 2006)
New Revision: 32
Modified:
openbios-devel/arch/sparc32/aoutload.c
openbios-devel/arch/sparc32/ldscript
openbios-devel/drivers/esp.c
openbios-devel/forth/admin/nvram.fs
openbios-devel/modules/sun-parts.c
Log:
blueswirl sparc32 -17 (without romvec.c changes)
Modified: openbios-devel/arch/sparc32/aoutload.c
===================================================================
--- openbios-devel/arch/sparc32/aoutload.c 2006-05-24 11:10:55 UTC (rev 31)
+++ openbios-devel/arch/sparc32/aoutload.c 2006-05-25 21:02:53 UTC (rev 32)
@@ -65,6 +65,7 @@
goto out;
for (offset = 0; offset < 16 * 512; offset += 512) {
+ file_seek(offset);
if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) {
debug("Can't read a.out header\n");
retval = LOADER_NOT_SUPPORT;
@@ -72,8 +73,6 @@
}
if (!N_BADMAG(ehdr))
break;
-
- file_seek(offset);
}
if (N_BADMAG(ehdr)) {
Modified: openbios-devel/arch/sparc32/ldscript
===================================================================
--- openbios-devel/arch/sparc32/ldscript 2006-05-24 11:10:55 UTC (rev 31)
+++ openbios-devel/arch/sparc32/ldscript 2006-05-25 21:02:53 UTC (rev 32)
@@ -14,7 +14,7 @@
HEAP_SIZE = 16384;
STACK_SIZE = 16384;
VMEM_SIZE = 128 * 1024;
-IOMEM_SIZE = 128 * 1024;
+IOMEM_SIZE = 256 * 1024;
SECTIONS
{
Modified: openbios-devel/drivers/esp.c
===================================================================
--- openbios-devel/drivers/esp.c 2006-05-24 11:10:55 UTC (rev 31)
+++ openbios-devel/drivers/esp.c 2006-05-25 21:02:53 UTC (rev 32)
@@ -140,9 +140,11 @@
// offset is multiple of 512, len in bytes
static int
-ob_sd_read_sectors(esp_private_t *esp, sd_private_t *sd, int offset, void *dest, short len)
+ob_sd_read_sectors(esp_private_t *esp, sd_private_t *sd, int offset, void *dest,
+ short len, short sect_offset)
{
- DPRINTF("ob_sd_read_sectors id %d %lx block=%d len=%d\n", sd->id, (unsigned long)dest, offset, len);
+ DPRINTF("ob_sd_read_sectors id %d %lx sector=%d len=%d soff %d\n",
+ sd->id, (unsigned long)dest, offset, len, sect_offset);
// Setup command = Read(10)
memset(esp->buffer, 0, 10);
@@ -157,10 +159,10 @@
esp->buffer[8] = (len >> 8) & 0xff;
esp->buffer[9] = len & 0xff;
- if (do_command(esp, sd, 10, len * 512))
+ if (do_command(esp, sd, 10, len * 512 + sect_offset))
return 0;
- memcpy(dest, esp->buffer, len * 512);
+ memcpy(dest, esp->buffer + sect_offset, len * 512);
return 0;
}
@@ -179,12 +181,8 @@
return 0;
}
- sd->sectors = (esp->buffer[0] << 24) | (esp->buffer[1] << 16) | (esp->buffer[2] << 8) | esp->buffer[3];
-#if 0
sd->bs = (esp->buffer[4] << 24) | (esp->buffer[5] << 16) | (esp->buffer[6] << 8) | esp->buffer[7];
-#else
- sd->bs = 512;
-#endif
+ sd->sectors = ((esp->buffer[0] << 24) | (esp->buffer[1] << 16) | (esp->buffer[2] << 8) | esp->buffer[3]) * (sd->bs / 512);
return 1;
}
@@ -232,16 +230,20 @@
cell n = POP(), cnt = n;
ucell blk = POP();
char *dest = (char*)POP();
+ int pos, spb, sect_offset;
DPRINTF("ob_sd_read_blocks id %d %lx block=%d n=%d\n", (*sd)->id, (unsigned long)dest, blk, n );
- n *= (*sd)->bs / 512;
+ spb = (*sd)->bs / 512;
while (n) {
- if (ob_sd_read_sectors(global_esp, *sd, blk, dest, 1)) {
- DPRINTF("ob_ide_read_blocks: error\n");
+ sect_offset = blk / spb;
+ pos = (blk - sect_offset * spb) * 512;
+
+ if (ob_sd_read_sectors(global_esp, *sd, sect_offset, dest, 1, pos)) {
+ DPRINTF("ob_sd_read_blocks: error\n");
RET(0);
}
- dest += (*sd)->bs;
+ dest += 512;
n--;
blk++;
}
@@ -249,9 +251,9 @@
}
static void
-ob_sd_block_size(sd_private_t **sd)
+ob_sd_block_size(__attribute__((unused))sd_private_t **sd)
{
- PUSH((*sd)->bs);
+ PUSH(512);
}
static void
Modified: openbios-devel/forth/admin/nvram.fs
===================================================================
--- openbios-devel/forth/admin/nvram.fs 2006-05-24 11:10:55 UTC (rev 31)
+++ openbios-devel/forth/admin/nvram.fs 2006-05-25 21:02:53 UTC (rev 32)
@@ -344,6 +344,17 @@
" true" " little-endian?" bool-config
[THEN]
+[IFDEF] CONFIG_SPARC32
+\ ---- SPARC32 ----
+" true" " tpe-link-test?" bool-config
+" 9600,8,n,1,-" " ttya-mode" str-config
+" true" " ttya-ignore-cd" bool-config
+" false" " ttya-rts-dtr-off" bool-config
+" 9600,8,n,1,-" " ttyb-mode" str-config
+" true" " ttyb-ignore-cd" bool-config
+" false" " ttyb-rts-dtr-off" bool-config
+[THEN]
+
\ --- ??? ---
" " " boot-screen" str-config
" " " boot-script" str-config
Modified: openbios-devel/modules/sun-parts.c
===================================================================
--- openbios-devel/modules/sun-parts.c 2006-05-24 11:10:55 UTC (rev 31)
+++ openbios-devel/modules/sun-parts.c 2006-05-25 21:02:53 UTC (rev 32)
@@ -119,7 +119,7 @@
RET(0);
}
- bs = 512; // XXX get real block size?
+ bs = 512;
/* get partition data */
p = (struct sun_disklabel *)buf;
1
0
I found the cause for memory corruption, the IO map area (set in ldscript)
was not large enough. CD boot works, I fixed the block size issues. CPU halt
and reboot are OK.
There are still some problems with the device tree, somehow Proll tree is
still better than native one. The difference is that using the Forth tree
Linux hangs at some point, but with Proll tree we get shell prompt in Qemu
sparc-test. I'm not sure whether the static tree makes any difference
anymore.
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
1
0
Author: stepan
Date: 2006-05-24 13:10:55 +0200 (Wed, 24 May 2006)
New Revision: 31
Modified:
openbios-devel/fs/grubfs/fsys_ext2fs.c
openbios-devel/fs/grubfs/grubfs_fs.c
openbios-devel/fs/grubfs/iso9660.h
openbios-devel/libc/diskio.c
Log:
some filesystem fixes (mostly remainder from blueswirl's -15)
Modified: openbios-devel/fs/grubfs/fsys_ext2fs.c
===================================================================
--- openbios-devel/fs/grubfs/fsys_ext2fs.c 2006-05-24 10:59:54 UTC (rev 30)
+++ openbios-devel/fs/grubfs/fsys_ext2fs.c 2006-05-24 11:10:55 UTC (rev 31)
@@ -19,10 +19,15 @@
#ifdef FSYS_EXT2FS
+#include "openbios/config.h"
#include "shared.h"
#include "filesys.h"
#include <libc/byteorder.h>
+#ifdef CONFIG_DEBUG_EXT2FS
+#define E2DEBUG
+#endif
+
static int mapblock1, mapblock2;
/* sizes are always in bytes, BLOCK values are always in DEV_BSIZE (sectors) */
Modified: openbios-devel/fs/grubfs/grubfs_fs.c
===================================================================
--- openbios-devel/fs/grubfs/grubfs_fs.c 2006-05-24 10:59:54 UTC (rev 30)
+++ openbios-devel/fs/grubfs/grubfs_fs.c 2006-05-24 11:10:55 UTC (rev 31)
@@ -303,7 +303,7 @@
{
if (filepos < 0 || filepos > filemax)
filepos = filemax;
- if (len < 0 || len > filemax-filepos)
+ if (len > filemax-filepos)
len = filemax - filepos;
errnum = 0;
return curfs->fsys->read_func( buf, len );
Modified: openbios-devel/fs/grubfs/iso9660.h
===================================================================
--- openbios-devel/fs/grubfs/iso9660.h 2006-05-24 10:59:54 UTC (rev 30)
+++ openbios-devel/fs/grubfs/iso9660.h 2006-05-24 11:10:55 UTC (rev 31)
@@ -158,10 +158,13 @@
#define RRMAGIC(c1, c2) ((c1)|(c2) << 8)
-#define CHECK2(ptr, c1, c2) \
- (*(unsigned short *)(ptr) == (((c1) | (c2) << 8) & 0xFFFF))
-#define CHECK4(ptr, c1, c2, c3, c4) \
- (*(unsigned long *)(ptr) == ((c1) | (c2)<<8 | (c3)<<16 | (c4)<<24))
+#define CHECK2(ptr, c1, c2) \
+ (*(ptr) == (c1) && *(ptr + 1) == (c2))
+#define CHECK4(ptr, c1, c2, c3, c4) \
+ (*(unsigned char *)(ptr) == (c1) && \
+ *((unsigned char *)(ptr) + 1) == (c2) && \
+ *((unsigned char *)(ptr) + 2) == (c3) && \
+ *((unsigned char *)(ptr) + 3) == (c4))
#endif /* !ASM_FILE */
Modified: openbios-devel/libc/diskio.c
===================================================================
--- openbios-devel/libc/diskio.c 2006-05-24 10:59:54 UTC (rev 30)
+++ openbios-devel/libc/diskio.c 2006-05-24 11:10:55 UTC (rev 31)
@@ -184,7 +184,7 @@
DPUSH( offs );
call_package( fdp->seek_xt, fdp->ih );
- return ((POP() >= 0)? 0 : -1);
+ return ((((cell)POP()) >= 0)? 0 : -1);
}
llong
1
0
Author: stepan
Date: 2006-05-24 12:59:54 +0200 (Wed, 24 May 2006)
New Revision: 30
Modified:
openbios-devel/modules/disk-label.c
openbios-devel/modules/sun-parts.c
Log:
Added handling of alphabetic partition ids as used in Sparc. Fixed sizes
reported.
Modified: openbios-devel/modules/disk-label.c
===================================================================
--- openbios-devel/modules/disk-label.c 2006-05-22 22:37:46 UTC (rev 29)
+++ openbios-devel/modules/disk-label.c 2006-05-24 10:59:54 UTC (rev 30)
@@ -63,7 +63,9 @@
s = parstr;
filename = NULL;
if( s ) {
- if( *s == '-' || isdigit(*s) ) {
+ if( *s == '-' || isdigit(*s) ||
+ (*s >= 'a' && *s < ('a' + 8)
+ && (*(s + 1) == ',' || *(s + 1) == '\0'))) {
if( (s=strpbrk(parstr,",")) ) {
filename = s+1;
*s = 0;
Modified: openbios-devel/modules/sun-parts.c
===================================================================
--- openbios-devel/modules/sun-parts.c 2006-05-22 22:37:46 UTC (rev 29)
+++ openbios-devel/modules/sun-parts.c 2006-05-24 10:59:54 UTC (rev 30)
@@ -27,6 +27,7 @@
typedef struct {
ullong offs;
ullong size;
+ int type;
} sunparts_info_t;
DECLARE_NODE( sunparts, INSTALL_OPEN, sizeof(sunparts_info_t), "+/packages/sun-parts" );
@@ -93,15 +94,19 @@
int parnum = -1;
unsigned char buf[512];
struct sun_disklabel *p;
- unsigned int i;
+ unsigned int i, bs;
DPRINTF("sunparts_open '%s'\n", str );
if( str ) {
- parnum = atol(str);
- if( !strlen(str) )
- parnum = -1;
- free( str );
+ if( !strlen(str) )
+ parnum = -1;
+ else if (str[0] >= 'a' && str[0] < ('a' + 8))
+ parnum = str[0] - 'a';
+ else
+ parnum = atol(str);
+
+ free( str );
}
SEEK( 0 );
@@ -110,10 +115,11 @@
/* Check Magic */
if (!has_sun_part_magic(buf)) {
- DPRINTF("sun partition magic not found.\n");
+ DPRINTF("Sun partition magic not found.\n");
RET(0);
}
-
+
+ bs = 512; // XXX get real block size?
/* get partition data */
p = (struct sun_disklabel *)buf;
@@ -125,10 +131,16 @@
parnum = i;
}
}
+
+ if (parnum < 0)
+ parnum = 0;
+
+ DPRINTF("Selected partition %d\n", parnum);
di->offs = (llong)__be32_to_cpu(p->partitions[parnum].start_cylinder) *
- __be16_to_cpu(p->ntrks) * __be16_to_cpu(p->nsect);
+ __be16_to_cpu(p->ntrks) * __be16_to_cpu(p->nsect) * bs;
- di->size = (llong)__be32_to_cpu(p->partitions[parnum].num_sectors) ;
+ di->size = (llong)__be32_to_cpu(p->partitions[parnum].num_sectors) * bs;
+ di->type = __be32_to_cpu(p->infos[parnum].id);
DPRINTF("Found Sun partition table, offs %d size %d\n", (int)di->offs, (int)di->size);
RET( -1 );
@@ -147,7 +159,8 @@
static void
sunparts_get_info( sunparts_info_t *di )
{
- PUSH( -1 ); /* no type */
+ DPRINTF("Sun get_info\n");
+ PUSH( di->type );
DPUSH( di->offs );
DPUSH( di->size );
}
1
0
Hi,
some voices whisper that EFI programs are so much easier and simpler
than Open Firmware. I am not making any statement but let you, much
valued readers, decide here:
http://www.osxbook.com/book/bonus/chapter4/efiprogramming/
vs:
http://www.kernelthread.com/hanoi/src/hanoimania/hanoi.macprom
Regards,
Stefan
3
2
I noticed that when using the preloaded kernel, the kernel has 4 bytes
memory corruption at address 0xf001000c (physical 0x1000c). The corrupting
value is 0x7ffffffff, MAXINT. If I restore the original value manually from
gdb session, Linux boots much better. I haven't yet found where the
corruption happens.
I made a dirty (don't commit this) version which takes the hardcoded prom
tree and tree browsing functions from Proll. If OLD_OBP is enabled, the
version can boot Linux as well as Proll/Qemu can at the moment, meaning that
we can reach the userland installer without any faults. There could be bugs
in the Forth-based tree, or maybe calling Forth is not working so well after
Linux has started doing more things.
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
1
0
My 2 pennies,
I know EFI device driver developers here at work and
I know for sure that among other things EFI's debugging
framework is not as powerful as OpenFirmware. Heck! you
can literally _interactively_ develope an FCode driver in
OpenFirmware. This you cannot do in EFI.
Perhaps OpenBIOS will be to EFI/x86Bios, what Linux is
to Windows today. We'll find out within the next ~5 years.
_____________
Asif Haswarey
C1069W
QLogic Corporation
26650 Aliso Viejo Parkway
Aliso Viejo, CA 92656
Phone: 949.389.7607
Fax: 949.389.6308
-----Original Message-----
From: openbios-bounces(a)openbios.org
[mailto:openbios-bounces@openbios.org] On Behalf Of Ronald G Minnich
Sent: Tuesday, May 23, 2006 9:42 AM
To: The OpenBIOS Mailinglist
Subject: Re: [OpenBIOS] old shoes vs new shoes.
Stefan Reinauer wrote:
> Hi,
>
> some voices whisper that EFI programs are so much easier and simpler
> than Open Firmware. I am not making any statement but let you, much
> valued readers, decide here:
>
> http://www.osxbook.com/book/bonus/chapter4/efiprogramming/
yes, but EFI is such a powerful operating system! And, fortunately, the
API is totally new and incompatible with EVERYTHING, and it's not a very
good API, so we get the benefit of having to learn a whole new api, with
a special toolchain, that is useless for everything else we do.
I am sure I have not listed all the benefits of this new EFI operating
system :-) ron
--
OpenBIOS http://openbios.org/
Mailinglist: http://lists.openbios.org/mailman/listinfo
Free your System - May the Forth be with you
1
0
Author: stepan
Date: 2006-05-23 00:37:46 +0200 (Tue, 23 May 2006)
New Revision: 29
Modified:
openbios-devel/arch/ppc/kernel.c
Log:
forgot this one
Modified: openbios-devel/arch/ppc/kernel.c
===================================================================
--- openbios-devel/arch/ppc/kernel.c 2006-05-22 22:36:01 UTC (rev 28)
+++ openbios-devel/arch/ppc/kernel.c 2006-05-22 22:37:46 UTC (rev 29)
@@ -36,12 +36,6 @@
/* F U N C T I O N S */
/************************************************************************/
-void
-exception( int errcode )
-{
- /* no-op */
-}
-
int
forth_segv_handler( char *segv_addr )
{
1
0
r28 - in openbios-devel: arch/amd64 arch/sparc32 arch/x86 include/amd64 include/openbios include/ppc include/x86 kernel
by svn＠openbios.org 23 May '06
by svn＠openbios.org 23 May '06
23 May '06
Author: stepan
Date: 2006-05-23 00:36:01 +0200 (Tue, 23 May 2006)
New Revision: 28
Modified:
openbios-devel/arch/amd64/openbios.c
openbios-devel/arch/sparc32/openbios.c
openbios-devel/arch/x86/openbios.c
openbios-devel/include/amd64/io.h
openbios-devel/include/openbios/bindings.h
openbios-devel/include/openbios/drivers.h
openbios-devel/include/ppc/io.h
openbios-devel/include/x86/io.h
openbios-devel/kernel/forth.c
openbios-devel/kernel/internal.c
Log:
drop io from bootstrap and exception stuff from non-bootstrap compiles.
Modified: openbios-devel/arch/amd64/openbios.c
===================================================================
--- openbios-devel/arch/amd64/openbios.c 2006-05-22 22:16:20 UTC (rev 27)
+++ openbios-devel/arch/amd64/openbios.c 2006-05-22 22:36:01 UTC (rev 28)
@@ -34,14 +34,6 @@
PUSH(0x9FFFF);
}
-void exception(cell no)
-{
- /* The exception mechanism is used during bootstrap to catch
- * build errors. In a running system this is a noop since we
- * can't break out to the unix host os anyways.
- */
-}
-
static void
arch_init( void )
{
Modified: openbios-devel/arch/sparc32/openbios.c
===================================================================
--- openbios-devel/arch/sparc32/openbios.c 2006-05-22 22:16:20 UTC (rev 27)
+++ openbios-devel/arch/sparc32/openbios.c 2006-05-22 22:36:01 UTC (rev 28)
@@ -39,14 +39,6 @@
PUSH((unsigned int)&_eheap);
}
-void exception(__attribute__((unused))cell no)
-{
- /* The exception mechanism is used during bootstrap to catch
- * build errors. In a running system this is a noop since we
- * can't break out to the unix host os anyways.
- */
-}
-
static void
arch_init( void )
{
Modified: openbios-devel/arch/x86/openbios.c
===================================================================
--- openbios-devel/arch/x86/openbios.c 2006-05-22 22:16:20 UTC (rev 27)
+++ openbios-devel/arch/x86/openbios.c 2006-05-22 22:36:01 UTC (rev 28)
@@ -34,14 +34,6 @@
PUSH(0x9FFFF);
}
-void exception(cell no)
-{
- /* The exception mechanism is used during bootstrap to catch
- * build errors. In a running system this is a noop since we
- * can't break out to the unix host os anyways.
- */
-}
-
static void
arch_init( void )
{
Modified: openbios-devel/include/amd64/io.h
===================================================================
--- openbios-devel/include/amd64/io.h 2006-05-22 22:16:20 UTC (rev 27)
+++ openbios-devel/include/amd64/io.h 2006-05-22 22:36:01 UTC (rev 28)
@@ -42,27 +42,8 @@
__asm__ __volatile__("rep; ins" #bwl : "+D"(addr), "+c"(count) : "d"(port)); \
}
-#ifndef BOOTSTRAP
BUILDIO(b,b,char)
BUILDIO(w,w,short)
BUILDIO(l,,int)
-#else
-#ifdef FCOMPILER
-#define inb(reg) ((u8)0xff)
-#define inw(reg) ((u16)0xffff)
-#define inl(reg) ((u32)0xffffffff)
-#define outb(reg, val) /* nothing */
-#define outw(reg, val) /* nothing */
-#define outl(reg, val) /* nothing */
-#else
-extern u8 inb( u32 reg );
-extern u16 inw( u32 reg );
-extern u32 inl( u32 reg );
-extern void insw( u32 reg, void *addr, unsigned long count );
-extern void outb( u32 reg, u8 val );
-extern void outw( u32 reg, u16 val );
-extern void outl( u32 reg, u32 val );
-extern void outsw( u32 reg, const void *addr, unsigned long count);
+
#endif
-#endif
-#endif
Modified: openbios-devel/include/openbios/bindings.h
===================================================================
--- openbios-devel/include/openbios/bindings.h 2006-05-22 22:16:20 UTC (rev 27)
+++ openbios-devel/include/openbios/bindings.h 2006-05-22 22:36:01 UTC (rev 28)
@@ -26,7 +26,6 @@
/* initialization */
extern int initialize_forth( void );
-extern void exception( cell errcode );
/* panic */
extern int forth_segv_handler( char *segv_addr );
Modified: openbios-devel/include/openbios/drivers.h
===================================================================
--- openbios-devel/include/openbios/drivers.h 2006-05-22 22:16:20 UTC (rev 27)
+++ openbios-devel/include/openbios/drivers.h 2006-05-22 22:36:01 UTC (rev 28)
@@ -21,7 +21,7 @@
int ob_ide_init(void);
#endif
#ifdef CONFIG_DRIVER_ESP
-int ob_esp_init(void);
+int ob_esp_init(unsigned long base);
#endif
#ifdef CONFIG_DRIVER_OBIO
int ob_obio_init(unsigned long slavio_base);
Modified: openbios-devel/include/ppc/io.h
===================================================================
--- openbios-devel/include/ppc/io.h 2006-05-22 22:16:20 UTC (rev 27)
+++ openbios-devel/include/ppc/io.h 2006-05-22 22:36:01 UTC (rev 28)
@@ -143,23 +143,6 @@
ns--;
}
}
-#else /* BOOTSTRAP */
-#ifdef FCOMPILER
-#define inb(reg) ((u8)0xff)
-#define inw(reg) ((u16)0xffff)
-#define inl(reg) ((u32)0xffffffff)
-#define outb(reg, val) // nothing
-#define outw(reg, val) // nothing
-#define outl(reg, val) // nothing
-#else
-extern u8 inb(u32 reg);
-extern u16 inw(u32 reg);
-extern u32 inl(u32 reg);
-extern void insw(u32 reg, void *addr, unsigned long count);
-extern void outb(u32 reg, u8 val);
-extern void outw(u32 reg, u16 val);
-extern void outl(u32 reg, u32 val);
-extern void outsw(u32 reg, const void *addr, unsigned long count);
#endif
-#endif
+
#endif /* _ASM_IO_H */
Modified: openbios-devel/include/x86/io.h
===================================================================
--- openbios-devel/include/x86/io.h 2006-05-22 22:16:20 UTC (rev 27)
+++ openbios-devel/include/x86/io.h 2006-05-22 22:36:01 UTC (rev 28)
@@ -46,25 +46,6 @@
BUILDIO(b,b,char)
BUILDIO(w,w,short)
BUILDIO(l,,int)
-#else
-#ifdef FCOMPILER
-#define inb(reg) ((u8)0xff)
-#define inw(reg) ((u16)0xffff)
-#define inl(reg) ((u32)0xffffffff)
-// #define insw( u32 reg, void *addr, unsigned long count );
-#define outb(reg, val) // nothing
-#define outw(reg, val) // nothing
-#define outl(reg, val) // nothing
-// #define outsw( u32 reg, const void *addr, unsigned long count);
-#else
-extern u8 inb( u32 reg );
-extern u16 inw( u32 reg );
-extern u32 inl( u32 reg );
-extern void insw( u32 reg, void *addr, unsigned long count );
-extern void outb( u32 reg, u8 val );
-extern void outw( u32 reg, u16 val );
-extern void outl( u32 reg, u32 val );
-extern void outsw( u32 reg, const void *addr, unsigned long count);
#endif
+
#endif
-#endif
Modified: openbios-devel/kernel/forth.c
===================================================================
--- openbios-devel/kernel/forth.c 2006-05-22 22:16:20 UTC (rev 27)
+++ openbios-devel/kernel/forth.c 2006-05-22 22:36:01 UTC (rev 28)
@@ -796,9 +796,11 @@
static void emit(void)
{
+#ifndef FCOMPILER
cell tmp = POP();
-#ifndef FCOMPILER
putchar(tmp);
+#else
+ (void) POP();
#endif
}
@@ -834,8 +836,13 @@
static void iocfetch(void)
{
+#ifndef FCOMPILER
cell reg = POP();
PUSH(inb(reg));
+#else
+ (void)POP();
+ PUSH(0);
+#endif
}
@@ -845,8 +852,13 @@
static void iowfetch(void)
{
+#ifndef FCOMPILER
cell reg = POP();
PUSH(inw(reg));
+#else
+ (void)POP();
+ PUSH(0);
+#endif
}
/*
@@ -855,8 +867,13 @@
static void iolfetch(void)
{
+#ifndef FCOMPILER
cell reg = POP();
PUSH(inl(reg));
+#else
+ (void)POP();
+ PUSH(0);
+#endif
}
@@ -866,10 +883,15 @@
static void iocstore(void)
{
+#ifndef FCOMPILER
cell reg = POP();
cell val = POP();
outb(reg, val);
+#else
+ (void)POP();
+ (void)POP();
+#endif
}
@@ -879,10 +901,15 @@
static void iowstore(void)
{
+#ifndef FCOMPILER
cell reg = POP();
cell val = POP();
outw(reg, val);
+#else
+ (void)POP();
+ (void)POP();
+#endif
}
@@ -892,10 +919,15 @@
static void iolstore(void)
{
+#ifndef FCOMPILER
ucell reg = POP();
ucell val = POP();
outl(reg, val);
+#else
+ (void)POP();
+ (void)POP();
+#endif
}
/*
Modified: openbios-devel/kernel/internal.c
===================================================================
--- openbios-devel/kernel/internal.c 2006-05-22 22:16:20 UTC (rev 27)
+++ openbios-devel/kernel/internal.c 2006-05-22 22:36:01 UTC (rev 28)
@@ -179,7 +179,9 @@
static void sysdebug(void)
{
cell errorno=POP();
+#ifdef FCOMPILER
exception(errorno);
+#endif
}
static void dodoes(void)
1
0
r27 - in openbios-devel: arch/sparc32 config/examples include/sparc32
by svn＠openbios.org 23 May '06
by svn＠openbios.org 23 May '06
23 May '06
Author: stepan
Date: 2006-05-23 00:16:20 +0200 (Tue, 23 May 2006)
New Revision: 27
Modified:
openbios-devel/arch/sparc32/aoutload.c
openbios-devel/arch/sparc32/boot.c
openbios-devel/arch/sparc32/elfload.c
openbios-devel/arch/sparc32/openbios.c
openbios-devel/arch/sparc32/romvec.c
openbios-devel/arch/sparc32/tree.fs
openbios-devel/config/examples/cross-sparc32_config.xml
openbios-devel/config/examples/sparc32_config.xml
openbios-devel/include/sparc32/io.h
Log:
openbios.patch-15-svn25.bz2 part II merge
Modified: openbios-devel/arch/sparc32/aoutload.c
===================================================================
--- openbios-devel/arch/sparc32/aoutload.c 2006-05-22 22:10:54 UTC (rev 26)
+++ openbios-devel/arch/sparc32/aoutload.c 2006-05-22 22:16:20 UTC (rev 27)
@@ -57,16 +57,23 @@
int image_retval;
struct exec ehdr;
unsigned long start, size;
+ unsigned int offset;
image_name = image_version = 0;
if (!file_open(filename))
goto out;
- if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) {
- debug("Can't read a.out header\n");
- retval = LOADER_NOT_SUPPORT;
- goto out;
+ for (offset = 0; offset < 16 * 512; offset += 512) {
+ if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) {
+ debug("Can't read a.out header\n");
+ retval = LOADER_NOT_SUPPORT;
+ goto out;
+ }
+ if (!N_BADMAG(ehdr))
+ break;
+
+ file_seek(offset);
}
if (N_BADMAG(ehdr)) {
@@ -76,9 +83,9 @@
}
if (N_MAGIC(ehdr) == NMAGIC) {
- size = N_DATADDR(ehdr) + ehdr.a_data;
+ size = addr_fixup(N_DATADDR(ehdr)) + addr_fixup(ehdr.a_data);
} else {
- size = ehdr.a_text + ehdr.a_data;
+ size = addr_fixup(ehdr.a_text) + addr_fixup(ehdr.a_data);
}
start = 0x4000; // N_TXTADDR(ehdr);
@@ -88,7 +95,7 @@
printf("Loading a.out %s...\n", image_name ? image_name : "image");
- file_seek(N_TXTOFF(ehdr));
+ file_seek(offset + N_TXTOFF(ehdr));
if (N_MAGIC(ehdr) == NMAGIC) {
if (lfile_read(start, ehdr.a_text) != ehdr.a_text) {
@@ -108,18 +115,19 @@
debug("Loaded %lu bytes\n", size);
- debug("entry point is %#x\n", start);
+ debug("entry point is %#lx\n", start);
printf("Jumping to entry point...\n");
#if 1
{
extern unsigned int qemu_mem_size;
+ extern char boot_device;
void *init_openprom(unsigned long memsize, const char *cmdline, char boot_device);
int (*entry)(const void *romvec, int p2, int p3, int p4, int p5);
const void *romvec;
- romvec = init_openprom(qemu_mem_size, cmdline, 'c');
+ romvec = init_openprom(qemu_mem_size, cmdline, boot_device);
entry = (void *) addr_fixup(start);
image_retval = entry(romvec, 0, 0, 0, 0);
}
Modified: openbios-devel/arch/sparc32/boot.c
===================================================================
--- openbios-devel/arch/sparc32/boot.c 2006-05-22 22:10:54 UTC (rev 26)
+++ openbios-devel/arch/sparc32/boot.c 2006-05-22 22:16:20 UTC (rev 27)
@@ -16,24 +16,54 @@
void boot(void);
struct sys_info sys_info;
+uint32_t kernel_image;
+uint32_t kernel_size;
+uint32_t cmdline;
+uint32_t cmdline_size;
+char boot_device;
void boot(void)
{
char *path=pop_fstr_copy(), *param;
- // char *param="root=/dev/hda2 console=ttyS0,115200n8 console=tty0";
-
+ if (kernel_size) {
+ extern unsigned int qemu_mem_size;
+ void *init_openprom(unsigned long memsize, const char *cmdline, char boot_device);
+
+ int (*entry)(const void *romvec, int p2, int p3, int p4, int p5);
+ const void *romvec;
+
+ printk("[sparc] Kernel already loaded\n");
+ romvec = init_openprom(qemu_mem_size, (void *)cmdline, boot_device);
+ entry = (void *) kernel_image;
+ entry(romvec, 0, 0, 0, 0);
+ }
+
if(!path) {
+ switch(boot_device) {
+ case 'a':
+ path = "/obio/SUNW,fdtwo";
+ break;
+ case 'c':
+ path = "disk";
+ break;
+ default:
+ case 'd':
path = "cdrom";
- //printk("[sparc] Booting default not supported.\n");
- //return;
+ break;
+ case 'n':
+ path = "net";
+ break;
+ }
}
param = strchr(path, ' ');
if(param) {
*param = '\0';
param++;
- }
+ } else if (cmdline_size) {
+ param = (char *)cmdline;
+ }
printk("[sparc] Booting file '%s' with parameters '%s'\n",path, param);
Modified: openbios-devel/arch/sparc32/elfload.c
===================================================================
--- openbios-devel/arch/sparc32/elfload.c 2006-05-22 22:10:54 UTC (rev 26)
+++ openbios-devel/arch/sparc32/elfload.c 2006-05-22 22:16:20 UTC (rev 27)
@@ -76,7 +76,8 @@
}
static unsigned long process_image_notes(Elf_phdr *phdr, int phnum,
- unsigned short *sum_ptr)
+ unsigned short *sum_ptr,
+ unsigned int offset)
{
int i;
char *buf = NULL;
@@ -90,7 +91,7 @@
if (phdr[i].p_type != PT_NOTE)
continue;
buf = malloc(phdr[i].p_filesz);
- file_seek(phdr[i].p_offset);
+ file_seek(offset + phdr[i].p_offset);
if (lfile_read(buf, phdr[i].p_filesz) != phdr[i].p_filesz) {
printf("Can't read note segment\n");
goto out;
@@ -132,7 +133,8 @@
}
static int load_segments(Elf_phdr *phdr, int phnum,
- unsigned long checksum_offset)
+ unsigned long checksum_offset,
+ unsigned int offset)
{
unsigned long bytes;
//unsigned int start_time, time;
@@ -145,7 +147,7 @@
continue;
debug("segment %d addr:%#x file:%#x mem:%#x ",
i, addr_fixup(phdr[i].p_paddr), phdr[i].p_filesz, phdr[i].p_memsz);
- file_seek(phdr[i].p_offset);
+ file_seek(offset + phdr[i].p_offset);
debug("loading... ");
if (lfile_read(phys_to_virt(addr_fixup(phdr[i].p_paddr)), phdr[i].p_filesz)
!= phdr[i].p_filesz) {
@@ -309,16 +311,24 @@
Elf_Bhdr *boot_notes = NULL;
int retval = -1;
int image_retval;
+ unsigned int offset;
image_name = image_version = 0;
if (!file_open(filename))
goto out;
- if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) {
- debug("Can't read ELF header\n");
- retval = LOADER_NOT_SUPPORT;
- goto out;
+ for (offset = 0; offset < 16 * 512; offset += 512) {
+ if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) {
+ debug("Can't read ELF header\n");
+ retval = LOADER_NOT_SUPPORT;
+ goto out;
+ }
+
+ if (ehdr.e_ident[EI_MAG0] == ELFMAG0)
+ break;
+
+ file_seek(offset);
}
if (ehdr.e_ident[EI_MAG0] != ELFMAG0
@@ -339,7 +349,7 @@
phdr_size = ehdr.e_phnum * sizeof *phdr;
phdr = malloc(phdr_size);
- file_seek(ehdr.e_phoff);
+ file_seek(offset + ehdr.e_phoff);
if (lfile_read(phdr, phdr_size) != phdr_size) {
printf("Can't read program header\n");
goto out;
@@ -348,14 +358,14 @@
if (!check_mem_ranges(info, phdr, ehdr.e_phnum))
goto out;
- checksum_offset = process_image_notes(phdr, ehdr.e_phnum, &checksum);
+ checksum_offset = process_image_notes(phdr, ehdr.e_phnum, &checksum, offset);
printf("Loading %s", image_name ? image_name : "image");
if (image_version)
printf(" version %s", image_version);
printf("...\n");
- if (!load_segments(phdr, ehdr.e_phnum, checksum_offset))
+ if (!load_segments(phdr, ehdr.e_phnum, checksum_offset, offset))
goto out;
if (checksum_offset) {
@@ -373,12 +383,13 @@
#if 1
{
extern unsigned int qemu_mem_size;
+ extern char boot_device;
void *init_openprom(unsigned long memsize, const char *cmdline, char boot_device);
int (*entry)(const void *romvec, int p2, int p3, int p4, int p5);
const void *romvec;
- romvec = init_openprom(qemu_mem_size, cmdline, 'c');
+ romvec = init_openprom(qemu_mem_size, cmdline, boot_device);
entry = (void *) addr_fixup(ehdr.e_entry);
image_retval = entry(romvec, 0, 0, 0, 0);
}
Modified: openbios-devel/arch/sparc32/openbios.c
===================================================================
--- openbios-devel/arch/sparc32/openbios.c 2006-05-22 22:10:54 UTC (rev 26)
+++ openbios-devel/arch/sparc32/openbios.c 2006-05-22 22:16:20 UTC (rev 27)
@@ -19,6 +19,10 @@
void boot(void);
void ob_ide_init(void);
+#define IOMMU_BASE 0x10000000 /* First page of sun4m IOMMU */
+#define SLAVIO_BASE 0x71000000
+#define MACIO_BASE 0x70000000
+
static unsigned char intdict[256 * 1024];
static void init_memory(void)
@@ -50,17 +54,19 @@
modules_init();
#ifdef CONFIG_DRIVER_SBUS
- init_mmu_swift();
+ init_mmu_swift(IOMMU_BASE);
ob_sbus_init();
#endif
#ifdef CONFIG_DRIVER_ESP
- ob_esp_init();
+ ob_esp_init(MACIO_BASE);
#endif
#ifdef CONFIG_DRIVER_OBIO
- ob_obio_init(0x71000000);
+ ob_obio_init(SLAVIO_BASE);
+ nvram_init();
#endif
device_end();
+
bind_func("platform-boot", boot );
}
Modified: openbios-devel/arch/sparc32/romvec.c
===================================================================
--- openbios-devel/arch/sparc32/romvec.c 2006-05-22 22:10:54 UTC (rev 26)
+++ openbios-devel/arch/sparc32/romvec.c 2006-05-22 22:16:20 UTC (rev 27)
@@ -61,9 +61,6 @@
static void (*synch_hook)(void);
static struct linux_romvec romvec0;
-static int prop_mem_reg[3];
-static int prop_mem_avail[3];
-static int prop_vmem_avail[6];
static void doublewalk(__attribute__((unused)) unsigned int ptab1,
__attribute__((unused)) unsigned int va)
@@ -418,31 +415,18 @@
/*
* Form memory descriptors.
*/
- totphys[0].theres_more = 0;
+ totphys[0].theres_more = NULL;
totphys[0].start_adr = (char *) 0;
totphys[0].num_bytes = memsize;
- totavail[0].theres_more = 0;
- totavail[0].start_adr = (char*) 0;
+ totavail[0].theres_more = NULL;
+ totavail[0].start_adr = (char *) 0;
totavail[0].num_bytes = memsize;
- totmap[0].theres_more = 0;
+ totmap[0].theres_more = NULL;
totmap[0].start_adr = &_start;
totmap[0].num_bytes = (unsigned long) &_iomem - (unsigned long) &_start;
- prop_mem_reg[0] = 0;
- prop_mem_reg[1] = 0;
- prop_mem_reg[2] = memsize;
- prop_mem_avail[0] = 0;
- prop_mem_avail[1] = 0;
- prop_mem_avail[2] = va2pa((unsigned long)&_data) - 1;
- prop_vmem_avail[0] = 0;
- prop_vmem_avail[1] = 0;
- prop_vmem_avail[2] = (unsigned long)&_start - 1;
- prop_vmem_avail[3] = 0;
- prop_vmem_avail[4] = 0xffe00000;
- prop_vmem_avail[5] = 0x00200000;
-
// Linux wants a R/W romvec table
romvec0.pv_magic_cookie = LINUX_OPPROM_MAGIC;
romvec0.pv_romvers = 0;
@@ -478,6 +462,7 @@
romvec0.pv_v2devops.v2_dev_seek = obp_devseek;
obp_arg.boot_dev_ctrl = 0;
obp_arg.boot_dev_unit = 0;
+ obp_arg.dev_partition = 4;
obp_arg.argv[0] = "sd(0,0,0):d";
switch(boot_device) {
@@ -503,7 +488,7 @@
}
obp_arg.argv[1] = cmdline;
romvec0.pv_v2bootargs.bootpath = &obp_arg.argv[0];
- romvec0.pv_v2bootargs.bootargs = &cmdline;
+ romvec0.pv_v2bootargs.bootargs = &obp_arg.argv[1];
romvec0.pv_v2bootargs.fd_stdin = &obp_fd_stdin;
romvec0.pv_v2bootargs.fd_stdout = &obp_fd_stdout;
Modified: openbios-devel/arch/sparc32/tree.fs
===================================================================
--- openbios-devel/arch/sparc32/tree.fs 2006-05-22 22:10:54 UTC (rev 26)
+++ openbios-devel/arch/sparc32/tree.fs 2006-05-22 22:16:20 UTC (rev 27)
@@ -5,9 +5,6 @@
" SUNW,SparcStation-5" encode-string " name" property
" SparcStation" encode-string " banner-name" property
" sun4m" encode-string " compatible" property
- h# 01800000 encode-int 0 encode-int encode+ 0 encode-int encode+ h# 00000081 encode-int encode+
- 0 encode-int encode+ 0 encode-int encode+ 0 encode-int encode+ 0 encode-int encode+
- " idprom" property \ XXX
" /obio/zs@0,100000:a" encode-string " stdin-path" property
" /obio/zs@0,100000:a" encode-string " stdout-path" property
: encode-unit encode-unit-sbus ;
@@ -15,8 +12,6 @@
new-device
" memory" device-name
- h# 100000 encode-int " available" property \ XXX
- h# 0 encode-int h# 10000000 encode-int encode+ h# 00000300 encode-int encode+ " reg" property \ XXX
external
: open true ;
: close ;
@@ -26,8 +21,6 @@
new-device
" virtual-memory" device-name
- h# 100000 encode-int " available" property \ XXX
- h# 0 encode-int h# 10000000 encode-int encode+ h# 00000300 encode-int encode+ " reg" property \ XXX
external
: open true ;
: close ;
@@ -131,7 +124,6 @@
" /iommu/sbus" find-device
new-device
" espdma" device-name
- h# 4 encode-int h# 08400000 encode-int encode+ h# 00000010 encode-int encode+ " reg" property
external
: encode-unit encode-unit-sbus ;
: decode-unit decode-unit-sbus ;
@@ -180,76 +172,6 @@
: decode-unit decode-unit-sbus ;
finish-device
-" /obio" find-device
-new-device
- " SUNW,fdtwo" device-name
- " block" device-type
- h# 0 encode-int h# 00400000 encode-int encode+ h# 0000000f encode-int encode+ " reg" property
- h# 2b encode-int 0 encode-int encode+ " intr" property
-finish-device
-
-" /obio" find-device
-new-device
- " auxio" device-name
- h# 0 encode-int h# 00900000 encode-int encode+ h# 00000001 encode-int encode+ " reg" property
-finish-device
-
-" /obio" find-device
-new-device
- " counter" device-name
- h# 0 encode-int h# 00d00000 encode-int encode+ h# 00000010 encode-int encode+
- h# 0 encode-int encode+ h# 00d10000 encode-int encode+ h# 00000010 encode-int encode+
- " reg" property
-finish-device
-
-" /obio" find-device
-new-device
- " eeprom" device-name
- h# 0 encode-int h# 00200000 encode-int encode+ h# 00002000 encode-int encode+ " reg" property
- " mk48t08" model
-finish-device
-
-" /obio" find-device
-new-device
- " interrupt" device-name
- h# 0 encode-int h# 00e00000 encode-int encode+ h# 00000010 encode-int encode+
- h# 0 encode-int encode+ h# 00e10000 encode-int encode+ h# 00000010 encode-int encode+
- " reg" property
-finish-device
-
-" /obio" find-device
-new-device
- " power" device-name
- h# 0 encode-int h# 00910000 encode-int encode+ h# 00000001 encode-int encode+ " reg" property
- h# 22 encode-int 0 encode-int encode+ " intr" property
-finish-device
-
-" /obio" find-device
-new-device
- " slavioconfig" device-name
- h# 0 encode-int h# 00800000 encode-int encode+ h# 00000001 encode-int encode+ " reg" property
-finish-device
-
-" /obio" find-device
-new-device
- " zs" device-name
- " serial" device-type
- h# 0 encode-int h# 00000000 encode-int encode+ h# 00000008 encode-int encode+ " reg" property
- 1 encode-int " slave" property
- h# 2c encode-int 0 encode-int encode+ " intr" property
- -1 encode-int " keyboard" property
- -1 encode-int " mouse" property
-finish-device
-
-" /obio" find-device
-new-device
- " zs" device-name
- " serial" device-type
- h# 0 encode-int h# 00100000 encode-int encode+ h# 00000008 encode-int encode+ " reg" property
- 0 encode-int " slave" property
- h# 2c encode-int 0 encode-int encode+ " intr" property
-finish-device
-
" /options" find-device
" disk" encode-string " boot-from" property
Modified: openbios-devel/config/examples/cross-sparc32_config.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc32_config.xml 2006-05-22 22:10:54 UTC (rev 26)
+++ openbios-devel/config/examples/cross-sparc32_config.xml 2006-05-22 22:16:20 UTC (rev 27)
@@ -61,6 +61,7 @@
<option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/>
<option name="CONFIG_FSYS_AFFS" type="boolean" value="true"/>
<option name="CONFIG_DEBUG_FS" type="boolean" value="false"/>
+ <option name="CONFIG_DEBUG_EXT2FS" type="boolean" value="false"/>
<!-- Miscellaneous -->
<option name="CONFIG_LINUXBIOS" type="boolean" value="false"/>
Modified: openbios-devel/config/examples/sparc32_config.xml
===================================================================
--- openbios-devel/config/examples/sparc32_config.xml 2006-05-22 22:10:54 UTC (rev 26)
+++ openbios-devel/config/examples/sparc32_config.xml 2006-05-22 22:16:20 UTC (rev 27)
@@ -61,6 +61,7 @@
<option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/>
<option name="CONFIG_FSYS_AFFS" type="boolean" value="true"/>
<option name="CONFIG_DEBUG_FS" type="boolean" value="false"/>
+ <option name="CONFIG_DEBUG_EXT2FS" type="boolean" value="false"/>
<!-- Miscellaneous -->
<option name="CONFIG_LINUXBIOS" type="boolean" value="false"/>
Modified: openbios-devel/include/sparc32/io.h
===================================================================
--- openbios-devel/include/sparc32/io.h 2006-05-22 22:10:54 UTC (rev 26)
+++ openbios-devel/include/sparc32/io.h 2006-05-22 22:16:20 UTC (rev 27)
@@ -38,7 +38,7 @@
void *mem_zalloc(struct mem *t, int size, int align);
int map_page(unsigned long va, unsigned long epa, int type);
void *map_io(unsigned pa, int size);
-void init_mmu_swift(void);
+void init_mmu_swift(unsigned long base);
void *dvma_alloc(int size, unsigned int *pphys);
#ifndef BOOTSTRAP
1
0
Author: stepan
Date: 2006-05-23 00:10:54 +0200 (Tue, 23 May 2006)
New Revision: 26
Added:
openbios-devel/drivers/obio.h
Modified:
openbios-devel/drivers/esp.c
openbios-devel/drivers/iommu.c
openbios-devel/drivers/obio.c
Log:
drivers part from openbios.patch-15-svn25.bz2
Modified: openbios-devel/drivers/esp.c
===================================================================
--- openbios-devel/drivers/esp.c 2006-05-22 10:37:34 UTC (rev 25)
+++ openbios-devel/drivers/esp.c 2006-05-22 22:10:54 UTC (rev 26)
@@ -25,8 +25,9 @@
#include "asm/dma.h"
#include "esp.h"
-#define PHYS_JJ_ESPDMA 0x78400000 /* ESP DMA controller */
-#define PHYS_JJ_ESP 0x78800000 /* ESP SCSI */
+#define MACIO_ESPDMA 0x08400000 /* ESP DMA controller */
+#define MACIO_ESP 0x08800000 /* ESP SCSI */
+
#define BUFSIZE 4096
#define REGISTER_NAMED_NODE( name, path ) do { \
@@ -294,16 +295,14 @@
static int
-espdma_init(struct esp_dma *espdma)
+espdma_init(unsigned long base, struct esp_dma *espdma)
{
- void *p;
+ espdma->regs = (void *)map_io(base + MACIO_ESPDMA, 0x10);
- /* Hardcode everything for MrCoffee. */
- if ((p = (void *)map_io(PHYS_JJ_ESPDMA, 0x10)) == 0) {
+ if (espdma->regs == 0) {
DPRINTF("espdma_init: cannot map registers\n");
return -1;
}
- espdma->regs = p;
DPRINTF("dma1: ");
@@ -340,6 +339,21 @@
}
DPRINTF("\n");
+ push_str("/iommu/sbus/espdma");
+ fword("find-device");
+
+ /* set reg */
+ PUSH(4);
+ fword("encode-int");
+ PUSH(MACIO_ESPDMA);
+ fword("encode-int");
+ fword("encode+");
+ PUSH(0x00000010);
+ fword("encode-int");
+ fword("encode+");
+ push_str("reg");
+ fword("property");
+
return 0;
}
@@ -358,7 +372,7 @@
/* set reg */
PUSH(4);
fword("encode-int");
- PUSH(0x08800000);
+ PUSH(MACIO_ESP);
fword("encode-int");
fword("encode+");
PUSH(0x00000010);
@@ -407,7 +421,8 @@
fword("property");
}
-int ob_esp_init(void)
+int
+ob_esp_init(unsigned long base)
{
int id, diskcount = 0, cdcount = 0, *counter_ptr;
char nodebuff[256], aliasbuff[256];
@@ -423,11 +438,11 @@
global_esp = esp;
- if (espdma_init(&esp->espdma) != 0) {
+ if (espdma_init(base, &esp->espdma) != 0) {
return -1;
}
/* Get the IO region */
- esp->ll = (void *)map_io(PHYS_JJ_ESP, sizeof(struct esp_regs));
+ esp->ll = (void *)map_io(base + MACIO_ESP, sizeof(struct esp_regs));
if (esp->ll == 0) {
DPRINTF("Can't map ESP registers\n");
return -1;
Modified: openbios-devel/drivers/iommu.c
===================================================================
--- openbios-devel/drivers/iommu.c 2006-05-22 10:37:34 UTC (rev 25)
+++ openbios-devel/drivers/iommu.c 2006-05-22 22:10:54 UTC (rev 26)
@@ -18,7 +18,6 @@
#include "pgtsrmmu.h"
#include "iommu.h"
-#define PHYS_JJ_IOMMU 0x10000000 /* First page of sun4m IOMMU */
#define IOPERM (IOPTE_CACHE | IOPTE_WRITE | IOPTE_VALID)
#define MKIOPTE(phys) (((((phys)>>4) & IOPTE_PAGE) | IOPERM) & ~IOPTE_WAZ)
#define LOWMEMSZ 32 * 1024 * 1024
@@ -61,7 +60,8 @@
#define NCTX_SWIFT 0x100
-static void iommu_init(struct iommu *t);
+static void iommu_init(struct iommu *t, unsigned long base);
+
static void
iommu_invalidate(struct iommu_regs *regs) {
regs->tlbflush = 0;
@@ -199,11 +199,72 @@
* Switch page tables.
*/
void
-init_mmu_swift(void)
+init_mmu_swift(unsigned long base)
{
+ extern unsigned int qemu_mem_size;
unsigned int addr, i;
unsigned long pa, va;
+ push_str("/memory");
+ fword("find-device");
+
+ PUSH(0);
+ fword("encode-int");
+ PUSH(0);
+ fword("encode-int");
+ fword("encode+");
+ PUSH(qemu_mem_size);
+ fword("encode-int");
+ fword("encode+");
+ push_str("reg");
+ fword("property");
+
+ PUSH(0);
+ fword("encode-int");
+ PUSH(0);
+ fword("encode-int");
+ fword("encode+");
+ PUSH(va2pa((unsigned long)&_data) - 1);
+ fword("encode-int");
+ fword("encode+");
+ push_str("available");
+ fword("property");
+
+ push_str("/virtual-memory");
+ fword("find-device");
+
+ PUSH(0);
+ fword("encode-int");
+ PUSH(base);
+ fword("encode-int");
+ fword("encode+");
+ PUSH(0x300);
+ fword("encode-int");
+ fword("encode+");
+ push_str("reg");
+ fword("property");
+
+ PUSH(0);
+ fword("encode-int");
+ PUSH(0);
+ fword("encode-int");
+ fword("encode+");
+ PUSH(va2pa((unsigned long)&_start) - 1);
+ fword("encode-int");
+ fword("encode+");
+
+ PUSH(0);
+ fword("encode-int");
+ fword("encode+");
+ PUSH(va2pa((unsigned long)&_iomem));
+ fword("encode-int");
+ fword("encode+");
+ PUSH(-va2pa((unsigned long)&_iomem));
+ fword("encode-int");
+ fword("encode+");
+ push_str("available");
+ fword("property");
+
mem_init(&cio, (char *)&_end, (char *)&_iomem);
context_table = mem_zalloc(&cmem, NCTX_SWIFT * sizeof(int), NCTX_SWIFT * sizeof(int));
@@ -249,7 +310,7 @@
srmmu_set_context(0);
srmmu_set_ctable_ptr(va2pa((unsigned long)context_table));
srmmu_flush_whole_tlb();
- iommu_init(&ciommu);
+ iommu_init(&ciommu, base);
}
/*
* XXX This is a problematic interface. We alloc _memory_ which is uncached.
@@ -311,7 +372,7 @@
* the routine is higher in food chain.
*/
static void
-iommu_init(struct iommu *t)
+iommu_init(struct iommu *t, unsigned long base)
{
unsigned int *ptab;
int ptsize;
@@ -319,7 +380,7 @@
unsigned int impl, vers;
unsigned int tmp;
- if ((regs = map_io(PHYS_JJ_IOMMU, sizeof(struct iommu_regs))) == 0) {
+ if ((regs = map_io(base, sizeof(struct iommu_regs))) == 0) {
DPRINTF("Cannot map IOMMU\n");
for (;;) { }
}
Modified: openbios-devel/drivers/obio.c
===================================================================
--- openbios-devel/drivers/obio.c 2006-05-22 10:37:34 UTC (rev 25)
+++ openbios-devel/drivers/obio.c 2006-05-22 22:10:54 UTC (rev 26)
@@ -17,69 +17,395 @@
#include "libc/vsprintf.h"
#include "openbios/drivers.h"
+#include "openbios/nvram.h"
+#include "obio.h"
+#define REGISTER_NAMED_NODE( name, path ) do { \
+ bind_new_node( name##_flags_, name##_size_, \
+ path, name##_m, sizeof(name##_m)/sizeof(method_t)); \
+ } while(0)
+
+
+/* DECLARE data structures for the nodes. */
+DECLARE_UNNAMED_NODE( ob_obio, INSTALL_OPEN, sizeof(int) );
+
static void
-ob_zs_init(unsigned long slavio_base)
+ob_new_obio_device(const char *name, const char *type)
{
- unsigned long zs_addr;
+ push_str("/obio");
+ fword("find-device");
+ fword("new-device");
- zs_addr = (unsigned long)map_io(slavio_base + 0x0, 8);
- push_str("/obio/zs@0,0");
- fword("find-device");
-
- PUSH(zs_addr);
+ push_str(name);
+ fword("device-name");
+
+ if (type) {
+ push_str(type);
+ fword("device-type");
+ }
+}
+
+static unsigned long
+ob_reg(unsigned long base, unsigned long offset, unsigned long size, int map)
+{
+ PUSH(0);
fword("encode-int");
- PUSH(sizeof(zs_addr));
+ PUSH(offset);
fword("encode-int");
fword("encode+");
- push_str("address");
+ PUSH(size);
+ fword("encode-int");
+ fword("encode+");
+ push_str("reg");
fword("property");
- zs_addr = (unsigned long)map_io(slavio_base + 0x00100000, 8);
- push_str("/obio/zs@0,100000");
+ if (map) {
+ unsigned long addr;
+
+ addr = (unsigned long)map_io(base + offset, size);
+
+ PUSH(addr);
+ fword("encode-int");
+ PUSH(4);
+ fword("encode-int");
+ fword("encode+");
+ push_str("address");
+ fword("property");
+ return addr;
+ }
+ return 0;
+}
+
+static void
+ob_intr(int intr)
+{
+ PUSH(intr);
+ fword("encode-int");
+ PUSH(0);
+ fword("encode-int");
+ fword("encode+");
+ push_str("intr");
+ fword("property");
+}
+
+
+static void
+ob_zs_init(unsigned long base, unsigned long offset, int intr, int slave, int keyboard)
+{
+ ob_new_obio_device("zs", "serial");
+
+ ob_reg(base, offset, ZS_REGS, 1);
+
+ PUSH(slave);
+ fword("encode-int");
+ push_str("slave");
+ fword("property");
+
+ if (keyboard) {
+ PUSH(-1);
+ fword("encode-int");
+ push_str("keyboard");
+ fword("property");
+
+ PUSH(-1);
+ fword("encode-int");
+ push_str("mouse");
+ fword("property");
+ }
+
+ ob_intr(intr);
+
+ fword("finish-device");
+}
+
+static char *nvram;
+struct qemu_nvram_v1 nv_info;
+
+void
+arch_nvram_get(char *data)
+{
+ memcpy(data, nvram, NVRAM_SIZE);
+}
+
+void
+arch_nvram_put(char *data)
+{
+ memcpy(nvram, data, NVRAM_SIZE);
+}
+
+int
+arch_nvram_size(void)
+{
+ return NVRAM_SIZE;
+}
+
+static void
+ob_nvram_init(unsigned long base, unsigned long offset)
+{
+ extern uint32_t kernel_image;
+ extern uint32_t kernel_size;
+ extern uint32_t cmdline;
+ extern uint32_t cmdline_size;
+ extern char boot_device;
+
+ ob_new_obio_device("eeprom", NULL);
+
+ nvram = (char *)ob_reg(base, offset, NVRAM_SIZE, 1);
+
+ memcpy(&nv_info, nvram, sizeof(nv_info));
+
+ printk("Nvram id %s, version %d\n", nv_info.id_string, nv_info.version);
+ if (strcmp(nv_info.id_string, "QEMU_BIOS") || nv_info.version != 1) {
+ printk("Unknown nvram, freezing!\n");
+ for (;;);
+ }
+ kernel_image = nv_info.kernel_image;
+ kernel_size = nv_info.kernel_size;
+ cmdline = nv_info.cmdline;
+ cmdline_size = nv_info.cmdline_size;
+ boot_device = nv_info.boot_device;
+
+ push_str("mk48t08");
+ fword("model");
+
+ fword("finish-device");
+
+ push_str("/");
fword("find-device");
- PUSH(zs_addr);
+ PUSH((long)&nvram[NVRAM_IDPROM]);
+ PUSH(32);
+ fword("encode-bytes");
+ push_str("idprom");
+ fword("property");
+}
+
+static void
+ob_fd_init(unsigned long base, unsigned long offset, int intr)
+{
+ ob_new_obio_device("SUNW,fdtwo", "block");
+
+ ob_reg(base, offset, FD_REGS, 0);
+
+ ob_intr(intr);
+
+ fword("finish-device");
+}
+
+
+static void
+ob_sconfig_init(unsigned long base, unsigned long offset)
+{
+ ob_new_obio_device("slavioconfig", NULL);
+
+ ob_reg(base, offset, SCONFIG_REGS, 0);
+
+ fword("finish-device");
+}
+
+static void
+ob_auxio_init(unsigned long base, unsigned long offset)
+{
+ ob_new_obio_device("auxio", NULL);
+
+ ob_reg(base, offset, AUXIO_REGS, 0);
+
+ fword("finish-device");
+}
+
+static void
+ob_power_init(unsigned long base, unsigned long offset, int intr)
+{
+ ob_new_obio_device("power", NULL);
+
+ ob_reg(base, offset, POWER_REGS, 0);
+
+ ob_intr(intr);
+
+ fword("finish-device");
+}
+
+static void
+ob_counter_init(unsigned long base, unsigned long offset)
+{
+ volatile struct sun4m_timer_regs *regs;
+
+ ob_new_obio_device("counter", NULL);
+
+ PUSH(0);
fword("encode-int");
- PUSH(sizeof(zs_addr));
+ PUSH(offset);
fword("encode-int");
fword("encode+");
- push_str("address");
+ PUSH(COUNTER_REGS);
+ fword("encode-int");
+ fword("encode+");
+ PUSH(0);
+ fword("encode-int");
+ fword("encode+");
+ PUSH(offset + 0x10000);
+ fword("encode-int");
+ fword("encode+");
+ PUSH(COUNTER_REGS);
+ fword("encode-int");
+ fword("encode+");
+ push_str("reg");
fword("property");
+
+ fword("finish-device");
+
+ regs = map_io(base + offset, sizeof(*regs));
+ regs->l10_timer_limit = (((1000000/100) + 1) << 10);
+ regs->cpu_timers[0].l14_timer_limit = 0;
}
static void
-ob_obio_open(int *idx)
+ob_interrupt_init(unsigned long base, unsigned long offset)
{
+ volatile struct sun4m_intregs *regs;
+
+ ob_new_obio_device("interrupt", NULL);
+
+ PUSH(0);
+ fword("encode-int");
+ PUSH(offset);
+ fword("encode-int");
+ fword("encode+");
+ PUSH(INTERRUPT_REGS);
+ fword("encode-int");
+ fword("encode+");
+ PUSH(0);
+ fword("encode-int");
+ fword("encode+");
+ PUSH(offset + 0x10000);
+ fword("encode-int");
+ fword("encode+");
+ PUSH(INTERRUPT_REGS);
+ fword("encode-int");
+ fword("encode+");
+ push_str("reg");
+ fword("property");
+
+ fword("finish-device");
+
+ regs = map_io(base + offset, sizeof(*regs));
+ regs->set = ~SUN4M_INT_MASKALL;
+ regs->cpu_intregs[0].clear = ~0x17fff;
+}
+
+
+static void
+ob_obio_open(__attribute__((unused))int *idx)
+{
int ret=1;
RET ( -ret );
}
static void
-ob_obio_close(int *idx)
+ob_obio_close(__attribute__((unused))int *idx)
{
selfword("close-deblocker");
}
static void
-ob_obio_initialize(int *idx)
+ob_obio_initialize(__attribute__((unused))int *idx)
{
+ push_str("/");
+ fword("find-device");
+ fword("new-device");
+
+ push_str("obio");
+ fword("device-name");
+
+ push_str("hierarchical");
+ fword("device-type");
+
+ PUSH(2);
+ fword("encode-int");
+ push_str("#address-cells");
+ fword("property");
+
+ PUSH(1);
+ fword("encode-int");
+ push_str("#size-cells");
+ fword("property");
+
+ fword("finish-device");
}
+static void
+ob_set_obio_ranges(unsigned long base)
+{
+ push_str("/obio");
+ fword("find-device");
+ PUSH(0);
+ fword("encode-int");
+ PUSH(0);
+ fword("encode-int");
+ fword("encode+");
+ PUSH(0);
+ fword("encode-int");
+ fword("encode+");
+ PUSH(base);
+ fword("encode-int");
+ fword("encode+");
+ PUSH(SLAVIO_SIZE);
+ fword("encode-int");
+ fword("encode+");
+ push_str("ranges");
+ fword("property");
+}
-NODE_METHODS(ob_obio_node) = {
+static void
+ob_obio_decodeunit(__attribute__((unused)) int *idx)
+{
+ fword("decode-unit-sbus");
+}
+
+
+static void
+ob_obio_encodeunit(__attribute__((unused)) int *idx)
+{
+ fword("encode-unit-sbus");
+}
+
+NODE_METHODS(ob_obio) = {
{ NULL, ob_obio_initialize },
{ "open", ob_obio_open },
{ "close", ob_obio_close },
+ { "encode-unit", ob_obio_encodeunit },
+ { "decode-unit", ob_obio_decodeunit },
};
-int ob_obio_init(unsigned long slavio_base)
+int
+ob_obio_init(unsigned long slavio_base)
{
//printk("Initializing OBIO devices...\n");
-
- ob_zs_init(slavio_base);
-
+#if 0 // XXX
+ REGISTER_NAMED_NODE(ob_obio, "/obio");
+ device_end();
+ ob_set_obio_ranges(slavio_base);
+#endif
+
+ ob_zs_init(slavio_base, SLAVIO_ZS, ZS_INTR, 1, 1);
+
+ ob_zs_init(slavio_base, SLAVIO_ZS1, ZS_INTR, 0, 0);
+
+ ob_nvram_init(slavio_base, SLAVIO_NVRAM);
+
+ ob_fd_init(slavio_base, SLAVIO_FD, FD_INTR);
+
+ ob_sconfig_init(slavio_base, SLAVIO_SCONFIG);
+
+ ob_auxio_init(slavio_base, SLAVIO_AUXIO);
+
+ ob_power_init(slavio_base, SLAVIO_POWER, POWER_INTR);
+
+ ob_counter_init(slavio_base, SLAVIO_COUNTER);
+
+ ob_interrupt_init(slavio_base, SLAVIO_INTERRUPT);
+
return 0;
}
Added: openbios-devel/drivers/obio.h
===================================================================
--- openbios-devel/drivers/obio.h (rev 0)
+++ openbios-devel/drivers/obio.h 2006-05-22 22:10:54 UTC (rev 26)
@@ -0,0 +1,187 @@
+/* Addresses, interrupt numbers, register sizes */
+
+#define SLAVIO_ZS 0x00000000
+#define SLAVIO_ZS1 0x00100000
+#define ZS_INTR 0x2c
+#define ZS_REGS 8
+
+#define SLAVIO_NVRAM 0x00200000
+#define NVRAM_SIZE 0x2000
+#define NVRAM_IDPROM 0x1fd8
+
+#define SLAVIO_FD 0x00400000
+#define FD_REGS 15
+#define FD_INTR 0x2b
+
+#define SLAVIO_SCONFIG 0x00800000
+#define SCONFIG_REGS 1
+
+#define SLAVIO_AUXIO 0x00900000
+#define AUXIO_REGS 1
+
+#define SLAVIO_POWER 0x00910000
+#define POWER_REGS 1
+#define POWER_INTR 0x22
+
+#define SLAVIO_COUNTER 0x00d00000
+#define COUNTER_REGS 0x10
+
+#define SLAVIO_INTERRUPT 0x00e00000
+#define INTERRUPT_REGS 0x10
+
+#define SLAVIO_SIZE 0x01000000
+
+struct qemu_nvram_v1 {
+ char id_string[16];
+ uint32_t version;
+ uint32_t nvram_size; // not used in Sun4m
+ char unused1[8];
+ char arch[12];
+ char smp_cpus;
+ char unused2;
+ char nographic;
+ uint32_t ram_size;
+ char boot_device;
+ char unused3[3];
+ uint32_t kernel_image;
+ uint32_t kernel_size;
+ uint32_t cmdline;
+ uint32_t cmdline_size;
+ uint32_t initrd_image;
+ uint32_t initrd_size;
+ uint32_t nvram_image;
+ uint16_t width;
+ uint16_t height;
+ uint16_t depth;
+ char unused4[158];
+ uint16_t crc;
+};
+
+#define SUN4M_NCPUS 16
+#define PAGE_SIZE 4096
+
+/* linux/include/asm-sparc/timer.h */
+
+/* A sun4m has two blocks of registers which are probably of the same
+ * structure. LSI Logic's L64851 is told to _decrement_ from the limit
+ * value. Aurora behaves similarly but its limit value is compacted in
+ * other fashion (it's wider). Documented fields are defined here.
+ */
+
+/* As with the interrupt register, we have two classes of timer registers
+ * which are per-cpu and master. Per-cpu timers only hit that cpu and are
+ * only level 14 ticks, master timer hits all cpus and is level 10.
+ */
+
+#define SUN4M_PRM_CNT_L 0x80000000
+#define SUN4M_PRM_CNT_LVALUE 0x7FFFFC00
+
+struct sun4m_timer_percpu_info {
+ __volatile__ unsigned int l14_timer_limit; /* Initial value is 0x009c4000 */
+ __volatile__ unsigned int l14_cur_count;
+
+ /* This register appears to be write only and/or inaccessible
+ * on Uni-Processor sun4m machines.
+ */
+ __volatile__ unsigned int l14_limit_noclear; /* Data access error is here */
+
+ __volatile__ unsigned int cntrl; /* =1 after POST on Aurora */
+ __volatile__ unsigned char space[PAGE_SIZE - 16];
+};
+
+struct sun4m_timer_regs {
+ struct sun4m_timer_percpu_info cpu_timers[SUN4M_NCPUS];
+ volatile unsigned int l10_timer_limit;
+ volatile unsigned int l10_cur_count;
+
+ /* Again, this appears to be write only and/or inaccessible
+ * on uni-processor sun4m machines.
+ */
+ volatile unsigned int l10_limit_noclear;
+
+ /* This register too, it must be magic. */
+ volatile unsigned int foobar;
+
+ volatile unsigned int cfg; /* equals zero at boot time... */
+};
+
+/*
+ * Registers of hardware timer in sun4m.
+ */
+struct sun4m_timer_percpu {
+ volatile unsigned int l14_timer_limit; /* Initial value is 0x009c4000 */
+ volatile unsigned int l14_cur_count;
+};
+
+struct sun4m_timer_global {
+ volatile unsigned int l10_timer_limit;
+ volatile unsigned int l10_cur_count;
+};
+
+/* linux/include/asm-sparc/irq.h */
+
+/* These registers are used for sending/receiving irqs from/to
+ * different cpu's.
+ */
+struct sun4m_intreg_percpu {
+ unsigned int tbt; /* Interrupts still pending for this cpu. */
+
+ /* These next two registers are WRITE-ONLY and are only
+ * "on bit" sensitive, "off bits" written have NO affect.
+ */
+ unsigned int clear; /* Clear this cpus irqs here. */
+ unsigned int set; /* Set this cpus irqs here. */
+ unsigned char space[PAGE_SIZE - 12];
+};
+
+/*
+ * djhr
+ * Actually the clear and set fields in this struct are misleading..
+ * according to the SLAVIO manual (and the same applies for the SEC)
+ * the clear field clears bits in the mask which will ENABLE that IRQ
+ * the set field sets bits in the mask to DISABLE the IRQ.
+ *
+ * Also the undirected_xx address in the SLAVIO is defined as
+ * RESERVED and write only..
+ *
+ * DAVEM_NOTE: The SLAVIO only specifies behavior on uniprocessor
+ * sun4m machines, for MP the layout makes more sense.
+ */
+struct sun4m_intregs {
+ struct sun4m_intreg_percpu cpu_intregs[SUN4M_NCPUS];
+ unsigned int tbt; /* IRQ's that are still pending. */
+ unsigned int irqs; /* Master IRQ bits. */
+
+ /* Again, like the above, two these registers are WRITE-ONLY. */
+ unsigned int clear; /* Clear master IRQ's by setting bits here. */
+ unsigned int set; /* Set master IRQ's by setting bits here. */
+
+ /* This register is both READ and WRITE. */
+ unsigned int undirected_target; /* Which cpu gets undirected irqs. */
+};
+
+/* Dave Redman (djhr(a)tadpole.co.uk)
+ * The sun4m interrupt registers.
+ */
+#define SUN4M_INT_ENABLE 0x80000000
+#define SUN4M_INT_E14 0x00000080
+#define SUN4M_INT_E10 0x00080000
+
+#define SUN4M_HARD_INT(x) (0x000000001 << (x))
+#define SUN4M_SOFT_INT(x) (0x000010000 << (x))
+
+#define SUN4M_INT_MASKALL 0x80000000 /* mask all interrupts */
+#define SUN4M_INT_MODULE_ERR 0x40000000 /* module error */
+#define SUN4M_INT_M2S_WRITE 0x20000000 /* write buffer error */
+#define SUN4M_INT_ECC 0x10000000 /* ecc memory error */
+#define SUN4M_INT_FLOPPY 0x00400000 /* floppy disk */
+#define SUN4M_INT_MODULE 0x00200000 /* module interrupt */
+#define SUN4M_INT_VIDEO 0x00100000 /* onboard video */
+#define SUN4M_INT_REALTIME 0x00080000 /* system timer */
+#define SUN4M_INT_SCSI 0x00040000 /* onboard scsi */
+#define SUN4M_INT_AUDIO 0x00020000 /* audio/isdn */
+#define SUN4M_INT_ETHERNET 0x00010000 /* onboard ethernet */
+#define SUN4M_INT_SERIAL 0x00008000 /* serial ports */
+#define SUN4M_INT_KBDMS 0x00004000 /* keyboard/mouse */
+#define SUN4M_INT_SBUSBITS 0x00003F80 /* sbus int bits */
+
1
0
r25 - in openbios-devel: config/examples drivers include/libc include/sparc32 modules toke
by svn＠openbios.org 22 May '06
by svn＠openbios.org 22 May '06
22 May '06
Author: stepan
Date: 2006-05-22 12:37:34 +0200 (Mon, 22 May 2006)
New Revision: 25
Modified:
openbios-devel/config/examples/cross-sparc32_config.xml
openbios-devel/config/examples/cross-sparc32_rules.xml
openbios-devel/config/examples/sparc32_config.xml
openbios-devel/config/examples/sparc32_rules.xml
openbios-devel/drivers/esp.c
openbios-devel/drivers/iommu.c
openbios-devel/drivers/pgtsrmmu.h
openbios-devel/include/libc/string.h
openbios-devel/include/sparc32/io.h
openbios-devel/modules/nvram.c
openbios-devel/toke/stream.c
Log:
blueswirl -14 generic and sparc32 related code
Modified: openbios-devel/config/examples/cross-sparc32_config.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc32_config.xml 2006-05-22 10:33:31 UTC (rev 24)
+++ openbios-devel/config/examples/cross-sparc32_config.xml 2006-05-22 10:37:34 UTC (rev 25)
@@ -46,20 +46,20 @@
<option name="CONFIG_SUN_PARTS" type="boolean" value="true"/>
<option name="CONFIG_FS" type="boolean" value="true"/>
<option name="CONFIG_HFS" type="boolean" value="false"/>
- <option name="CONFIG_HFSP" type="boolean" value="false"/>
+ <option name="CONFIG_HFSP" type="boolean" value="true"/>
<option name="CONFIG_GRUBFS" type="boolean" value="true"/>
<option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/>
- <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/>
- <option name="CONFIG_FSYS_JFS" type="boolean" value="false"/>
- <option name="CONFIG_FSYS_MINIX" type="boolean" value="false"/>
- <option name="CONFIG_FSYS_REISERFS" type="boolean" value="false"/>
- <option name="CONFIG_FSYS_XFS" type="boolean" value="false"/>
+ <option name="CONFIG_FSYS_FAT" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_JFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_MINIX" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_REISERFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_XFS" type="boolean" value="true"/>
<option name="CONFIG_FSYS_UFS" type="boolean" value="true"/>
<option name="CONFIG_FSYS_ISO9660" type="boolean" value="true"/>
- <option name="CONFIG_FSYS_FFS" type="boolean" value="false"/>
- <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="false"/>
+ <option name="CONFIG_FSYS_FFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="true"/>
<option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/>
- <option name="CONFIG_FSYS_AFFS" type="boolean" value="false"/>
+ <option name="CONFIG_FSYS_AFFS" type="boolean" value="true"/>
<option name="CONFIG_DEBUG_FS" type="boolean" value="false"/>
<!-- Miscellaneous -->
@@ -69,7 +69,7 @@
<option name="CONFIG_DRIVER_SBUS" type="boolean" value="true"/>
<option name="CONFIG_DRIVER_OBIO" type="boolean" value="true"/>
<option name="CONFIG_DRIVER_ESP" type="boolean" value="true"/>
- <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="false"/>
+ <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/>
</config>
Modified: openbios-devel/config/examples/cross-sparc32_rules.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc32_rules.xml 2006-05-22 10:33:31 UTC (rev 24)
+++ openbios-devel/config/examples/cross-sparc32_rules.xml 2006-05-22 10:37:34 UTC (rev 25)
@@ -21,6 +21,8 @@
STRIP := sparc-linux-strip
RANLIB := sparc-linux-ranlib
CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g
+CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations
+CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing
INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
#
Modified: openbios-devel/config/examples/sparc32_config.xml
===================================================================
--- openbios-devel/config/examples/sparc32_config.xml 2006-05-22 10:33:31 UTC (rev 24)
+++ openbios-devel/config/examples/sparc32_config.xml 2006-05-22 10:37:34 UTC (rev 25)
@@ -46,20 +46,20 @@
<option name="CONFIG_SUN_PARTS" type="boolean" value="true"/>
<option name="CONFIG_FS" type="boolean" value="true"/>
<option name="CONFIG_HFS" type="boolean" value="false"/>
- <option name="CONFIG_HFSP" type="boolean" value="false"/>
+ <option name="CONFIG_HFSP" type="boolean" value="true"/>
<option name="CONFIG_GRUBFS" type="boolean" value="true"/>
<option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/>
- <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/>
- <option name="CONFIG_FSYS_JFS" type="boolean" value="false"/>
- <option name="CONFIG_FSYS_MINIX" type="boolean" value="false"/>
- <option name="CONFIG_FSYS_REISERFS" type="boolean" value="false"/>
- <option name="CONFIG_FSYS_XFS" type="boolean" value="false"/>
+ <option name="CONFIG_FSYS_FAT" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_JFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_MINIX" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_REISERFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_XFS" type="boolean" value="true"/>
<option name="CONFIG_FSYS_UFS" type="boolean" value="true"/>
<option name="CONFIG_FSYS_ISO9660" type="boolean" value="true"/>
- <option name="CONFIG_FSYS_FFS" type="boolean" value="false"/>
- <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="false"/>
+ <option name="CONFIG_FSYS_FFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="true"/>
<option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/>
- <option name="CONFIG_FSYS_AFFS" type="boolean" value="false"/>
+ <option name="CONFIG_FSYS_AFFS" type="boolean" value="true"/>
<option name="CONFIG_DEBUG_FS" type="boolean" value="false"/>
<!-- Miscellaneous -->
@@ -69,7 +69,7 @@
<option name="CONFIG_DRIVER_SBUS" type="boolean" value="true"/>
<option name="CONFIG_DRIVER_OBIO" type="boolean" value="true"/>
<option name="CONFIG_DRIVER_ESP" type="boolean" value="true"/>
- <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="false"/>
+ <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/>
</config>
Modified: openbios-devel/config/examples/sparc32_rules.xml
===================================================================
--- openbios-devel/config/examples/sparc32_rules.xml 2006-05-22 10:33:31 UTC (rev 24)
+++ openbios-devel/config/examples/sparc32_rules.xml 2006-05-22 10:37:34 UTC (rev 25)
@@ -27,6 +27,8 @@
endif
CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g
+CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations
+CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing
INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
#
Modified: openbios-devel/drivers/esp.c
===================================================================
--- openbios-devel/drivers/esp.c 2006-05-22 10:33:31 UTC (rev 24)
+++ openbios-devel/drivers/esp.c 2006-05-22 10:37:34 UTC (rev 25)
@@ -263,7 +263,10 @@
id = POP();
*sd = &global_esp->sd[id];
- DPRINTF("opening drive %d\n", id);
+#ifdef CONFIG_DEBUG_ESP
+ fword("my-args");
+ DPRINTF("opening drive %d args %s\n", id, pop_fstr_copy());
+#endif
selfword("open-deblocker");
@@ -393,7 +396,7 @@
};
static void
-add_alias(const unsigned char *device, const unsigned char *alias)
+add_alias(const char *device, const char *alias)
{
push_str("/aliases");
fword("find-device");
@@ -413,6 +416,11 @@
DPRINTF("Initializing SCSI...");
esp = malloc(sizeof(esp_private_t));
+ if (!esp) {
+ DPRINTF("Can't allocate ESP private structure\n");
+ return -1;
+ }
+
global_esp = esp;
if (espdma_init(&esp->espdma) != 0) {
@@ -433,7 +441,9 @@
// Chip reset
esp->ll->regs[ESP_CMD] = ESP_CMD_RC;
-
+
+ DPRINTF("ESP at 0x%lx, buffer va 0x%lx dva 0x%lx\n", (unsigned long)esp,
+ (unsigned long)esp->buffer, (unsigned long)esp->buffer_dvma);
DPRINTF("done\n");
DPRINTF("Initializing SCSI devices...");
@@ -448,8 +458,7 @@
#endif
}
- sprintf(nodebuff, "/iommu/sbus/espdma/esp");
- REGISTER_NAMED_NODE(ob_esp, nodebuff);
+ REGISTER_NAMED_NODE(ob_esp, "/iommu/sbus/espdma/esp");
device_end();
for (id = 0; id < 8; id++) {
Modified: openbios-devel/drivers/iommu.c
===================================================================
--- openbios-devel/drivers/iommu.c 2006-05-22 10:33:31 UTC (rev 24)
+++ openbios-devel/drivers/iommu.c 2006-05-22 10:37:34 UTC (rev 25)
@@ -70,7 +70,7 @@
/*
* Allocate memory. This is reusable.
*/
-static void
+void
mem_init(struct mem *t, char *begin, char *limit)
{
t->start = begin;
@@ -82,8 +82,14 @@
mem_alloc(struct mem *t, int size, int align)
{
char *p;
+ unsigned long pa;
- p = (char *)((((unsigned int)t->curp) + (align-1)) & ~(align-1));
+ // The alignment restrictions refer to physical, not virtual
+ // addresses
+ pa = va2pa((unsigned long)t->curp) + (align - 1);
+ pa &= ~(align - 1);
+ p = (char *)pa2va(pa);
+
if (p >= t->uplim || p + size > t->uplim)
return 0;
t->curp = p + size;
@@ -193,12 +199,11 @@
* Switch page tables.
*/
void
-init_mmu_swift()
+init_mmu_swift(void)
{
unsigned int addr, i;
unsigned long pa, va;
- mem_init(&cmem, (char *) &_vmem, (char *)&_evmem);
mem_init(&cio, (char *)&_end, (char *)&_iomem);
context_table = mem_zalloc(&cmem, NCTX_SWIFT * sizeof(int), NCTX_SWIFT * sizeof(int));
@@ -343,11 +348,12 @@
/* flush_cache_all(); */
/** flush_tlb_all(); **/
- regs->base = ((unsigned int)va2pa((unsigned long)ptab)) >> 4;
+ tmp = (unsigned int)va2pa((unsigned long)ptab);
+ regs->base = tmp >> 4;
iommu_invalidate(regs);
- DPRINTF("IOMMU: impl %d vers %d page table at 0x%p of size %d bytes\n",
- impl, vers, t->page_table, ptsize);
+ DPRINTF("IOMMU: impl %d vers %d page table at 0x%p (pa 0x%x) of size %d bytes\n",
+ impl, vers, t->page_table, tmp, ptsize);
mem_init(&t->bmap, (char*)t->plow, (char *)0xfffff000);
}
Modified: openbios-devel/drivers/pgtsrmmu.h
===================================================================
--- openbios-devel/drivers/pgtsrmmu.h 2006-05-22 10:33:31 UTC (rev 24)
+++ openbios-devel/drivers/pgtsrmmu.h 2006-05-22 10:37:34 UTC (rev 25)
@@ -83,7 +83,7 @@
#ifndef __ASSEMBLY__
/* Accessing the MMU control register. */
-extern __inline__ unsigned int srmmu_get_mmureg(void)
+static __inline__ unsigned int srmmu_get_mmureg(void)
{
unsigned int retval;
__asm__ __volatile__("lda [%%g0] %1, %0\n\t" :
@@ -92,14 +92,14 @@
return retval;
}
-extern __inline__ void srmmu_set_mmureg(unsigned long regval)
+static __inline__ void srmmu_set_mmureg(unsigned long regval)
{
__asm__ __volatile__("sta %0, [%%g0] %1\n\t" : :
"r" (regval), "i" (ASI_M_MMUREGS) : "memory");
}
-extern __inline__ void srmmu_set_ctable_ptr(unsigned long paddr)
+static __inline__ void srmmu_set_ctable_ptr(unsigned long paddr)
{
paddr = ((paddr >> 4) & SRMMU_CTX_PMASK);
__asm__ __volatile__("sta %0, [%1] %2\n\t" : :
@@ -108,7 +108,7 @@
"memory");
}
-extern __inline__ unsigned long srmmu_get_ctable_ptr(void)
+static __inline__ unsigned long srmmu_get_ctable_ptr(void)
{
unsigned int retval;
@@ -119,14 +119,14 @@
return (retval & SRMMU_CTX_PMASK) << 4;
}
-extern __inline__ void srmmu_set_context(int context)
+static __inline__ void srmmu_set_context(int context)
{
__asm__ __volatile__("sta %0, [%1] %2\n\t" : :
"r" (context), "r" (SRMMU_CTX_REG),
"i" (ASI_M_MMUREGS) : "memory");
}
-extern __inline__ int srmmu_get_context(void)
+static __inline__ int srmmu_get_context(void)
{
register int retval;
__asm__ __volatile__("lda [%1] %2, %0\n\t" :
@@ -136,7 +136,7 @@
return retval;
}
-extern __inline__ unsigned int srmmu_get_fstatus(void)
+static __inline__ unsigned int srmmu_get_fstatus(void)
{
unsigned int retval;
@@ -146,7 +146,7 @@
return retval;
}
-extern __inline__ unsigned int srmmu_get_faddr(void)
+static __inline__ unsigned int srmmu_get_faddr(void)
{
unsigned int retval;
@@ -157,7 +157,7 @@
}
/* This is guaranteed on all SRMMU's. */
-extern __inline__ void srmmu_flush_whole_tlb(void)
+static __inline__ void srmmu_flush_whole_tlb(void)
{
__asm__ __volatile__("sta %%g0, [%0] %1\n\t": :
"r" (0x400), /* Flush entire TLB!! */
@@ -166,7 +166,7 @@
}
/* These flush types are not available on all chips... */
-extern __inline__ void srmmu_flush_tlb_ctx(void)
+static __inline__ void srmmu_flush_tlb_ctx(void)
{
__asm__ __volatile__("sta %%g0, [%0] %1\n\t": :
"r" (0x300), /* Flush TLB ctx.. */
@@ -174,7 +174,7 @@
}
-extern __inline__ void srmmu_flush_tlb_region(unsigned long addr)
+static __inline__ void srmmu_flush_tlb_region(unsigned long addr)
{
addr &= SRMMU_PGDIR_MASK;
__asm__ __volatile__("sta %%g0, [%0] %1\n\t": :
@@ -184,7 +184,7 @@
}
-extern __inline__ void srmmu_flush_tlb_segment(unsigned long addr)
+static __inline__ void srmmu_flush_tlb_segment(unsigned long addr)
{
addr &= SRMMU_PMD_MASK;
__asm__ __volatile__("sta %%g0, [%0] %1\n\t": :
@@ -193,7 +193,7 @@
}
-extern __inline__ void srmmu_flush_tlb_page(unsigned long page)
+static __inline__ void srmmu_flush_tlb_page(unsigned long page)
{
page &= PAGE_MASK;
__asm__ __volatile__("sta %%g0, [%0] %1\n\t": :
@@ -202,7 +202,7 @@
}
-extern __inline__ unsigned long srmmu_hwprobe(unsigned long vaddr)
+static __inline__ unsigned long srmmu_hwprobe(unsigned long vaddr)
{
unsigned long retval;
@@ -214,7 +214,7 @@
return retval;
}
-extern __inline__ int
+static __inline__ int
srmmu_get_pte (unsigned long addr)
{
register unsigned long entry;
Modified: openbios-devel/include/libc/string.h
===================================================================
--- openbios-devel/include/libc/string.h 2006-05-22 10:33:31 UTC (rev 24)
+++ openbios-devel/include/libc/string.h 2006-05-22 10:37:34 UTC (rev 25)
@@ -42,7 +42,7 @@
extern void *memcpy(void * dest,const void *src,size_t count);
extern void *memmove(void * dest,const void *src,size_t count);
extern int memcmp(const void * cs,const void * ct,size_t count);
-extern void *memscan(void * addr, int c, size_t size);void * memscan(void * addr, int c, size_t size);
+extern void *memscan(void * addr, int c, size_t size);
extern char *strstr(const char * s1,const char * s2);
extern void *memchr(const void *s, int c, size_t n);
Modified: openbios-devel/include/sparc32/io.h
===================================================================
--- openbios-devel/include/sparc32/io.h 2006-05-22 10:33:31 UTC (rev 24)
+++ openbios-devel/include/sparc32/io.h 2006-05-22 10:37:34 UTC (rev 25)
@@ -4,7 +4,8 @@
#include "asm/types.h"
extern unsigned int va_shift; // Set in entry.S
-extern char _start, _data, _end, _vmem, _evmem, _iomem; // Defined in ldscript
+extern char _start, _data, _heap, _eheap, _stack, _estack, _end,
+ _vmem, _evmem,_iomem; // Defined in ldscript
static inline unsigned long
va2pa(unsigned long va)
@@ -32,11 +33,12 @@
struct mem;
+void mem_init(struct mem *t, char *begin, char *limit);
void *mem_alloc(struct mem *t, int size, int align);
void *mem_zalloc(struct mem *t, int size, int align);
int map_page(unsigned long va, unsigned long epa, int type);
void *map_io(unsigned pa, int size);
-void init_mmu_swift();
+void init_mmu_swift(void);
void *dvma_alloc(int size, unsigned int *pphys);
#ifndef BOOTSTRAP
Modified: openbios-devel/modules/nvram.c
===================================================================
--- openbios-devel/modules/nvram.c 2006-05-22 10:33:31 UTC (rev 24)
+++ openbios-devel/modules/nvram.c 2006-05-22 10:37:34 UTC (rev 25)
@@ -49,7 +49,7 @@
static unsigned int
nvpart_checksum( nvpart_t* hdr )
{
- unsigned char *p = (char*)hdr;
+ unsigned char *p = (unsigned char*)hdr;
int i, val = p[0];
for( i=2; i<16; i++ ) {
Modified: openbios-devel/toke/stream.c
===================================================================
--- openbios-devel/toke/stream.c 2006-05-22 10:33:31 UTC (rev 24)
+++ openbios-devel/toke/stream.c 2006-05-22 10:37:34 UTC (rev 25)
@@ -104,7 +104,7 @@
oname = (u8 *)strdup( out_name );
else {
ext=strrchr(in_name, '.');
- len=ext ? (ext-in_name) : (unsigned int)strlen(in_name) ;
+ len=ext ? (unsigned int)(ext-in_name) : (unsigned int)strlen(in_name) ;
oname=malloc(len+4);
memcpy(oname, in_name, len);
oname[len] = 0;
1
0
Author: stepan
Date: 2006-05-22 12:33:31 +0200 (Mon, 22 May 2006)
New Revision: 24
Added:
openbios-devel/arch/sparc32/libgcc/__lshrdi3.c
Modified:
openbios-devel/arch/sparc32/aoutload.c
openbios-devel/arch/sparc32/context.c
openbios-devel/arch/sparc32/entry.S
openbios-devel/arch/sparc32/ldscript
openbios-devel/arch/sparc32/lib.c
openbios-devel/arch/sparc32/libgcc/build.xml
openbios-devel/arch/sparc32/loadfs.c
openbios-devel/arch/sparc32/openbios.c
openbios-devel/arch/sparc32/romvec.c
openbios-devel/arch/sparc32/switch.S
openbios-devel/arch/sparc32/sys_info.c
openbios-devel/arch/sparc32/tree.fs
Log:
blueswirl -14 sparc32 related
Modified: openbios-devel/arch/sparc32/aoutload.c
===================================================================
--- openbios-devel/arch/sparc32/aoutload.c 2006-05-18 21:57:08 UTC (rev 23)
+++ openbios-devel/arch/sparc32/aoutload.c 2006-05-22 10:33:31 UTC (rev 24)
@@ -92,16 +92,16 @@
if (N_MAGIC(ehdr) == NMAGIC) {
if (lfile_read(start, ehdr.a_text) != ehdr.a_text) {
- printf("Can't read program text segment (size 0x%x)\n", ehdr.a_text);
+ printf("Can't read program text segment (size 0x%lx)\n", ehdr.a_text);
goto out;
}
if (lfile_read(start + N_DATADDR(ehdr), ehdr.a_data) != ehdr.a_data) {
- printf("Can't read program data segment (size 0x%x)\n", ehdr.a_data);
+ printf("Can't read program data segment (size 0x%lx)\n", ehdr.a_data);
goto out;
}
} else {
if (lfile_read(start, size) != size) {
- printf("Can't read program (size 0x%x)\n", size);
+ printf("Can't read program (size 0x%lx)\n", size);
goto out;
}
}
Modified: openbios-devel/arch/sparc32/context.c
===================================================================
--- openbios-devel/arch/sparc32/context.c 2006-05-18 21:57:08 UTC (rev 23)
+++ openbios-devel/arch/sparc32/context.c 2006-05-22 10:33:31 UTC (rev 24)
@@ -20,8 +20,8 @@
* It is placed at the bottom of our stack, and loaded by assembly routine
* to start us up.
*/
-struct context main_ctx __attribute__((section (".initctx"))) = {
- .regs[REG_SP] = (uint32_t) SP_LOC(&main_ctx),
+struct context main_ctx = {
+ .regs[REG_SP] = (uint32_t) &_estack - 96,
.pc = (uint32_t) start_main,
.npc = (uint32_t) start_main + 4,
.return_addr = (uint32_t) __exit_context,
Modified: openbios-devel/arch/sparc32/entry.S
===================================================================
--- openbios-devel/arch/sparc32/entry.S 2006-05-18 21:57:08 UTC (rev 23)
+++ openbios-devel/arch/sparc32/entry.S 2006-05-22 10:33:31 UTC (rev 24)
@@ -64,6 +64,7 @@
or %g3, 0x1, %g3
sta %g3, [%g2] ASI_M_BYPASS
add %g2, 0x4, %g2 ! s+0x800
+#if 0
set 0x40, %g6
set ((7 << 2) | 2), %g3 ! 7 = U: --- S: RWX (main memory)
1: sta %g3, [%g2] ASI_M_BYPASS
@@ -71,6 +72,9 @@
deccc %g6
bne 1b
nop
+#else
+ add %g2, 0x100, %g2
+#endif
! s+0x900
add %g2, 0xa00 - 0x900, %g3 ! l3 table for rom at s+0xa00
add %g2, 0x0d0, %g2 ! s+0x9d0
@@ -182,7 +186,7 @@
/* Zero out our BSS section. */
set _bss - 4, %o0 ! First address of BSS
- set _end, %o1 ! Last address of BSS
+ set _estack, %o1 ! Last address of BSS
ba 2f
nop
1:
@@ -192,8 +196,6 @@
bl 1b
add %o0, 0x4, %o0
- set _estack, %sp
- mov 0, %fp
mov 2, %g1
wr %g1, 0x0, %wim ! make window 1 invalid
WRITE_PAUSE
@@ -218,7 +220,7 @@
wr %g3, PSR_ET, %psr
WRITE_PAUSE
- call openbios
+ call __switch_context_nosave
nop
/* We get here when the main context switches back to
Modified: openbios-devel/arch/sparc32/ldscript
===================================================================
--- openbios-devel/arch/sparc32/ldscript 2006-05-18 21:57:08 UTC (rev 23)
+++ openbios-devel/arch/sparc32/ldscript 2006-05-22 10:33:31 UTC (rev 24)
@@ -1,6 +1,9 @@
OUTPUT_FORMAT(elf32-sparc)
OUTPUT_ARCH(sparc)
+/* Qemu ELF loader can't handle very complex files, so we put ELFBoot
+info to rodata and put initctx to data.*/
+
ENTRY(trap_table)
/* Initial load address
@@ -35,6 +38,7 @@
sound_drivers_end = .;
*(.rodata)
*(.rodata.*)
+ *(.note.ELFBoot)
}
.data ALIGN(4096): {
_data = .;
@@ -68,18 +72,12 @@
_estack = .;
}
- .initctx : {
- /* Initial contents of stack. This MUST BE just after the stack. */
- *(.initctx)
- }
- /* Putting ELF notes near beginning of file might help bootloaders.
- * We discard .note sections other than .note.ELFBoot,
- * because some versions of GCC generates useless ones. */
- .note : { *(.note.ELFBoot) }
-
. = ALIGN(4096);
_end = .;
_iomem = _end + IOMEM_SIZE;
- /DISCARD/ : { *(.comment.*) *(.note.*) }
+ /* We discard .note sections other than .note.ELFBoot,
+ * because some versions of GCC generates useless ones. */
+
+ /DISCARD/ : { *(.comment*) *(.note.*) }
}
Modified: openbios-devel/arch/sparc32/lib.c
===================================================================
--- openbios-devel/arch/sparc32/lib.c 2006-05-18 21:57:08 UTC (rev 23)
+++ openbios-devel/arch/sparc32/lib.c 2006-05-22 10:33:31 UTC (rev 24)
@@ -32,22 +32,11 @@
return i;
}
-// dumb quick memory allocator until we get a decent thing here.
-
-#define MEMSIZE 128*1024
-static char memory[MEMSIZE];
-static void *memptr=memory;
-static int memsize=MEMSIZE;
-
void *malloc(int size)
{
- void *ret=(void *)0;
- if(memsize>=size) {
- memsize-=size;
- ret=memptr;
- memptr+=size;
- }
- return ret;
+ extern struct mem cmem;
+
+ return mem_alloc(&cmem, size, 4);
}
void free(void *ptr)
Added: openbios-devel/arch/sparc32/libgcc/__lshrdi3.c
===================================================================
--- openbios-devel/arch/sparc32/libgcc/__lshrdi3.c (rev 0)
+++ openbios-devel/arch/sparc32/libgcc/__lshrdi3.c 2006-05-22 10:33:31 UTC (rev 24)
@@ -0,0 +1,62 @@
+/* lshrdi3.c extracted from gcc-2.7.2/libgcc2.c which is: */
+/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+
+This file is part of GNU CC.
+
+GNU CC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU CC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU CC; see the file COPYING. If not, write to
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
+
+#define BITS_PER_UNIT 8
+
+typedef int SItype __attribute__ ((mode (SI)));
+typedef unsigned int USItype __attribute__ ((mode (SI)));
+typedef int DItype __attribute__ ((mode (DI)));
+typedef int word_type __attribute__ ((mode (__word__)));
+
+struct DIstruct {SItype high, low;};
+
+typedef union
+{
+ struct DIstruct s;
+ DItype ll;
+} DIunion;
+
+DItype
+__lshrdi3 (DItype u, word_type b)
+{
+ DIunion w;
+ word_type bm;
+ DIunion uu;
+
+ if (b == 0)
+ return u;
+
+ uu.ll = u;
+
+ bm = (sizeof (SItype) * BITS_PER_UNIT) - b;
+ if (bm <= 0)
+ {
+ w.s.high = 0;
+ w.s.low = (USItype)uu.s.high >> -bm;
+ }
+ else
+ {
+ USItype carries = (USItype)uu.s.high << bm;
+ w.s.high = (USItype)uu.s.high >> b;
+ w.s.low = ((USItype)uu.s.low >> b) | carries;
+ }
+
+ return w.ll;
+}
Modified: openbios-devel/arch/sparc32/libgcc/build.xml
===================================================================
--- openbios-devel/arch/sparc32/libgcc/build.xml 2006-05-18 21:57:08 UTC (rev 23)
+++ openbios-devel/arch/sparc32/libgcc/build.xml 2006-05-22 10:33:31 UTC (rev 24)
@@ -7,6 +7,7 @@
<object source="__udivdi3.c"/>
<object source="__udivmoddi4.c"/>
<object source="__umoddi3.c"/>
+ <object source="__lshrdi3.c"/>
</library>
</build>
Modified: openbios-devel/arch/sparc32/loadfs.c
===================================================================
--- openbios-devel/arch/sparc32/loadfs.c 2006-05-18 21:57:08 UTC (rev 23)
+++ openbios-devel/arch/sparc32/loadfs.c 2006-05-22 10:33:31 UTC (rev 24)
@@ -8,26 +8,35 @@
int file_open(const char *filename)
{
load_fd=open_io(filename);
- /* if(load_fd!=-1) */ seek_io(load_fd, 0);
+ if(load_fd >= 0)
+ seek_io(load_fd, 0);
return load_fd>-1;
}
int lfile_read(void *buf, unsigned long len)
{
- int ret;
- ret=read_io(load_fd, buf, len);
+ int ret = 0;
+
+ if (load_fd >= 0)
+ ret=read_io(load_fd, buf, len);
return ret;
}
int file_seek(unsigned long offset)
{
- return seek_io(load_fd, offset);
+ if (load_fd >= 0)
+ return seek_io(load_fd, offset);
+ else
+ return -1;
}
unsigned long file_size(void)
{
llong fpos, fsize;
+ if (load_fd < 0)
+ return 0;
+
/* save current position */
fpos=tell(load_fd);
Modified: openbios-devel/arch/sparc32/openbios.c
===================================================================
--- openbios-devel/arch/sparc32/openbios.c 2006-05-18 21:57:08 UTC (rev 23)
+++ openbios-devel/arch/sparc32/openbios.c 2006-05-22 10:33:31 UTC (rev 24)
@@ -19,11 +19,10 @@
void boot(void);
void ob_ide_init(void);
-static char intdict[256 * 1024];
+static unsigned char intdict[256 * 1024];
static void init_memory(void)
{
- extern char _heap, _eheap;
/* push start and end of available memory to the stack
* so that the forth word QUIT can initialize memory
@@ -36,7 +35,7 @@
PUSH((unsigned int)&_eheap);
}
-void exception(cell no)
+void exception(__attribute__((unused))cell no)
{
/* The exception mechanism is used during bootstrap to catch
* build errors. In a running system this is a noop since we
@@ -68,6 +67,9 @@
int openbios(void)
{
extern struct sys_info sys_info;
+ extern struct mem cmem;
+
+ mem_init(&cmem, (char *) &_vmem, (char *)&_evmem);
#ifdef CONFIG_DEBUG_CONSOLE
#ifdef CONFIG_DEBUG_CONSOLE_SERIAL
uart_init(CONFIG_SERIAL_PORT, CONFIG_SERIAL_SPEED);
Modified: openbios-devel/arch/sparc32/romvec.c
===================================================================
--- openbios-devel/arch/sparc32/romvec.c 2006-05-18 21:57:08 UTC (rev 23)
+++ openbios-devel/arch/sparc32/romvec.c 2006-05-22 10:33:31 UTC (rev 24)
@@ -65,7 +65,8 @@
static int prop_mem_avail[3];
static int prop_vmem_avail[6];
-static void doublewalk(unsigned ptab1, unsigned va)
+static void doublewalk(__attribute__((unused)) unsigned int ptab1,
+ __attribute__((unused)) unsigned int va)
{
}
@@ -215,14 +216,14 @@
for (;;) {}
}
-static void obp_abort()
+static void obp_abort(void)
{
printk("abort, power off\n");
outb(0x71910000, 1);
for (;;) {}
}
-static void obp_halt()
+static void obp_halt(void)
{
printk("halt, power off\n");
outb(0x71910000, 1);
@@ -278,7 +279,7 @@
unsigned int off;
unsigned int mva;
- DPRINTF("obp_dumb_mmap: virta 0x%x, which_io %d, paddr 0x%x, sz %d\n", va, which_io, pa, size);
+ DPRINTF("obp_dumb_mmap: virta 0x%x, which_io %d, paddr 0x%x, sz %d\n", (unsigned int)va, which_io, pa, size);
off = pa & (PAGE_SIZE-1);
npages = (off + size + (PAGE_SIZE-1)) / PAGE_SIZE;
pa &= ~(PAGE_SIZE-1);
@@ -296,7 +297,7 @@
static void obp_dumb_munmap(__attribute__((unused)) char *va,
__attribute__((unused)) unsigned int size)
{
- DPRINTF("obp_dumb_munmap: virta 0x%x, sz %d\n", va, size);
+ DPRINTF("obp_dumb_munmap: virta 0x%x, sz %d\n", (unsigned int)va, size);
}
static int obp_devread(int dev_desc, char *buf, int nbytes)
@@ -360,14 +361,18 @@
return ret;
}
-static int obp_cpustart(unsigned int whichcpu, int ctxtbl_ptr,
- int thiscontext, char *prog_counter)
+static int obp_cpustart(__attribute__((unused))unsigned int whichcpu,
+ __attribute__((unused))int ctxtbl_ptr,
+ __attribute__((unused))int thiscontext,
+ __attribute__((unused))char *prog_counter)
{
//int cpu, found;
+#ifdef CONFIG_DEBUG_OBP
struct linux_prom_registers *smp_ctable = (void *)ctxtbl_ptr;
+#endif
DPRINTF("obp_cpustart: cpu %d, ctxptr 0x%x, ctx %d, pc 0x%x\n", whichcpu,
- smp_ctable->phys_addr, thiscontext, prog_counter);
+ smp_ctable->phys_addr, thiscontext, (unsigned int)prog_counter);
#if 0
found = obp_getprop(whichcpu, "mid", (char *)&cpu);
if (found == -1)
Modified: openbios-devel/arch/sparc32/switch.S
===================================================================
--- openbios-devel/arch/sparc32/switch.S 2006-05-18 21:57:08 UTC (rev 23)
+++ openbios-devel/arch/sparc32/switch.S 2006-05-22 10:33:31 UTC (rev 24)
@@ -21,62 +21,94 @@
/* XXX: totally bogus for sparc, need to save and restore all windows */
__switch_context:
/* Save everything in current stack */
+ set __context, %g1
+ st %g2, [%g1 + 8]
+ st %g3, [%g1 + 12]
+ st %g4, [%g1 + 16]
+ st %g5, [%g1 + 20]
+ st %g6, [%g1 + 24]
+ st %g7, [%g1 + 28]
+ st %o0, [%g1 + 32]
+ st %o1, [%g1 + 36]
+ st %o2, [%g1 + 40]
+ st %o3, [%g1 + 44]
+ st %o4, [%g1 + 48]
+ st %o5, [%g1 + 52]
+ st %o6, [%g1 + 56]
+ st %o7, [%g1 + 60]
+
+ st %l0, [%g1 + 64]
+ st %l1, [%g1 + 68]
+ st %l2, [%g1 + 72]
+ st %l3, [%g1 + 76]
+ st %l4, [%g1 + 80]
+ st %l5, [%g1 + 84]
+ st %l6, [%g1 + 88]
+ st %l7, [%g1 + 92]
+
+ st %i0, [%g1 + 96]
+ st %i1, [%g1 + 100]
+ st %i2, [%g1 + 104]
+ st %i3, [%g1 + 108]
+ st %i4, [%g1 + 112]
+ st %i5, [%g1 + 116]
+ st %i6, [%g1 + 120]
+ st %i7, [%g1 + 124]
+
__switch_context_nosave:
/* Interrupts are not allowed... */
/* Turn on Supervisor, EnableFloating, and all the PIL bits.
* Also puts us in register window zero with traps off.
*/
+#if 0
set (PSR_PS | PSR_S | PSR_PIL | PSR_EF), %g2
wr %g2, 0x0, %psr
+#endif
/* Load all registers
*/
set __context, %g1
- lda [%g1] ASI_BP, %g1
- add %g1, 8, %g1 /* skip %g0 and %g1*/
+ ld [%g1], %g1
+ ld [%g1 + 8], %g2
+ ld [%g1 + 12], %g3
+ ld [%g1 + 16], %g4
+ ld [%g1 + 20], %g5
+ ld [%g1 + 24], %g6
+ ld [%g1 + 28], %g7
-#define load_reg(reg) lda [%g1] ASI_BP, reg ; add %g1, 4, %g1
+ ld [%g1 + 32], %o0
+ ld [%g1 + 36], %o1
+ ld [%g1 + 40], %o2
+ ld [%g1 + 44], %o3
+ ld [%g1 + 48], %o4
+ ld [%g1 + 52], %o5
+ ld [%g1 + 56], %o6
+ ld [%g1 + 60], %o7
- load_reg(%g2)
- load_reg(%g3)
- load_reg(%g4)
- load_reg(%g5)
- load_reg(%g6)
- load_reg(%g7)
+ ld [%g1 + 64], %l0
+ ld [%g1 + 68], %l1
+ ld [%g1 + 72], %l2
+ ld [%g1 + 76], %l3
+ ld [%g1 + 80], %l4
+ ld [%g1 + 84], %l5
+ ld [%g1 + 88], %l6
+ ld [%g1 + 92], %l7
- load_reg(%o0)
- load_reg(%o1)
- load_reg(%o2)
- load_reg(%o3)
- load_reg(%o4)
- load_reg(%o5)
- load_reg(%o6)
- load_reg(%o7)
-
- load_reg(%l0)
- load_reg(%l1)
- load_reg(%l2)
- load_reg(%l3)
- load_reg(%l4)
- load_reg(%l5)
- load_reg(%l6)
- load_reg(%l7)
-
- load_reg(%i0)
- load_reg(%i1)
- load_reg(%i2)
- load_reg(%i3)
- load_reg(%i4)
- load_reg(%i5)
- load_reg(%i6)
- load_reg(%i7)
-
+ ld [%g1 + 96], %i0
+ ld [%g1 + 100], %i1
+ ld [%g1 + 104], %i2
+ ld [%g1 + 108], %i3
+ ld [%g1 + 112], %i4
+ ld [%g1 + 116], %i5
+ ld [%g1 + 120], %i6
+ ld [%g1 + 124], %i7
+
+ ld [%g1 + 128], %g1
/* Finally, load new %pc */
- lda [%g1] ASI_BP, %g1
jmp %g1
- nop
+ clr %g1
__exit_context:
/* Get back to the original context */
Modified: openbios-devel/arch/sparc32/sys_info.c
===================================================================
--- openbios-devel/arch/sparc32/sys_info.c 2006-05-18 21:57:08 UTC (rev 23)
+++ openbios-devel/arch/sparc32/sys_info.c 2006-05-22 10:33:31 UTC (rev 24)
@@ -1,5 +1,6 @@
#include "openbios/config.h"
#include "openbios/kernel.h"
+#include "elf_boot.h"
#include "sys_info.h"
#include "context.h"
@@ -19,6 +20,7 @@
int i;
unsigned long long total = 0;
struct memrange *mmap;
+ extern struct elf_image_note elf_image_notes;
/* Pick up paramters given by bootloader to us */
//info->boot_type = boot_ctx->eax;
@@ -26,6 +28,8 @@
info->boot_arg = boot_ctx->param[0];
//debug("boot eax = %#lx\n", info->boot_type);
//debug("boot ebx = %#lx\n", info->boot_data);
+ info->boot_type = ELF_BHDR_MAGIC;
+ info->boot_data = virt_to_phys(&elf_image_notes);
debug("boot arg = %#lx\n", info->boot_arg);
collect_elfboot_info(info);
Modified: openbios-devel/arch/sparc32/tree.fs
===================================================================
--- openbios-devel/arch/sparc32/tree.fs 2006-05-18 21:57:08 UTC (rev 23)
+++ openbios-devel/arch/sparc32/tree.fs 2006-05-22 10:33:31 UTC (rev 24)
@@ -8,6 +8,8 @@
h# 01800000 encode-int 0 encode-int encode+ 0 encode-int encode+ h# 00000081 encode-int encode+
0 encode-int encode+ 0 encode-int encode+ 0 encode-int encode+ 0 encode-int encode+
" idprom" property \ XXX
+ " /obio/zs@0,100000:a" encode-string " stdin-path" property
+ " /obio/zs@0,100000:a" encode-string " stdout-path" property
: encode-unit encode-unit-sbus ;
: decode-unit decode-unit-sbus ;
1
0
I added handling of Qemu parameters in nvram. Now kernel arguments, default
boot device etc. can be set in the Qemu command line. Interrupt controller
and timer are initialised.
No progress with Linux.
_________________________________________________________________
Don't just search. Find. Check out the new MSN Search!
http://search.msn.com/
1
0
I found the annoying bug that sometimes prevented any disk access. This was
because the IOMMU page table alignment restriction (32k) was satisfied in
virtual memory level, but not physical. Depending on the compilation
options, phase of moon etc. ESP memory access didn't work. Now I tried
several compilers, switches and debug options and every version produced
works.
The rest of the patch fixes some warnings (GCC 4.1) and changes over to
switch_context method at boot. Some newly enabled filesystem code needed
more bits from libgcc.
No progress with Linux.
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
1
0
There was a bug in obp_nextprop, zs devices need to be mapped, and ESP
needed an interrupt.
Now we get this far:
3 > boot disk -p
[sparc] Booting file 'disk' with parameters '-p'
Unknown filesystem type
Loading image...
segment 0 addr:0x0 file:0x2780e0 mem:0x2a3828 loading... clearing...
clearing checksum... ok
Loaded 2588896 bytes
entry point is 0x4000
Jumping to entry point...
PROMLIB: obio_ranges 1
PROMLIB: Sun Boot Prom Version 0 Revision 77
Linux version 2.6.11 (test@host) (gcc version 2.95.4 20010319 (prerelease))
#3 Tue Mar 15 18:21:10 UTC 2005
ARCH: SUN4M
TYPE: SparcStation
Ethernet address: 0:0:0:0:0:0
Boot time fixup v1.6. 4/Mar/98 Jakub Jelinek (jj(a)ultra.linux.cz). Patching
kernel for srmmu[Fujitsu Swift]/iommu
Booting Linux...
Power off control detected.
Built 1 zonelists
Kernel command line: -p
PID hash table entries: 512 (order: 9, 8192 bytes)
Console: colour dummy device 80x25
Dentry cache hash table entries: 16384 (order: 4, 65536 bytes)
Inode-cache hash table entries: 8192 (order: 3, 32768 bytes)
Memory: 124928k/131072k available (1848k kernel code, 6056k reserved, 496k
data, 156k init, 0k highmem)
Mount-cache hash table entries: 512 (order: 0, 4096 bytes)
NET: Registered protocol family 16
SCSI subsystem initialized
IOMMU: impl 0 vers 4 table 0xf0740000[262144 B] map [65536 b]
sbus0: Clock 25.0 MHz
dma0: Revision 2
dma1: Revision 2
Unable to handle kernel paging request at virtual address 73746000
tsk->{mm,active_mm}->context = ffffffff
tsk->{mm,active_mm}->pgd = fc000000
\|/ ____ \|/
"@'/ ,. \`@"
/_| \__/ |_\
\__U_/
swapper(1): Oops [#1]
PSR: 04001fc1 PC: ffd07278 NPC: ffd0727c Y: 00000000 Not tainted
PC: <0xffd07278>
%G: 00000000 7374616e ffd30874 ffd3086c ffd8d7e8 00656e00 f060e000
00000010
%O: ffd8d400 ffd2dd38 ffd8d400 ffd2b014 ffd346c0 00000000 f060fa98
ffd0728c
RPC: <0xffd0728c>
%L: 0000001a ffd8d000 ffd8d400 ffd8d000 00000000 006f7274 f060e000
f0276800
%I: ffd346bc ffd2dd38 ffd8d400 ffd2b014 ffd34694 00000001 f060fb00
ffd08c50
Caller[ffd08c50]: 0xffd08c50
Caller[ffd06180]: 0xffd06180
Caller[f00f1bf0]: Letext+0x1c/0x3c
Caller[f00f1c24]: prom_getchild+0x14/0x38
Caller[f0266154]: tty_init+0x230/0x240
Caller[f02661c0]: unix98_pty_init+0x5c/0x210
Caller[f0266258]: unix98_pty_init+0xf4/0x210
Caller[f0251f80]: inflate_stored+0x1ac/0x1fc
Caller[f0252020]: inflate_fixed+0x50/0x178
Caller[f00100cc]: init+0x24/0xfc
Caller[f0014a4c]: kernel_thread+0x34/0x50
Caller[f001002c]: rest_init+0x10/0x28
Caller[f0251ed8]: inflate_stored+0x104/0x1fc
Caller[f0251790]: huft_build+0x40c/0x55c
Caller[ffd096c8]: 0xffd096c8
Instruction DUMP: 8200a004 c224a3e4 c200a004 <c4004000> 033ff4a2 821063e4
8528a002 c2004002 9fc04000
Kernel panic - not syncing: Attempted to kill init!
<0>Press L1-A to return to the boot prom
With NetBSD-GENERIC (forgot which version) we get this:
Jumping to entry point...
WARNING: opennode not valid on PROM version 1
text fault: pc=0x0 sfsr=166<PERR=0,LVL=1,AT=3,FT=1,FAV,OW> sfva=0x0
panic: kernel fault
halted
halt, power off
and with OpenBSD-3.5:
Jumping to entry point...
[ bsd ELF symbol table not valid: bad magic ]
data fault: pc=0xf8059a4c sfva=0xf05ea270 sfsr=126<FAV>
panic: kernel fault
Stopped at 0xf8236ee0: jmpl [%o7 + 0x8], %g0
RUN AT LEAST 'trace' AND 'ps' AND INCLUDE OUTPUT WHEN REPORTING THIS PANIC!
DO NOT EVEN BOTHER REPORTING THIS WITHOUT INCLUDING THAT INFORMATION!
ddb>
I think the error with Linux happens because the console device is not real
serial but builtin console.
_________________________________________________________________
Don't just search. Find. Check out the new MSN Search!
http://search.msn.click-url.com/go/onm00200636ave/direct/01/
3
2
r23 - in openbios-devel: arch/sparc32 config/examples drivers include/openbios
by svn＠openbios.org 18 May '06
by svn＠openbios.org 18 May '06
18 May '06
Author: stepan
Date: 2006-05-18 23:57:08 +0200 (Thu, 18 May 2006)
New Revision: 23
Added:
openbios-devel/drivers/obio.c
Modified:
openbios-devel/arch/sparc32/openbios.c
openbios-devel/arch/sparc32/romvec.c
openbios-devel/arch/sparc32/tree.fs
openbios-devel/config/examples/cross-sparc32_config.xml
openbios-devel/config/examples/sparc32_config.xml
openbios-devel/drivers/build.xml
openbios-devel/drivers/esp.c
openbios-devel/include/openbios/drivers.h
Log:
this makes linux on sparc32 boot :-)
Modified: openbios-devel/arch/sparc32/openbios.c
===================================================================
--- openbios-devel/arch/sparc32/openbios.c 2006-05-17 12:30:12 UTC (rev 22)
+++ openbios-devel/arch/sparc32/openbios.c 2006-05-18 21:57:08 UTC (rev 23)
@@ -58,6 +58,9 @@
#ifdef CONFIG_DRIVER_ESP
ob_esp_init();
#endif
+#ifdef CONFIG_DRIVER_OBIO
+ ob_obio_init(0x71000000);
+#endif
device_end();
bind_func("platform-boot", boot );
}
Modified: openbios-devel/arch/sparc32/romvec.c
===================================================================
--- openbios-devel/arch/sparc32/romvec.c 2006-05-17 12:30:12 UTC (rev 22)
+++ openbios-devel/arch/sparc32/romvec.c 2006-05-18 21:57:08 UTC (rev 23)
@@ -76,7 +76,7 @@
PUSH(node);
fword("peer");
peer = POP();
- DPRINTF("obp_nextnode(%x) = %x\n", node, peer);
+ DPRINTF("obp_nextnode(0x%x) = 0x%x\n", node, peer);
return peer;
}
@@ -88,7 +88,7 @@
PUSH(node);
fword("child");
child = POP();
- DPRINTF("obp_child(%x) = %x\n", node, child);
+ DPRINTF("obp_child(0x%x) = 0x%x\n", node, child);
return child;
}
@@ -103,9 +103,7 @@
notfound = POP();
if (notfound) {
- DPRINTF("obp_proplen(%x, %s) (not found)\n", node, name);
- (void) POP();
- (void) POP();
+ DPRINTF("obp_proplen(0x%x, %s) (not found)\n", node, name);
return -1;
} else {
@@ -113,7 +111,7 @@
len = POP();
(void) POP();
- DPRINTF("obp_proplen(%x, %s) = %d\n", node, name, len);
+ DPRINTF("obp_proplen(0x%x, %s) = %d\n", node, name, len);
return len;
}
@@ -138,9 +136,7 @@
notfound = POP();
}
if (notfound) {
- DPRINTF("obp_getprop(%x, %s) (not found)\n", node, name);
- (void) POP();
- (void) POP();
+ DPRINTF("obp_getprop(0x%x, %s) (not found)\n", node, name);
return -1;
} else {
@@ -151,7 +147,7 @@
str = (char *) POP();
memcpy(value, str, len);
- DPRINTF("obp_getprop(%x, %s) = %s\n", node, name, str);
+ DPRINTF("obp_getprop(0x%x, %s) = %s\n", node, name, str);
return len;
}
@@ -162,14 +158,13 @@
__attribute__((unused)) char *value,
__attribute__((unused)) int len)
{
- DPRINTF("obp_setprop(%x, %s) = %s (%d)\n", node, name, value, len);
+ DPRINTF("obp_setprop(0x%x, %s) = %s (%d)\n", node, name, value, len);
return -1;
}
static const char *obp_nextprop(int node, char *name)
{
- char *ret;
int found;
if (!name || *name == '\0') {
@@ -183,11 +178,11 @@
fword("next-property");
found = POP();
if (!found) {
- DPRINTF("obp_nextprop(%x, %s) (not found)\n", node, name);
+ DPRINTF("obp_nextprop(0x%x, %s) (not found)\n", node, name);
(void) POP();
(void) POP();
- return NULL;
+ return "";
} else {
int len;
char *str;
@@ -195,7 +190,7 @@
len = POP();
str = (char *) POP();
- DPRINTF("obp_nextprop(%x, %s) = %s\n", node, name, str);
+ DPRINTF("obp_nextprop(0x%x, %s) = %s\n", node, name, str);
return str;
}
@@ -271,7 +266,7 @@
ret = obp_devread(dev_desc, buf, num_blks * bs) / bs;
- DPRINTF("obp_rdblkdev(fd %x, num_blks %d, offset %d (hi %d lo %d), buf 0x%x) = %d\n", dev_desc, num_blks, offset, hi, lo, (int)buf, ret);
+ DPRINTF("obp_rdblkdev(fd 0x%x, num_blks %d, offset %d (hi %d lo %d), buf 0x%x) = %d\n", dev_desc, num_blks, offset, hi, lo, (int)buf, ret);
return ret;
}
@@ -283,7 +278,7 @@
unsigned int off;
unsigned int mva;
- DPRINTF("obp_dumb_mmap: virta %x, which_io %d, paddr %x, sz %d\n", va, which_io, pa, size);
+ DPRINTF("obp_dumb_mmap: virta 0x%x, which_io %d, paddr 0x%x, sz %d\n", va, which_io, pa, size);
off = pa & (PAGE_SIZE-1);
npages = (off + size + (PAGE_SIZE-1)) / PAGE_SIZE;
pa &= ~(PAGE_SIZE-1);
@@ -301,7 +296,7 @@
static void obp_dumb_munmap(__attribute__((unused)) char *va,
__attribute__((unused)) unsigned int size)
{
- DPRINTF("obp_dumb_munmap: virta %x, sz %d\n", va, size);
+ DPRINTF("obp_dumb_munmap: virta 0x%x, sz %d\n", va, size);
}
static int obp_devread(int dev_desc, char *buf, int nbytes)
@@ -371,7 +366,7 @@
//int cpu, found;
struct linux_prom_registers *smp_ctable = (void *)ctxtbl_ptr;
- DPRINTF("obp_cpustart: cpu %d, ctxptr %x, ctx %d, pc %x\n", whichcpu,
+ DPRINTF("obp_cpustart: cpu %d, ctxptr 0x%x, ctx %d, pc 0x%x\n", whichcpu,
smp_ctable->phys_addr, thiscontext, prog_counter);
#if 0
found = obp_getprop(whichcpu, "mid", (char *)&cpu);
@@ -435,7 +430,7 @@
prop_mem_reg[2] = memsize;
prop_mem_avail[0] = 0;
prop_mem_avail[1] = 0;
- prop_mem_avail[2] = va2pa((unsigned long)&_data);
+ prop_mem_avail[2] = va2pa((unsigned long)&_data) - 1;
prop_vmem_avail[0] = 0;
prop_vmem_avail[1] = 0;
prop_vmem_avail[2] = (unsigned long)&_start - 1;
@@ -506,6 +501,14 @@
romvec0.pv_v2bootargs.bootargs = &cmdline;
romvec0.pv_v2bootargs.fd_stdin = &obp_fd_stdin;
romvec0.pv_v2bootargs.fd_stdout = &obp_fd_stdout;
+
+ push_str("/builtin/console");
+ fword("open-dev");
+ obp_fd_stdin = POP();
+ push_str("/builtin/console");
+ fword("open-dev");
+ obp_fd_stdout = POP();
+
obp_stdin = PROMDEV_TTYA;
obp_stdout = PROMDEV_TTYA;
Modified: openbios-devel/arch/sparc32/tree.fs
===================================================================
--- openbios-devel/arch/sparc32/tree.fs 2006-05-17 12:30:12 UTC (rev 22)
+++ openbios-devel/arch/sparc32/tree.fs 2006-05-18 21:57:08 UTC (rev 23)
@@ -96,7 +96,7 @@
" SUNW,tcx" device-name
" display" device-type
h# 1d encode-int " vbporch" property
- h# 90 encode-int " hbporch" property
+ h# a0 encode-int " hbporch" property
h# 06 encode-int " vsync" property
h# 88 encode-int " hsync" property
h# 03 encode-int " vfporch" property
@@ -111,7 +111,7 @@
5 encode-int 0 encode-int encode+ " intr" property
5 encode-int " interrupts" property
2 encode-int h# 00800000 encode-int encode+ h# 00100000 encode-int encode+
- 2 encode-int encode+ h# 02000000 encode-int encode+ h# 00000001 encode-int encode+
+ 2 encode-int encode+ h# 02000000 encode-int encode+ h# 00000001 encode-int encode+
2 encode-int encode+ h# 04000000 encode-int encode+ h# 00800000 encode-int encode+
2 encode-int encode+ h# 06000000 encode-int encode+ h# 00800000 encode-int encode+
2 encode-int encode+ h# 0a000000 encode-int encode+ h# 00000001 encode-int encode+
@@ -235,8 +235,8 @@
h# 0 encode-int h# 00000000 encode-int encode+ h# 00000008 encode-int encode+ " reg" property
1 encode-int " slave" property
h# 2c encode-int 0 encode-int encode+ " intr" property
- 1 encode-int " keyboard" property
- 1 encode-int " mouse" property
+ -1 encode-int " keyboard" property
+ -1 encode-int " mouse" property
finish-device
" /obio" find-device
Modified: openbios-devel/config/examples/cross-sparc32_config.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc32_config.xml 2006-05-17 12:30:12 UTC (rev 22)
+++ openbios-devel/config/examples/cross-sparc32_config.xml 2006-05-18 21:57:08 UTC (rev 23)
@@ -67,6 +67,7 @@
<!-- Drivers -->
<option name="CONFIG_DRIVER_SBUS" type="boolean" value="true"/>
+ <option name="CONFIG_DRIVER_OBIO" type="boolean" value="true"/>
<option name="CONFIG_DRIVER_ESP" type="boolean" value="true"/>
<option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="false"/>
Modified: openbios-devel/config/examples/sparc32_config.xml
===================================================================
--- openbios-devel/config/examples/sparc32_config.xml 2006-05-17 12:30:12 UTC (rev 22)
+++ openbios-devel/config/examples/sparc32_config.xml 2006-05-18 21:57:08 UTC (rev 23)
@@ -67,6 +67,7 @@
<!-- Drivers -->
<option name="CONFIG_DRIVER_SBUS" type="boolean" value="true"/>
+ <option name="CONFIG_DRIVER_OBIO" type="boolean" value="true"/>
<option name="CONFIG_DRIVER_ESP" type="boolean" value="true"/>
<option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="false"/>
Modified: openbios-devel/drivers/build.xml
===================================================================
--- openbios-devel/drivers/build.xml 2006-05-17 12:30:12 UTC (rev 22)
+++ openbios-devel/drivers/build.xml 2006-05-18 21:57:08 UTC (rev 23)
@@ -11,6 +11,7 @@
<object source="iommu.c" condition="DRIVER_SBUS"/>
<object source="sbus.c" condition="DRIVER_SBUS"/>
<object source="esp.c" condition="DRIVER_ESP"/>
+ <object source="obio.c" condition="DRIVER_OBIO"/>
</library>
<dictionary name="openbios" target="forth">
Modified: openbios-devel/drivers/esp.c
===================================================================
--- openbios-devel/drivers/esp.c 2006-05-17 12:30:12 UTC (rev 22)
+++ openbios-devel/drivers/esp.c 2006-05-18 21:57:08 UTC (rev 23)
@@ -363,6 +363,14 @@
fword("encode+");
push_str("reg");
fword("property");
+
+ PUSH(0x24);
+ fword("encode-int");
+ PUSH(0);
+ fword("encode-int");
+ fword("encode+");
+ push_str("intr");
+ fword("property");
}
static void
Added: openbios-devel/drivers/obio.c
===================================================================
--- openbios-devel/drivers/obio.c (rev 0)
+++ openbios-devel/drivers/obio.c 2006-05-18 21:57:08 UTC (rev 23)
@@ -0,0 +1,85 @@
+/*
+ * OpenBIOS Sparc OBIO driver
+ *
+ * (C) 2004 Stefan Reinauer <stepan(a)openbios.org>
+ * (C) 2005 Ed Schouten <ed(a)fxq.nl>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2
+ *
+ */
+
+#include "openbios/config.h"
+#include "openbios/bindings.h"
+#include "openbios/kernel.h"
+#include "libc/byteorder.h"
+#include "libc/vsprintf.h"
+
+#include "openbios/drivers.h"
+
+static void
+ob_zs_init(unsigned long slavio_base)
+{
+ unsigned long zs_addr;
+
+ zs_addr = (unsigned long)map_io(slavio_base + 0x0, 8);
+ push_str("/obio/zs@0,0");
+ fword("find-device");
+
+ PUSH(zs_addr);
+ fword("encode-int");
+ PUSH(sizeof(zs_addr));
+ fword("encode-int");
+ fword("encode+");
+ push_str("address");
+ fword("property");
+
+ zs_addr = (unsigned long)map_io(slavio_base + 0x00100000, 8);
+ push_str("/obio/zs@0,100000");
+ fword("find-device");
+
+ PUSH(zs_addr);
+ fword("encode-int");
+ PUSH(sizeof(zs_addr));
+ fword("encode-int");
+ fword("encode+");
+ push_str("address");
+ fword("property");
+}
+
+static void
+ob_obio_open(int *idx)
+{
+ int ret=1;
+ RET ( -ret );
+}
+
+static void
+ob_obio_close(int *idx)
+{
+ selfword("close-deblocker");
+}
+
+static void
+ob_obio_initialize(int *idx)
+{
+}
+
+
+NODE_METHODS(ob_obio_node) = {
+ { NULL, ob_obio_initialize },
+ { "open", ob_obio_open },
+ { "close", ob_obio_close },
+};
+
+
+int ob_obio_init(unsigned long slavio_base)
+{
+
+ //printk("Initializing OBIO devices...\n");
+
+ ob_zs_init(slavio_base);
+
+ return 0;
+}
Modified: openbios-devel/include/openbios/drivers.h
===================================================================
--- openbios-devel/include/openbios/drivers.h 2006-05-17 12:30:12 UTC (rev 22)
+++ openbios-devel/include/openbios/drivers.h 2006-05-18 21:57:08 UTC (rev 23)
@@ -23,4 +23,7 @@
#ifdef CONFIG_DRIVER_ESP
int ob_esp_init(void);
#endif
+#ifdef CONFIG_DRIVER_OBIO
+int ob_obio_init(unsigned long slavio_base);
+#endif
1
0
Author: stepan
Date: 2006-05-17 14:30:12 +0200 (Wed, 17 May 2006)
New Revision: 22
Modified:
openbios-devel/utils/iso/boot/grub/stage2_eltorito
Log:
newer version of stage2
Modified: openbios-devel/utils/iso/boot/grub/stage2_eltorito
===================================================================
(Binary files differ)
1
0
Author: stepan
Date: 2006-05-17 14:29:24 +0200 (Wed, 17 May 2006)
New Revision: 21
Modified:
openbios-devel/fs/hfsplus/btree.c
openbios-devel/fs/hfsplus/include/swab.h
openbios-devel/fs/hfsplus/record.c
openbios-devel/fs/hfsplus/volume.c
Log:
gcc4 fixes.
Modified: openbios-devel/fs/hfsplus/btree.c
===================================================================
--- openbios-devel/fs/hfsplus/btree.c 2006-05-17 12:28:27 UTC (rev 20)
+++ openbios-devel/fs/hfsplus/btree.c 2006-05-17 12:29:24 UTC (rev 21)
@@ -55,6 +55,7 @@
*/
static void* btree_readhead(btree* bt, btree_head* head, void *p)
{
+ UInt32 *q;
head->depth = bswabU16_inc(p);
head->root = bswabU32_inc(p);
head->leaf_count = bswabU32_inc(p);
@@ -70,8 +71,10 @@
head->reserved2 = bswabU8_inc(p);
head->attributes = bswabU32_inc(p);
// skip reserved bytes
- ((UInt32*) p) += 16;
- return p;
+ q=((UInt32*) p);
+ // ((UInt32*) p) += 16;
+ q+=16;
+ return q;
}
/* Priority of the depth of the node compared to LRU value.
Modified: openbios-devel/fs/hfsplus/include/swab.h
===================================================================
--- openbios-devel/fs/hfsplus/include/swab.h 2006-05-17 12:28:27 UTC (rev 20)
+++ openbios-devel/fs/hfsplus/include/swab.h 2006-05-17 12:29:24 UTC (rev 21)
@@ -1,6 +1,7 @@
/*
* libhfs - library for reading and writing Macintosh HFS volumes
- * Copyright (C) 2000 Klaus Halfmann <khalfmann(a)libra.de>
+ *
+ * Copyright (C) 2000 Klaus Halfmann <klaus.halfmann(a)feri.de>
* Original work 1996-1998 Robert Leslie <rob(a)mars.org>
*
* This file defines some byte swapping function. I did not find this
@@ -20,25 +21,43 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: swab.h,v 1.3 2000/09/14 05:53:44 hasi Exp $
+ * $Id: swab.h,v 1.1.1.1 2002/03/05 19:50:29 klaus Exp $
*/
-#ifndef bswap_16
-#define bswap_16(x) \
- ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))
-#endif
+#include "openbios/config.h"
+#include "libc/byteorder.h"
-/* Big endian */
+ /* basic fuction:
+ value = swab_inc(ptr);
+ ptr is afterwards incremented by sizeof(value)
+ */
-#define bswabU16_inc(ptr) (*((UInt16*) (ptr))++)
-#define bswabU32_inc(ptr) (*((UInt32*) (ptr))++)
-#define bswabU64_inc(ptr) (*((UInt64*) (ptr))++)
+#ifndef CONFIG_BIG_ENDIAN
-#define bstoreU16_inc(ptr, val) (*((UInt16*) (ptr))++) = val
-#define bstoreU32_inc(ptr, val) (*((UInt32*) (ptr))++) = val
-#define bstoreU64_inc(ptr, val) (*((UInt64*) (ptr))++) = val
+#define bswabU16(val) __bswap16(val)
+#define bswabU16_inc(ptr) (__extension__ ({ UInt16 v=__bswap16(*((UInt16*) (ptr))); ptr+=sizeof(UInt16);v;}))
+#define bswabU32_inc(ptr) (__extension__ ({ UInt32 v=__bswap32(*((UInt32*) (ptr))); ptr+=sizeof(UInt32);v;}))
+#define bswabU64_inc(ptr) (__extension__ ({ UInt64 v=__bswap64(*((UInt64*) (ptr))); ptr+=sizeof(UInt64);v;}))
+#define bstoreU16_inc(ptr, val) do {(*((UInt16*) (ptr))) = __bswap16(val); ptr+=sizeof(UInt16);} while (0)
+#define bstoreU32_inc(ptr, val) do {(*((UInt32*) (ptr))) = __bswap32(val); ptr+=sizeof(UInt32);} while (0)
+#define bstoreU64_inc(ptr, val) do {(*((UInt64*) (ptr))) = __bswap64(val); ptr+=sizeof(UInt64);} while (0)
+
+#else // BYTE_ORDER == BIG_ENDIAN
+
+#define bswabU16(val) val
+
+#define bswabU16_inc(ptr) (__extension__ ({ UInt16 v=(*((UInt16*) (ptr))); ptr+=sizeof(UInt16);v;}))
+#define bswabU32_inc(ptr) (__extension__ ({ UInt32 v=(*((UInt32*) (ptr))); ptr+=sizeof(UInt32);v;}))
+#define bswabU64_inc(ptr) (__extension__ ({ UInt64 v=(*((UInt64*) (ptr))); ptr+=sizeof(UInt64);v;}))
+
+#define bstoreU16_inc(ptr, val) do {(*((UInt16*) (ptr))) = val; ptr+=sizeof(UInt16);} while (0)
+#define bstoreU32_inc(ptr, val) do {(*((UInt32*) (ptr))) = val; ptr+=sizeof(UInt32);} while (0)
+#define bstoreU64_inc(ptr, val) do {(*((UInt64*) (ptr))) = val; ptr+=sizeof(UInt64);} while (0)
+
+#endif
+
/* for the sake of compleetness and readability */
-#define bswabU8_inc(ptr) (*((UInt8*) (ptr))++)
-#define bstoreU8_inc(ptr,val) (*((UInt8*) (ptr))++) = val
+#define bswabU8_inc(ptr) (__extension__ ({ UInt8 v=(*((UInt8*) (ptr))); ptr+=sizeof(UInt8);v;}))
+#define bstoreU8_inc(ptr,val) do {(*((UInt8*) (ptr))) = val; ptr+=sizeof(UInt8);} while (0)
Modified: openbios-devel/fs/hfsplus/record.c
===================================================================
--- openbios-devel/fs/hfsplus/record.c 2006-05-17 12:28:27 UTC (rev 20)
+++ openbios-devel/fs/hfsplus/record.c 2006-05-17 12:29:24 UTC (rev 21)
@@ -146,8 +146,11 @@
/* read extra File info */
static inline void* record_readFXInfo(void *p, FXInfo* xinfo)
{
+ SInt16 *q;
xinfo->fdIconID = bswabU16_inc(p);
- ((SInt16*) p) += 4; // skip unused
+ q=(SInt16*) p;
+ q+=4; // skip unused
+ p=(void *)q;
xinfo->fdComment = bswabU16_inc(p);
xinfo->fdPutAway = bswabU32_inc(p);
return p;
Modified: openbios-devel/fs/hfsplus/volume.c
===================================================================
--- openbios-devel/fs/hfsplus/volume.c 2006-05-17 12:28:27 UTC (rev 20)
+++ openbios-devel/fs/hfsplus/volume.c 2006-05-17 12:29:24 UTC (rev 21)
@@ -140,7 +140,7 @@
vh->write_count = bswabU32_inc(p);
vh->encodings_bmp = bswabU64_inc(p);
memcpy(vh->finder_info, p, 32);
- ((char*) p) += 32; // So finderinfo must be swapped later, ***
+ p += 32; // So finderinfo must be swapped later, ***
p = volume_readfork(p, &vh->alloc_file );
p = volume_readfork(p, &vh->ext_file );
p = volume_readfork(p, &vh->cat_file );
@@ -180,12 +180,12 @@
UInt16 drAlBlSt; /* first allocation block in volume */
UInt16 embeds, embedl; /* Start/lenght of embedded area in blocks */
- ((char*) p) += 0x12; /* skip unneded HFS vol fields */
+ p += 0x12; /* skip unneded HFS vol fields */
drAlBlkSiz = bswabU32_inc(p); /* offset 0x14 */
- ((char*) p) += 0x4; /* skip unneded HFS vol fields */
+ p += 0x4; /* skip unneded HFS vol fields */
drAlBlSt = bswabU16_inc(p); /* offset 0x1C */
- ((char*) p) += 0x5E; /* skip unneded HFS vol fields */
+ p += 0x5E; /* skip unneded HFS vol fields */
signature = bswabU16_inc(p); /* offset 0x7C, drEmbedSigWord */
if( signature != HFSP_VOLHEAD_SIG)
HFSP_ERROR(-1, "This looks like a normal HFS volume");
1
0
Author: stepan
Date: 2006-05-17 14:28:27 +0200 (Wed, 17 May 2006)
New Revision: 20
Modified:
openbios-devel/include/libc/byteorder.h
Log:
add 64bit byteswaps.
Modified: openbios-devel/include/libc/byteorder.h
===================================================================
--- openbios-devel/include/libc/byteorder.h 2006-05-16 17:36:09 UTC (rev 19)
+++ openbios-devel/include/libc/byteorder.h 2006-05-17 12:28:27 UTC (rev 20)
@@ -14,6 +14,8 @@
#define __bswap16(x) ((((x) & 0xff00) >> 8) | (((x) & 0x00ff) << 8))
+#define __bswap64(x) ( (__bswap32( (x) >> 32)) | \
+ (__bswap32((x) & 0xffffffff) << 32) )
#ifdef CONFIG_LITTLE_ENDIAN
#define __cpu_to_le32(x) ((u32) (x))
1
0
16 May '06
Author: stepan
Date: 2006-05-16 19:36:09 +0200 (Tue, 16 May 2006)
New Revision: 19
Modified:
openbios-devel/arch/sparc32/romvec.c
openbios-devel/config/examples/cross-sparc32_config.xml
openbios-devel/config/examples/sparc32_config.xml
openbios-devel/drivers/esp.c
openbios-devel/drivers/iommu.c
Log:
new sparc merge
Modified: openbios-devel/arch/sparc32/romvec.c
===================================================================
--- openbios-devel/arch/sparc32/romvec.c 2006-05-15 08:17:51 UTC (rev 18)
+++ openbios-devel/arch/sparc32/romvec.c 2006-05-16 17:36:09 UTC (rev 19)
@@ -42,6 +42,8 @@
static int obp_getprop(int node, char *name, char *val);
static int obp_setprop(int node, char *name, char *val, int len);
static const char *obp_nextprop(int node, char *name);
+static int obp_devread(int dev_desc, char *buf, int nbytes);
+static int obp_devseek(int dev_desc, int hi, int lo);
static const struct linux_nodeops nodeops0 = {
obp_nextnode, /* int (*no_nextnode)(int node); */
@@ -167,14 +169,36 @@
static const char *obp_nextprop(int node, char *name)
{
+ char *ret;
+ int found;
+
if (!name || *name == '\0') {
// NULL name means get first property
- DPRINTF("obp_nextprop(%x, NULL)\n", node);
- return 0;
+ push_str("");
+ name = "NULL";
+ } else {
+ push_str(name);
}
- DPRINTF("obp_nextprop(%x, %s)\n", node, name);
+ PUSH(node);
+ fword("next-property");
+ found = POP();
+ if (!found) {
+ DPRINTF("obp_nextprop(%x, %s) (not found)\n", node, name);
+ (void) POP();
+ (void) POP();
- return 0;
+ return NULL;
+ } else {
+ int len;
+ char *str;
+
+ len = POP();
+ str = (char *) POP();
+
+ DPRINTF("obp_nextprop(%x, %s) = %s\n", node, name, str);
+
+ return str;
+ }
}
static int obp_nbgetchar(void)
@@ -214,36 +238,41 @@
{
int ret;
- DPRINTF("obp_devopen(%s)\n", str);
-
push_str(str);
fword("open-dev");
ret = POP();
+ DPRINTF("obp_devopen(%s) = 0x%x\n", str, ret);
return ret;
}
-static int obp_devclose(__attribute__((unused)) int dev_desc)
+static int obp_devclose(int dev_desc)
{
- DPRINTF("obp_devclose %x\n", dev_desc);
+ int ret;
- return 0;
+ PUSH(dev_desc);
+ fword("close-dev");
+ ret = POP();
+
+ DPRINTF("obp_devclose(0x%x) = %d\n", dev_desc, ret);
+
+ return ret;
}
static int obp_rdblkdev(int dev_desc, int num_blks, int offset, char *buf)
{
- int ret;
+ int ret, hi, lo, bs;
- DPRINTF("obp_rdblkdev: fd %x, num_blks %d, offset %d, buf 0x%x\n", dev_desc, num_blks, offset, (int)buf);
+ bs = 512; // XXX: real blocksize?
+ hi = ((uint64_t)offset * bs) >> 32;
+ lo = ((uint64_t)offset * bs) & 0xffffffff;
- PUSH((int)buf);
- PUSH(offset);
- PUSH(num_blks);
- push_str("read-blocks");
- PUSH(dev_desc);
- fword("$call-method");
- ret = POP();
+ ret = obp_devseek(dev_desc, hi, lo);
+ ret = obp_devread(dev_desc, buf, num_blks * bs) / bs;
+
+ DPRINTF("obp_rdblkdev(fd %x, num_blks %d, offset %d (hi %d lo %d), buf 0x%x) = %d\n", dev_desc, num_blks, offset, hi, lo, (int)buf, ret);
+
return ret;
}
@@ -277,30 +306,63 @@
static int obp_devread(int dev_desc, char *buf, int nbytes)
{
- DPRINTF("obp_devread: fd %d, nbytes %d\n", dev_desc, nbytes);
+ int ret;
- return 0;
+ PUSH((int)buf);
+ PUSH(nbytes);
+ push_str("read");
+ PUSH(dev_desc);
+ fword("$call-method");
+ ret = POP();
+
+ DPRINTF("obp_devread(fd 0x%x, buf 0x%x, nbytes %d) = %d\n", dev_desc, (int)buf, nbytes, ret);
+
+ return ret;
}
static int obp_devwrite(int dev_desc, char *buf, int nbytes)
{
- DPRINTF("obp_devwrite: fd %d, buf %s, nbytes %d\n", dev_desc, buf, nbytes);
+ int ret;
+ PUSH((int)buf);
+ PUSH(nbytes);
+ push_str("write");
+ PUSH(dev_desc);
+ fword("$call-method");
+ ret = POP();
+
+ DPRINTF("obp_devwrite(fd 0x%x, buf %s, nbytes %d) = %d\n", dev_desc, buf, nbytes, ret);
+
return nbytes;
}
-static int obp_devseek(int dev_desc, __attribute__((unused)) int hi, int lo)
+static int obp_devseek(int dev_desc, int hi, int lo)
{
- DPRINTF("obp_devseek: fd %d, hi %d, lo %d\n", dev_desc, hi, lo);
+ int ret;
- return 0;
+ PUSH(lo);
+ PUSH(hi);
+ push_str("seek");
+ PUSH(dev_desc);
+ fword("$call-method");
+ ret = POP();
+
+ DPRINTF("obp_devseek(fd 0x%x, hi %d, lo %d) = %d\n", dev_desc, hi, lo, ret);
+
+ return ret;
}
static int obp_inst2pkg(int dev_desc)
{
- DPRINTF("obp_inst2pkg: fd %d\n", dev_desc);
+ int ret;
- return 0;
+ PUSH(dev_desc);
+ fword("ihandle>phandle");
+ ret = POP();
+
+ DPRINTF("obp_inst2pkg(fd 0x%x) = 0x%x\n", dev_desc, ret);
+
+ return ret;
}
static int obp_cpustart(unsigned int whichcpu, int ctxtbl_ptr,
@@ -415,7 +477,7 @@
romvec0.pv_v2devops.v2_dev_write = obp_devwrite;
romvec0.pv_v2devops.v2_dev_seek = obp_devseek;
obp_arg.boot_dev_ctrl = 0;
- obp_arg.boot_dev_unit = '0';
+ obp_arg.boot_dev_unit = 0;
obp_arg.argv[0] = "sd(0,0,0):d";
switch(boot_device) {
@@ -444,6 +506,8 @@
romvec0.pv_v2bootargs.bootargs = &cmdline;
romvec0.pv_v2bootargs.fd_stdin = &obp_fd_stdin;
romvec0.pv_v2bootargs.fd_stdout = &obp_fd_stdout;
+ obp_stdin = PROMDEV_TTYA;
+ obp_stdout = PROMDEV_TTYA;
romvec0.v3_cpustart = obp_cpustart;
romvec0.v3_cpustop = obp_cpustop;
Modified: openbios-devel/config/examples/cross-sparc32_config.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc32_config.xml 2006-05-15 08:17:51 UTC (rev 18)
+++ openbios-devel/config/examples/cross-sparc32_config.xml 2006-05-16 17:36:09 UTC (rev 19)
@@ -18,7 +18,7 @@
<!-- Kernel Debugging -->
<option name="CONFIG_DEBUG" type="boolean" value="true"/>
- <option name="CONFIG_DEBUG_BOOT" type="boolean" value="true"/>
+ <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_DSTACK" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_RSTACK" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_DICTIONARY" type="boolean" value="false"/>
@@ -29,6 +29,7 @@
<option name="CONFIG_DEBUG_ESP" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_SUN_PARTS" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_OBP" type="boolean" value="false"/>
+ <option name="CONFIG_DEBUG_IOMMU" type="boolean" value="false"/>
<option name="CONFIG_SERIAL_PORT" type="integer" value="0"/>
<option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/>
Modified: openbios-devel/config/examples/sparc32_config.xml
===================================================================
--- openbios-devel/config/examples/sparc32_config.xml 2006-05-15 08:17:51 UTC (rev 18)
+++ openbios-devel/config/examples/sparc32_config.xml 2006-05-16 17:36:09 UTC (rev 19)
@@ -18,7 +18,7 @@
<!-- Kernel Debugging -->
<option name="CONFIG_DEBUG" type="boolean" value="true"/>
- <option name="CONFIG_DEBUG_BOOT" type="boolean" value="true"/>
+ <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_DSTACK" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_RSTACK" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_DICTIONARY" type="boolean" value="false"/>
@@ -29,6 +29,7 @@
<option name="CONFIG_DEBUG_ESP" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_SUN_PARTS" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_OBP" type="boolean" value="false"/>
+ <option name="CONFIG_DEBUG_IOMMU" type="boolean" value="false"/>
<option name="CONFIG_SERIAL_PORT" type="integer" value="0"/>
<option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/>
Modified: openbios-devel/drivers/esp.c
===================================================================
--- openbios-devel/drivers/esp.c 2006-05-15 08:17:51 UTC (rev 18)
+++ openbios-devel/drivers/esp.c 2006-05-16 17:36:09 UTC (rev 19)
@@ -42,6 +42,13 @@
paths, 1, name##_m, sizeof(name##_m)/sizeof(method_t)); \
} while(0)
+#ifdef CONFIG_DEBUG_ESP
+#define DPRINTF(fmt, args...) \
+ do { printk(fmt , ##args); } while (0)
+#else
+#define DPRINTF(fmt, args...)
+#endif
+
struct esp_dma {
volatile struct sparc_dma_registers *regs;
enum dvma_rev revision;
@@ -134,9 +141,8 @@
static int
ob_sd_read_sectors(esp_private_t *esp, sd_private_t *sd, int offset, void *dest, short len)
{
-#ifdef CONFIG_DEBUG_ESP
- printk("ob_sd_read_sectors id %d %lx block=%d len=%d\n", sd->id, (unsigned long)dest, offset, len);
-#endif
+ DPRINTF("ob_sd_read_sectors id %d %lx block=%d len=%d\n", sd->id, (unsigned long)dest, offset, len);
+
// Setup command = Read(10)
memset(esp->buffer, 0, 10);
esp->buffer[0] = 0x80;
@@ -226,14 +232,12 @@
ucell blk = POP();
char *dest = (char*)POP();
-#ifdef CONFIG_DEBUG_ESP
- printk("ob_sd_read_blocks id %d %lx block=%d n=%d\n", (*sd)->id, (unsigned long)dest, blk, n );
-#endif
+ DPRINTF("ob_sd_read_blocks id %d %lx block=%d n=%d\n", (*sd)->id, (unsigned long)dest, blk, n );
n *= (*sd)->bs / 512;
while (n) {
if (ob_sd_read_sectors(global_esp, *sd, blk, dest, 1)) {
- printk("ob_ide_read_blocks: error\n");
+ DPRINTF("ob_ide_read_blocks: error\n");
RET(0);
}
dest += (*sd)->bs;
@@ -259,9 +263,8 @@
id = POP();
*sd = &global_esp->sd[id];
-#ifdef CONFIG_DEBUG_ESP
- printk("opening drive %d\n", id);
-#endif
+ DPRINTF("opening drive %d\n", id);
+
selfword("open-deblocker");
/* interpose disk-label */
@@ -294,45 +297,45 @@
/* Hardcode everything for MrCoffee. */
if ((p = (void *)map_io(PHYS_JJ_ESPDMA, 0x10)) == 0) {
- printk("espdma_init: cannot map registers\n");
+ DPRINTF("espdma_init: cannot map registers\n");
return -1;
}
espdma->regs = p;
- printk("dma1: ");
+ DPRINTF("dma1: ");
switch ((espdma->regs->cond_reg) & DMA_DEVICE_ID) {
case DMA_VERS0:
espdma->revision = dvmarev0;
- printk("Revision 0 ");
+ DPRINTF("Revision 0 ");
break;
case DMA_ESCV1:
espdma->revision = dvmaesc1;
- printk("ESC Revision 1 ");
+ DPRINTF("ESC Revision 1 ");
break;
case DMA_VERS1:
espdma->revision = dvmarev1;
- printk("Revision 1 ");
+ DPRINTF("Revision 1 ");
break;
case DMA_VERS2:
espdma->revision = dvmarev2;
- printk("Revision 2 ");
+ DPRINTF("Revision 2 ");
break;
case DMA_VERHME:
espdma->revision = dvmahme;
- printk("HME DVMA gate array ");
+ DPRINTF("HME DVMA gate array ");
break;
case DMA_VERSPLUS:
espdma->revision = dvmarevplus;
- printk("Revision 1 PLUS ");
+ DPRINTF("Revision 1 PLUS ");
break;
default:
- printk("unknown dma version %x",
+ DPRINTF("unknown dma version %x",
(espdma->regs->cond_reg) & DMA_DEVICE_ID);
/* espdma->allocated = 1; */
break;
}
- printk("\n");
+ DPRINTF("\n");
return 0;
}
@@ -399,9 +402,7 @@
char nodebuff[256], aliasbuff[256];
esp_private_t *esp;
-#ifdef CONFIG_DEBUG_ESP
- printk("Initializing SCSI...");
-#endif
+ DPRINTF("Initializing SCSI...");
esp = malloc(sizeof(esp_private_t));
global_esp = esp;
@@ -412,23 +413,21 @@
/* Get the IO region */
esp->ll = (void *)map_io(PHYS_JJ_ESP, sizeof(struct esp_regs));
if (esp->ll == 0) {
- printk("Can't map ESP registers\n");
+ DPRINTF("Can't map ESP registers\n");
return -1;
}
esp->buffer = (void *)dvma_alloc(BUFSIZE, &esp->buffer_dvma);
if (!esp->buffer || !esp->buffer_dvma) {
- printk("Can't get a DVMA buffer\n");
+ DPRINTF("Can't get a DVMA buffer\n");
return -1;
}
// Chip reset
esp->ll->regs[ESP_CMD] = ESP_CMD_RC;
-#ifdef CONFIG_DEBUG_ESP
- printk("done\n");
- printk("Initializing SCSI devices...");
-#endif
+ DPRINTF("done\n");
+ DPRINTF("Initializing SCSI devices...");
for (id = 0; id < 8; id++) {
esp->sd[id].id = id;
@@ -475,12 +474,12 @@
add_alias(nodebuff, esp->sd[id].media_str);
}
sprintf(aliasbuff, "%s%d", esp->sd[id].media_str, *counter_ptr);
- (*counter_ptr)++;
add_alias(nodebuff, aliasbuff);
+ sprintf(aliasbuff, "sd(0,%d,0)", id);
+ add_alias(nodebuff, aliasbuff);
+ (*counter_ptr)++;
}
-#ifdef CONFIG_DEBUG_ESP
- printk("done\n");
-#endif
+ DPRINTF("done\n");
return 0;
}
Modified: openbios-devel/drivers/iommu.c
===================================================================
--- openbios-devel/drivers/iommu.c 2006-05-15 08:17:51 UTC (rev 18)
+++ openbios-devel/drivers/iommu.c 2006-05-16 17:36:09 UTC (rev 19)
@@ -22,6 +22,14 @@
#define IOPERM (IOPTE_CACHE | IOPTE_WRITE | IOPTE_VALID)
#define MKIOPTE(phys) (((((phys)>>4) & IOPTE_PAGE) | IOPERM) & ~IOPTE_WAZ)
#define LOWMEMSZ 32 * 1024 * 1024
+
+#ifdef CONFIG_DEBUG_IOMMU
+#define DPRINTF(fmt, args...) \
+ do { printk(fmt , ##args); } while (0)
+#else
+#define DPRINTF(fmt, args...)
+#endif
+
/*
* Allocatable memory chunk.
*/
@@ -70,12 +78,6 @@
t->curp = begin;
}
-static void
-mem_fini(struct mem *t)
-{
- t->curp = 0;
-}
-
void *
mem_alloc(struct mem *t, int size, int align)
{
@@ -147,7 +149,7 @@
pte |= SRMMU_PRIV; /* Supervisor only access */
}
*(uint32_t *)pa2va(pa) = pte;
- //printk("map_page: va 0x%lx pa 0x%lx pte 0x%x\n", va, epa, pte);
+ DPRINTF("map_page: va 0x%lx pa 0x%lx pte 0x%x\n", va, epa, pte);
return 0;
@@ -177,7 +179,7 @@
return va;
mva = (unsigned int) va;
- //printk("map_io: va 0x%p pa 0x%x off 0x%x npages %d\n", va, pa, off, npages); /* P3 */
+ DPRINTF("map_io: va 0x%p pa 0x%x off 0x%x npages %d\n", va, pa, off, npages); /* P3 */
while (npages-- != 0) {
map_page(mva, pa, 1);
mva += PAGE_SIZE;
@@ -313,7 +315,7 @@
unsigned int tmp;
if ((regs = map_io(PHYS_JJ_IOMMU, sizeof(struct iommu_regs))) == 0) {
- printk("Cannot map IOMMU\n");
+ DPRINTF("Cannot map IOMMU\n");
for (;;) { }
}
t->regs = regs;
@@ -334,7 +336,7 @@
/* Thremendous alignment causes great waste... */
ptsize = (t->vasize/PAGE_SIZE) * sizeof(int);
if ((ptab = mem_zalloc(&cmem, ptsize, ptsize)) == 0) {
- printk("Cannot allocate IOMMU table [0x%x]\n", ptsize);
+ DPRINTF("Cannot allocate IOMMU table [0x%x]\n", ptsize);
for (;;) { }
}
t->page_table = ptab;
@@ -344,8 +346,8 @@
regs->base = ((unsigned int)va2pa((unsigned long)ptab)) >> 4;
iommu_invalidate(regs);
- printk("IOMMU: impl %d vers %d page table at 0x%p of size %d bytes\n",
- impl, vers, t->page_table, ptsize);
+ DPRINTF("IOMMU: impl %d vers %d page table at 0x%p of size %d bytes\n",
+ impl, vers, t->page_table, ptsize);
mem_init(&t->bmap, (char*)t->plow, (char *)0xfffff000);
}
1
0
Today I got SILO to load Linux from CD, aliasing sd(x,y,z). I also made the
boot less noisy by default. SILO file is given as hda, cd image as hdb:
3 > boot disk
[sparc] Booting file 'disk' with parameters '<NULL>'
Unknown filesystem type
Not a bootable ELF image
Unknown filesystem type
Not a Linux kernel image
Unknown filesystem type
Loading a.out image...
Loaded 96912 bytes
entry point is 0x4000
Jumping to entry point...
SILO
No config file loaded, you can boot just from this command line
Type [prompath;]part/path_to_image [parameters] on the prompt
E.g. /iommu/sbus/espdma/esp/sd@3,0;4/vmlinux root=/dev/sda4
or 2/vmlinux.live (to load vmlinux.live from 2nd partition of boot disk)
Your imagename `:d' and arguments `' have either wrong syntax,
or describe a label which is not present in silo.conf
Type `help' at the boot: prompt if you need it and then try again.
boot: sd(0,1,0)/boot/sparc32.gz
Unknown filesystem type
Uncompressing image...
PROMLIB: obio_ranges 1
SILO can browse the filesystem, load sparc32.gz, uncompress it and start
Linux. Linux fails as before.
I feel that if partition access worked, booting directly from disk would be
easy. CD support needs some block size confusion solved, maybe even in Qemu.
What is the syntax used for accessing partitions, is it not like
.../sd@0,0:a for first partition?
_________________________________________________________________
FREE pop-up blocking with the new MSN Toolbar - get it now!
http://toolbar.msn.click-url.com/go/onm00200415ave/direct/01/
1
0
r18 - in openbios-devel: arch/sparc32 config/examples include include/sparc32
by svn＠openbios.org 15 May '06
by svn＠openbios.org 15 May '06
15 May '06
Author: stepan
Date: 2006-05-15 10:17:51 +0200 (Mon, 15 May 2006)
New Revision: 18
Added:
openbios-devel/arch/sparc32/aoutload.c
openbios-devel/include/a.out.h
openbios-devel/include/sparc32/a.out.h
Modified:
openbios-devel/arch/sparc32/boot.c
openbios-devel/arch/sparc32/build.xml
openbios-devel/arch/sparc32/elfload.c
openbios-devel/arch/sparc32/romvec.c
openbios-devel/arch/sparc32/tree.fs
openbios-devel/config/examples/cross-sparc32_config.xml
openbios-devel/config/examples/sparc32_config.xml
Log:
sparc32 merge
Added: openbios-devel/arch/sparc32/aoutload.c
===================================================================
--- openbios-devel/arch/sparc32/aoutload.c (rev 0)
+++ openbios-devel/arch/sparc32/aoutload.c 2006-05-15 08:17:51 UTC (rev 18)
@@ -0,0 +1,133 @@
+/* a.out boot loader
+ * As we have seek, this implementation can be straightforward.
+ * 2003-07 by SONE Takeshi
+ */
+
+#include "openbios/config.h"
+#include "openbios/kernel.h"
+#include "a.out.h"
+#include "sys_info.h"
+#include "loadfs.h"
+#define printf printk
+#define debug printk
+
+#define addr_fixup(addr) ((addr) & 0x00ffffff)
+
+static char *image_name, *image_version;
+const char *program_name, *program_version;
+
+static int check_mem_ranges(struct sys_info *info,
+ unsigned long start,
+ unsigned long size)
+{
+ int j;
+ unsigned long end;
+ unsigned long prog_start, prog_end;
+ struct memrange *mem;
+
+ prog_start = virt_to_phys(&_start);
+ prog_end = virt_to_phys(&_end);
+
+ end = start + size;
+
+ if (start < prog_start && end > prog_start)
+ goto conflict;
+ if (start < prog_end && end > prog_end)
+ goto conflict;
+ mem = info->memrange;
+ for (j = 0; j < info->n_memranges; j++) {
+ if (mem[j].base <= start && mem[j].base + mem[j].size >= end)
+ break;
+ }
+ if (j >= info->n_memranges)
+ goto badseg;
+ return 1;
+
+ conflict:
+ printf("%s occupies [%#lx-%#lx]\n", program_name, prog_start, prog_end);
+
+ badseg:
+ printf("A.out file [%#lx-%#lx] doesn't fit into memory\n", start, end - 1);
+ return 0;
+}
+
+int aout_load(struct sys_info *info, const char *filename, const char *cmdline)
+{
+ int retval = -1;
+ int image_retval;
+ struct exec ehdr;
+ unsigned long start, size;
+
+ image_name = image_version = 0;
+
+ if (!file_open(filename))
+ goto out;
+
+ if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) {
+ debug("Can't read a.out header\n");
+ retval = LOADER_NOT_SUPPORT;
+ goto out;
+ }
+
+ if (N_BADMAG(ehdr)) {
+ debug("Not a bootable a.out image\n");
+ retval = LOADER_NOT_SUPPORT;
+ goto out;
+ }
+
+ if (N_MAGIC(ehdr) == NMAGIC) {
+ size = N_DATADDR(ehdr) + ehdr.a_data;
+ } else {
+ size = ehdr.a_text + ehdr.a_data;
+ }
+
+ start = 0x4000; // N_TXTADDR(ehdr);
+
+ if (!check_mem_ranges(info, start, size))
+ goto out;
+
+ printf("Loading a.out %s...\n", image_name ? image_name : "image");
+
+ file_seek(N_TXTOFF(ehdr));
+
+ if (N_MAGIC(ehdr) == NMAGIC) {
+ if (lfile_read(start, ehdr.a_text) != ehdr.a_text) {
+ printf("Can't read program text segment (size 0x%x)\n", ehdr.a_text);
+ goto out;
+ }
+ if (lfile_read(start + N_DATADDR(ehdr), ehdr.a_data) != ehdr.a_data) {
+ printf("Can't read program data segment (size 0x%x)\n", ehdr.a_data);
+ goto out;
+ }
+ } else {
+ if (lfile_read(start, size) != size) {
+ printf("Can't read program (size 0x%x)\n", size);
+ goto out;
+ }
+ }
+
+ debug("Loaded %lu bytes\n", size);
+
+ debug("entry point is %#x\n", start);
+ printf("Jumping to entry point...\n");
+
+#if 1
+ {
+ extern unsigned int qemu_mem_size;
+ void *init_openprom(unsigned long memsize, const char *cmdline, char boot_device);
+
+ int (*entry)(const void *romvec, int p2, int p3, int p4, int p5);
+ const void *romvec;
+
+ romvec = init_openprom(qemu_mem_size, cmdline, 'c');
+ entry = (void *) addr_fixup(start);
+ image_retval = entry(romvec, 0, 0, 0, 0);
+ }
+#endif
+
+ printf("Image returned with return value %#x\n", image_retval);
+ retval = 0;
+
+out:
+ return retval;
+}
Modified: openbios-devel/arch/sparc32/boot.c
===================================================================
--- openbios-devel/arch/sparc32/boot.c 2006-05-14 11:22:41 UTC (rev 17)
+++ openbios-devel/arch/sparc32/boot.c 2006-05-15 08:17:51 UTC (rev 18)
@@ -10,6 +10,7 @@
#include "sys_info.h"
int elf_load(struct sys_info *, const char *filename, const char *cmdline);
+int aout_load(struct sys_info *, const char *filename, const char *cmdline);
int linux_load(struct sys_info *, const char *filename, const char *cmdline);
void boot(void);
@@ -37,8 +38,9 @@
printk("[sparc] Booting file '%s' with parameters '%s'\n",path, param);
if (elf_load(&sys_info, path, param) == LOADER_NOT_SUPPORT)
- if (linux_load(&sys_info, path, param) == LOADER_NOT_SUPPORT)
- printk("Unsupported image format\n");
+ if (linux_load(&sys_info, path, param) == LOADER_NOT_SUPPORT)
+ if (aout_load(&sys_info, path, param) == LOADER_NOT_SUPPORT)
+ printk("Unsupported image format\n");
free(path);
}
Modified: openbios-devel/arch/sparc32/build.xml
===================================================================
--- openbios-devel/arch/sparc32/build.xml 2006-05-14 11:22:41 UTC (rev 17)
+++ openbios-devel/arch/sparc32/build.xml 2006-05-15 08:17:51 UTC (rev 18)
@@ -18,6 +18,7 @@
<object source="linux_load.c"/>
<object source="sys_info.c"/>
<object source="elfload.c"/>
+ <object source="aoutload.c"/>
<object source="forthload.c"/>
<object source="loadfs.c"/>
<object source="romvec.c"/>
Modified: openbios-devel/arch/sparc32/elfload.c
===================================================================
--- openbios-devel/arch/sparc32/elfload.c 2006-05-14 11:22:41 UTC (rev 17)
+++ openbios-devel/arch/sparc32/elfload.c 2006-05-15 08:17:51 UTC (rev 18)
@@ -378,7 +378,7 @@
int (*entry)(const void *romvec, int p2, int p3, int p4, int p5);
const void *romvec;
- romvec = init_openprom(qemu_mem_size, NULL, 'c');
+ romvec = init_openprom(qemu_mem_size, cmdline, 'c');
entry = (void *) addr_fixup(ehdr.e_entry);
image_retval = entry(romvec, 0, 0, 0, 0);
}
Modified: openbios-devel/arch/sparc32/romvec.c
===================================================================
--- openbios-devel/arch/sparc32/romvec.c 2006-05-14 11:22:41 UTC (rev 17)
+++ openbios-devel/arch/sparc32/romvec.c 2006-05-15 08:17:51 UTC (rev 18)
@@ -17,9 +17,7 @@
#include "openbios/kernel.h"
#include "openbios/sysinclude.h"
-//#define DEBUG_OBP
-
-#ifdef DEBUG_OBP
+#ifdef CONFIG_DEBUG_OBP
#define DPRINTF(fmt, args...) \
do { printk(fmt , ##args); } while (0)
#else
@@ -181,7 +179,7 @@
static int obp_nbgetchar(void)
{
- return 0;
+ return getchar();
}
static int obp_nbputchar(int ch)
@@ -214,9 +212,15 @@
static int obp_devopen(char *str)
{
+ int ret;
+
DPRINTF("obp_devopen(%s)\n", str);
- return 0;
+ push_str(str);
+ fword("open-dev");
+ ret = POP();
+
+ return ret;
}
static int obp_devclose(__attribute__((unused)) int dev_desc)
@@ -228,9 +232,19 @@
static int obp_rdblkdev(int dev_desc, int num_blks, int offset, char *buf)
{
- DPRINTF("obp_rdblkdev: fd %x, num_blks %d, offset %d, buf 0x%x\n", dev_desc, num_blks, offset, buf);
+ int ret;
- return 0;
+ DPRINTF("obp_rdblkdev: fd %x, num_blks %d, offset %d, buf 0x%x\n", dev_desc, num_blks, offset, (int)buf);
+
+ PUSH((int)buf);
+ PUSH(offset);
+ PUSH(num_blks);
+ push_str("read-blocks");
+ PUSH(dev_desc);
+ fword("$call-method");
+ ret = POP();
+
+ return ret;
}
static char *obp_dumb_mmap(char *va, __attribute__((unused)) int which_io,
Modified: openbios-devel/arch/sparc32/tree.fs
===================================================================
--- openbios-devel/arch/sparc32/tree.fs 2006-05-14 11:22:41 UTC (rev 17)
+++ openbios-devel/arch/sparc32/tree.fs 2006-05-15 08:17:51 UTC (rev 18)
@@ -247,3 +247,7 @@
0 encode-int " slave" property
h# 2c encode-int 0 encode-int encode+ " intr" property
finish-device
+
+" /options" find-device
+ " disk" encode-string " boot-from" property
+
Modified: openbios-devel/config/examples/cross-sparc32_config.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc32_config.xml 2006-05-14 11:22:41 UTC (rev 17)
+++ openbios-devel/config/examples/cross-sparc32_config.xml 2006-05-15 08:17:51 UTC (rev 18)
@@ -28,6 +28,7 @@
<option name="CONFIG_DEBUG_CONSOLE_SERIAL" type="boolean" value="true"/>
<option name="CONFIG_DEBUG_ESP" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_SUN_PARTS" type="boolean" value="false"/>
+ <option name="CONFIG_DEBUG_OBP" type="boolean" value="false"/>
<option name="CONFIG_SERIAL_PORT" type="integer" value="0"/>
<option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/>
Modified: openbios-devel/config/examples/sparc32_config.xml
===================================================================
--- openbios-devel/config/examples/sparc32_config.xml 2006-05-14 11:22:41 UTC (rev 17)
+++ openbios-devel/config/examples/sparc32_config.xml 2006-05-15 08:17:51 UTC (rev 18)
@@ -28,6 +28,7 @@
<option name="CONFIG_DEBUG_CONSOLE_SERIAL" type="boolean" value="true"/>
<option name="CONFIG_DEBUG_ESP" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_SUN_PARTS" type="boolean" value="false"/>
+ <option name="CONFIG_DEBUG_OBP" type="boolean" value="false"/>
<option name="CONFIG_SERIAL_PORT" type="integer" value="0"/>
<option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/>
Added: openbios-devel/include/a.out.h
===================================================================
--- openbios-devel/include/a.out.h (rev 0)
+++ openbios-devel/include/a.out.h 2006-05-15 08:17:51 UTC (rev 18)
@@ -0,0 +1,268 @@
+#ifndef __A_OUT_GNU_H__
+#define __A_OUT_GNU_H__
+
+#define __GNU_EXEC_MACROS__
+
+#ifndef __STRUCT_EXEC_OVERRIDE__
+
+#include "asm/a.out.h"
+
+#endif /* __STRUCT_EXEC_OVERRIDE__ */
+
+/* these go in the N_MACHTYPE field */
+enum machine_type {
+#if defined (M_OLDSUN2)
+ M__OLDSUN2 = M_OLDSUN2,
+#else
+ M_OLDSUN2 = 0,
+#endif
+#if defined (M_68010)
+ M__68010 = M_68010,
+#else
+ M_68010 = 1,
+#endif
+#if defined (M_68020)
+ M__68020 = M_68020,
+#else
+ M_68020 = 2,
+#endif
+#if defined (M_SPARC)
+ M__SPARC = M_SPARC,
+#else
+ M_SPARC = 3,
+#endif
+ /* skip a bunch so we don't run into any of sun's numbers */
+ M_386 = 100,
+ M_MIPS1 = 151, /* MIPS R3000/R3000 binary */
+ M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
+};
+
+#if !defined (N_MAGIC)
+#define N_MAGIC(exec) ((exec).a_info & 0xffff)
+#endif
+#define N_MACHTYPE(exec) ((enum machine_type)(((exec).a_info >> 16) & 0xff))
+#define N_FLAGS(exec) (((exec).a_info >> 24) & 0xff)
+#define N_SET_INFO(exec, magic, type, flags) \
+ ((exec).a_info = ((magic) & 0xffff) \
+ | (((int)(type) & 0xff) << 16) \
+ | (((flags) & 0xff) << 24))
+#define N_SET_MAGIC(exec, magic) \
+ ((exec).a_info = (((exec).a_info & 0xffff0000) | ((magic) & 0xffff)))
+
+#define N_SET_MACHTYPE(exec, machtype) \
+ ((exec).a_info = \
+ ((exec).a_info&0xff00ffff) | ((((int)(machtype))&0xff) << 16))
+
+#define N_SET_FLAGS(exec, flags) \
+ ((exec).a_info = \
+ ((exec).a_info&0x00ffffff) | (((flags) & 0xff) << 24))
+
+/* Code indicating object file or impure executable. */
+#define OMAGIC 0407
+/* Code indicating pure executable. */
+#define NMAGIC 0410
+/* Code indicating demand-paged executable. */
+#define ZMAGIC 0413
+/* This indicates a demand-paged executable with the header in the text.
+ The first page is unmapped to help trap NULL pointer references */
+#define QMAGIC 0314
+
+/* Code indicating core file. */
+#define CMAGIC 0421
+
+#if !defined (N_BADMAG)
+#define N_BADMAG(x) (N_MAGIC(x) != OMAGIC \
+ && N_MAGIC(x) != NMAGIC \
+ && N_MAGIC(x) != ZMAGIC \
+ && N_MAGIC(x) != QMAGIC)
+#endif
+
+#define _N_HDROFF(x) (1024 - sizeof (struct exec))
+
+#if !defined (N_TXTOFF)
+#define N_TXTOFF(x) \
+ (N_MAGIC(x) == ZMAGIC ? _N_HDROFF((x)) + sizeof (struct exec) : \
+ (N_MAGIC(x) == QMAGIC ? 0 : sizeof (struct exec)))
+#endif
+
+#if !defined (N_DATOFF)
+#define N_DATOFF(x) (N_TXTOFF(x) + (x).a_text)
+#endif
+
+#if !defined (N_TRELOFF)
+#define N_TRELOFF(x) (N_DATOFF(x) + (x).a_data)
+#endif
+
+#if !defined (N_DRELOFF)
+#define N_DRELOFF(x) (N_TRELOFF(x) + N_TRSIZE(x))
+#endif
+
+#if !defined (N_SYMOFF)
+#define N_SYMOFF(x) (N_DRELOFF(x) + N_DRSIZE(x))
+#endif
+
+#if !defined (N_STROFF)
+#define N_STROFF(x) (N_SYMOFF(x) + N_SYMSIZE(x))
+#endif
+
+/* Address of text segment in memory after it is loaded. */
+#if !defined (N_TXTADDR)
+#define N_TXTADDR(x) (N_MAGIC(x) == QMAGIC ? PAGE_SIZE : 0)
+#endif
+
+/* Address of data segment in memory after it is loaded.
+ Note that it is up to you to define SEGMENT_SIZE
+ on machines not listed here. */
+#if defined(vax) || defined(hp300) || defined(pyr)
+#define SEGMENT_SIZE page_size
+#endif
+#ifdef sony
+#define SEGMENT_SIZE 0x2000
+#endif /* Sony. */
+#ifdef is68k
+#define SEGMENT_SIZE 0x20000
+#endif
+#if defined(m68k) && defined(PORTAR)
+#define PAGE_SIZE 0x400
+#define SEGMENT_SIZE PAGE_SIZE
+#endif
+
+#ifdef linux
+#include <asm/page.h>
+#if defined(__i386__) || defined(__mc68000__)
+#define SEGMENT_SIZE 1024
+#else
+#ifndef SEGMENT_SIZE
+#define SEGMENT_SIZE PAGE_SIZE
+#endif
+#endif
+#endif
+
+#define _N_SEGMENT_ROUND(x) (((x) + SEGMENT_SIZE - 1) & ~(SEGMENT_SIZE - 1))
+
+#define _N_TXTENDADDR(x) (N_TXTADDR(x)+(x).a_text)
+
+#ifndef N_DATADDR
+#define N_DATADDR(x) \
+ (N_MAGIC(x)==OMAGIC? (_N_TXTENDADDR(x)) \
+ : (_N_SEGMENT_ROUND (_N_TXTENDADDR(x))))
+#endif
+
+/* Address of bss segment in memory after it is loaded. */
+#if !defined (N_BSSADDR)
+#define N_BSSADDR(x) (N_DATADDR(x) + (x).a_data)
+#endif
+
+#if !defined (N_NLIST_DECLARED)
+struct nlist {
+ union {
+ char *n_name;
+ struct nlist *n_next;
+ long n_strx;
+ } n_un;
+ unsigned char n_type;
+ char n_other;
+ short n_desc;
+ unsigned long n_value;
+};
+#endif /* no N_NLIST_DECLARED. */
+
+#if !defined (N_UNDF)
+#define N_UNDF 0
+#endif
+#if !defined (N_ABS)
+#define N_ABS 2
+#endif
+#if !defined (N_TEXT)
+#define N_TEXT 4
+#endif
+#if !defined (N_DATA)
+#define N_DATA 6
+#endif
+#if !defined (N_BSS)
+#define N_BSS 8
+#endif
+#if !defined (N_FN)
+#define N_FN 15
+#endif
+
+#if !defined (N_EXT)
+#define N_EXT 1
+#endif
+#if !defined (N_TYPE)
+#define N_TYPE 036
+#endif
+#if !defined (N_STAB)
+#define N_STAB 0340
+#endif
+
+/* The following type indicates the definition of a symbol as being
+ an indirect reference to another symbol. The other symbol
+ appears as an undefined reference, immediately following this symbol.
+
+ Indirection is asymmetrical. The other symbol's value will be used
+ to satisfy requests for the indirect symbol, but not vice versa.
+ If the other symbol does not have a definition, libraries will
+ be searched to find a definition. */
+#define N_INDR 0xa
+
+/* The following symbols refer to set elements.
+ All the N_SET[ATDB] symbols with the same name form one set.
+ Space is allocated for the set in the text section, and each set
+ element's value is stored into one word of the space.
+ The first word of the space is the length of the set (number of elements).
+
+ The address of the set is made into an N_SETV symbol
+ whose name is the same as the name of the set.
+ This symbol acts like a N_DATA global symbol
+ in that it can satisfy undefined external references. */
+
+/* These appear as input to LD, in a .o file. */
+#define N_SETA 0x14 /* Absolute set element symbol */
+#define N_SETT 0x16 /* Text set element symbol */
+#define N_SETD 0x18 /* Data set element symbol */
+#define N_SETB 0x1A /* Bss set element symbol */
+
+/* This is output from LD. */
+#define N_SETV 0x1C /* Pointer to set vector in data area. */
+
+#if !defined (N_RELOCATION_INFO_DECLARED)
+/* This structure describes a single relocation to be performed.
+ The text-relocation section of the file is a vector of these structures,
+ all of which apply to the text section.
+ Likewise, the data-relocation section applies to the data section. */
+
+struct relocation_info
+{
+ /* Address (within segment) to be relocated. */
+ int r_address;
+ /* The meaning of r_symbolnum depends on r_extern. */
+ unsigned int r_symbolnum:24;
+ /* Nonzero means value is a pc-relative offset
+ and it should be relocated for changes in its own address
+ as well as for changes in the symbol or section specified. */
+ unsigned int r_pcrel:1;
+ /* Length (as exponent of 2) of the field to be relocated.
+ Thus, a value of 2 indicates 1<<2 bytes. */
+ unsigned int r_length:2;
+ /* 1 => relocate with value of symbol.
+ r_symbolnum is the index of the symbol
+ in file's the symbol table.
+ 0 => relocate with the address of a segment.
+ r_symbolnum is N_TEXT, N_DATA, N_BSS or N_ABS
+ (the N_EXT bit may be set also, but signifies nothing). */
+ unsigned int r_extern:1;
+ /* Four bits that aren't used, but when writing an object file
+ it is desirable to clear them. */
+#ifdef NS32K
+ unsigned r_bsr:1;
+ unsigned r_disp:1;
+ unsigned r_pad:2;
+#else
+ unsigned int r_pad:4;
+#endif
+};
+#endif /* no N_RELOCATION_INFO_DECLARED. */
+
+
+#endif /* __A_OUT_GNU_H__ */
Added: openbios-devel/include/sparc32/a.out.h
===================================================================
--- openbios-devel/include/sparc32/a.out.h (rev 0)
+++ openbios-devel/include/sparc32/a.out.h 2006-05-15 08:17:51 UTC (rev 18)
@@ -0,0 +1,98 @@
+/* $Id: a.out.h,v 1.13 2000/01/09 10:46:53 anton Exp $ */
+#ifndef __SPARC_A_OUT_H__
+#define __SPARC_A_OUT_H__
+
+#define SPARC_PGSIZE 0x2000 /* Thanks to the sun4 architecture... */
+#define SEGMENT_SIZE SPARC_PGSIZE /* whee... */
+
+struct exec {
+ unsigned char a_dynamic:1; /* A __DYNAMIC is in this image */
+ unsigned char a_toolversion:7;
+ unsigned char a_machtype;
+ unsigned short a_info;
+ unsigned long a_text; /* length of text, in bytes */
+ unsigned long a_data; /* length of data, in bytes */
+ unsigned long a_bss; /* length of bss, in bytes */
+ unsigned long a_syms; /* length of symbol table, in bytes */
+ unsigned long a_entry; /* where program begins */
+ unsigned long a_trsize;
+ unsigned long a_drsize;
+};
+
+/* Where in the file does the text information begin? */
+#define N_TXTOFF(x) (N_MAGIC(x) == ZMAGIC ? 0 : sizeof (struct exec))
+
+/* Where do the Symbols start? */
+#define N_SYMOFF(x) (N_TXTOFF(x) + (x).a_text + \
+ (x).a_data + (x).a_trsize + \
+ (x).a_drsize)
+
+/* Where does text segment go in memory after being loaded? */
+#define N_TXTADDR(x) (((N_MAGIC(x) == ZMAGIC) && \
+ ((x).a_entry < SPARC_PGSIZE)) ? \
+ 0 : SPARC_PGSIZE)
+
+/* And same for the data segment.. */
+#define N_DATADDR(x) (N_MAGIC(x)==OMAGIC ? \
+ (N_TXTADDR(x) + (x).a_text) \
+ : (_N_SEGMENT_ROUND (_N_TXTENDADDR(x))))
+
+#define N_TRSIZE(a) ((a).a_trsize)
+#define N_DRSIZE(a) ((a).a_drsize)
+#define N_SYMSIZE(a) ((a).a_syms)
+
+/*
+ * Sparc relocation types
+ */
+enum reloc_type
+{
+ RELOC_8,
+ RELOC_16,
+ RELOC_32, /* simplest relocs */
+ RELOC_DISP8,
+ RELOC_DISP16,
+ RELOC_DISP32, /* Disp's (pc-rel) */
+ RELOC_WDISP30,
+ RELOC_WDISP22, /* SR word disp's */
+ RELOC_HI22,
+ RELOC_22, /* SR 22-bit relocs */
+ RELOC_13,
+ RELOC_LO10, /* SR 13&10-bit relocs */
+ RELOC_SFA_BASE,
+ RELOC_SFA_OFF13, /* SR S.F.A. relocs */
+ RELOC_BASE10,
+ RELOC_BASE13,
+ RELOC_BASE22, /* base_relative pic */
+ RELOC_PC10,
+ RELOC_PC22, /* special pc-rel pic */
+ RELOC_JMP_TBL, /* jmp_tbl_rel in pic */
+ RELOC_SEGOFF16, /* ShLib offset-in-seg */
+ RELOC_GLOB_DAT,
+ RELOC_JMP_SLOT,
+ RELOC_RELATIVE /* rtld relocs */
+};
+
+/*
+ * Format of a relocation datum.
+ */
+struct relocation_info /* used when header.a_machtype == M_SPARC */
+{
+ unsigned long r_address; /* relocation addr */
+ unsigned int r_index:24; /* segment index or symbol index */
+ unsigned int r_extern:1; /* if F, r_index==SEG#; if T, SYM idx */
+ int r_pad:2; /* <unused> */
+ enum reloc_type r_type:5; /* type of relocation to perform */
+ long r_addend; /* addend for relocation value */
+};
+
+#define N_RELOCATION_INFO_DECLARED 1
+
+#ifdef __KERNEL__
+
+#include <asm/page.h>
+
+#define STACK_TOP (PAGE_OFFSET - PAGE_SIZE)
+
+#endif /* __KERNEL__ */
+
+#endif /* __SPARC_A_OUT_H__ */
1
0
I added a.out executable format support, which is used for prom-bootable
files.
Now SILO loads if a complete file is given as hda. There are problems with
device opening and block loading, and the partition offset has no effect. We
also need to support the ancient sd(controller, unit, lun) syntax.
3 > boot disk
[sparc] Booting file 'disk' with parameters '<NULL>'
Unknown filesystem type
Not a bootable ELF image
Unknown filesystem type
Not a Linux kernel image
Unknown filesystem type
Loading a.out image...
Loaded 96912 bytes
entry point is 0x4000
Jumping to entry point...
SILO
No config file loaded, you can boot just from this command line
Type [prompath;]part/path_to_image [parameters] on the prompt
E.g. /iommu/sbus/espdma/esp/sd@3,0;4/vmlinux root=/dev/sda4
or 2/vmlinux.live (to load vmlinux.live from 2nd partition of boot disk)
Your imagename `:d' and arguments `' have either wrong syntax,
or describe a label which is not present in silo.conf
Type `help' at the boot: prompt if you need it and then try again.
boot: /iommu/sbus/espdma/esp/sd@2,0;;4/vmlinux
Fatal error: Cannot read partition
Unknown ext2 error
Fatal error: Cannot read partition
Fatal error: Cannot read partition
Fatal error: Cannot read partition
Fatal error: Unable to open filesystem
Image not found.... try again
boot:
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
2
1
r17 - in openbios-devel: . modules utils utils/iso utils/iso/boot utils/iso/boot/grub
by svn＠openbios.org 14 May '06
by svn＠openbios.org 14 May '06
14 May '06
Author: stepan
Date: 2006-05-14 13:22:41 +0200 (Sun, 14 May 2006)
New Revision: 17
Added:
openbios-devel/utils/iso/
openbios-devel/utils/iso/README
openbios-devel/utils/iso/boot/
openbios-devel/utils/iso/boot/grub/
openbios-devel/utils/iso/boot/grub/README
openbios-devel/utils/iso/boot/grub/menu.lst
openbios-devel/utils/iso/boot/grub/stage2_eltorito
Modified:
openbios-devel/Makefile
openbios-devel/config.xml
openbios-devel/modules/cmdline.c
openbios-devel/rules.xml
Log:
* add "make runiso" support for x86
* quick hack to fix a bug in cmdline.c that prevents some capital
letters to be used
* switch default architecture from cross-ppc to x86 for now.
Modified: openbios-devel/Makefile
===================================================================
--- openbios-devel/Makefile 2006-05-10 23:00:34 UTC (rev 16)
+++ openbios-devel/Makefile 2006-05-14 11:22:41 UTC (rev 17)
@@ -63,3 +63,14 @@
run:
@echo "Running..."
@$(ODIR)/openbios-unix $(ODIR)/openbios-unix.dict
+
+
+# The following two targets will only work on x86 so far.
+#
+$(ODIR)/openbios.iso: $(ODIR)/openbios.multiboot $(ODIR)/openbios-x86.dict
+ @mkisofs -input-charset UTF-8 -r -b boot/grub/stage2_eltorito -no-emul-boot \
+ -boot-load-size 4 -boot-info-table -o $@ utils/iso $^
+
+runiso: $(ODIR)/openbios.iso
+ qemu -cdrom $^
+
Modified: openbios-devel/config.xml
===================================================================
--- openbios-devel/config.xml 2006-05-10 23:00:34 UTC (rev 16)
+++ openbios-devel/config.xml 2006-05-14 11:22:41 UTC (rev 17)
@@ -1 +1 @@
-link config/examples/cross-ppc_config.xml
\ No newline at end of file
+link config/examples/x86_config.xml
\ No newline at end of file
Modified: openbios-devel/modules/cmdline.c
===================================================================
--- openbios-devel/modules/cmdline.c 2006-05-10 23:00:34 UTC (rev 16)
+++ openbios-devel/modules/cmdline.c 2006-05-14 11:22:41 UTC (rev 17)
@@ -268,8 +268,8 @@
pos += emit_str( &buf[pos] );
break;
- case 68: /* left */
- drop = 1;
+ //case 68: /* left */
+ // drop = 1;
case 2: /* ^b */
if( pos ) {
move_cursor( -1 );
@@ -277,8 +277,8 @@
}
break;
- case 67: /* right */
- drop = 1;
+ //case 67: /* right */
+ // drop = 1;
case 6: /* ^f */
if( pos < n )
emit( buf[pos++] );
@@ -313,8 +313,8 @@
move_cursor( pos-emit_str(buf) );
break;
- case 66: /* down */
- drop = 1;
+ //case 66: /* down */
+ // drop = 1;
case 14: /* ^n */
if( !histind )
break;
@@ -328,8 +328,8 @@
}
break;
- case 65: /* up */
- drop = 1;
+ //case 65: /* up */
+ // drop = 1;
case 16: /* ^p */
if( !histind && add_to_history(ci, ci->buf) ) {
cur_added = 1;
Modified: openbios-devel/rules.xml
===================================================================
--- openbios-devel/rules.xml 2006-05-10 23:00:34 UTC (rev 16)
+++ openbios-devel/rules.xml 2006-05-14 11:22:41 UTC (rev 17)
@@ -1 +1 @@
-link config/examples/cross-ppc_rules.xml
\ No newline at end of file
+link config/examples/x86_rules.xml
\ No newline at end of file
Added: openbios-devel/utils/iso/README
===================================================================
--- openbios-devel/utils/iso/README (rev 0)
+++ openbios-devel/utils/iso/README 2006-05-14 11:22:41 UTC (rev 17)
@@ -0,0 +1,5 @@
+The files in this directory are packed into the ISO image created with
+
+ $ make runiso
+
+
Added: openbios-devel/utils/iso/boot/grub/README
===================================================================
--- openbios-devel/utils/iso/boot/grub/README (rev 0)
+++ openbios-devel/utils/iso/boot/grub/README 2006-05-14 11:22:41 UTC (rev 17)
@@ -0,0 +1 @@
+stage2_eltorito is part of grub and therefore (C) by the FSF.
Added: openbios-devel/utils/iso/boot/grub/menu.lst
===================================================================
--- openbios-devel/utils/iso/boot/grub/menu.lst (rev 0)
+++ openbios-devel/utils/iso/boot/grub/menu.lst 2006-05-14 11:22:41 UTC (rev 17)
@@ -0,0 +1,7 @@
+timeout 0
+default 0
+hiddenmenu
+title openbios
+kernel (cd)/openbios.multiboot
+module (cd)/openbios-x86.dict
+boot
Added: openbios-devel/utils/iso/boot/grub/stage2_eltorito
===================================================================
(Binary files differ)
Property changes on: openbios-devel/utils/iso/boot/grub/stage2_eltorito
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
1
0
Dear OpenBIOS readers,
since this list is very low traffic and so are the commits to the
repository, I decided to send the commit logs to this list so you
get a quick feedback on OpenBIOS activity.
You just got the first commit message from Blue Swirl's latest sparc32
code a couple of minutes ago.
If the number of commits starts disturbing discussion on this list I
will create a second list, but I think we are fine for now.
Stefan
--
coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br.
Tel.: +49 761 7668825 • Fax: +49 761 7664613
Email: info(a)coresystems.de • http://www.coresystems.de/
1
0
r16 - in openbios-devel: arch/sparc32 config/examples drivers include/openbios include/sparc32 libc modules
by svn＠openbios.org 11 May '06
by svn＠openbios.org 11 May '06
11 May '06
Author: stepan
Date: 2006-05-11 01:00:34 +0200 (Thu, 11 May 2006)
New Revision: 16
Added:
openbios-devel/arch/sparc32/openprom.h
openbios-devel/arch/sparc32/romvec.c
Modified:
openbios-devel/arch/sparc32/build.xml
openbios-devel/arch/sparc32/elfload.c
openbios-devel/arch/sparc32/openbios.c
openbios-devel/arch/sparc32/tree.fs
openbios-devel/config/examples/cross-sparc32_config.xml
openbios-devel/config/examples/sparc32_config.xml
openbios-devel/drivers/esp.c
openbios-devel/drivers/iommu.c
openbios-devel/drivers/sbus.c
openbios-devel/include/openbios/bindings.h
openbios-devel/include/sparc32/io.h
openbios-devel/libc/misc.c
openbios-devel/modules/bindings.c
openbios-devel/modules/sun-parts.c
Log:
merge more sparc32 code from: Blue Swirl <blueswir1(a)hotmail.com>
Modified: openbios-devel/arch/sparc32/build.xml
===================================================================
--- openbios-devel/arch/sparc32/build.xml 2006-05-10 21:41:21 UTC (rev 15)
+++ openbios-devel/arch/sparc32/build.xml 2006-05-10 23:00:34 UTC (rev 16)
@@ -20,6 +20,7 @@
<object source="elfload.c"/>
<object source="forthload.c"/>
<object source="loadfs.c"/>
+ <object source="romvec.c"/>
</library>
<executable name="target/arch/sparc32/entry.o" target="target">
Modified: openbios-devel/arch/sparc32/elfload.c
===================================================================
--- openbios-devel/arch/sparc32/elfload.c 2006-05-10 21:41:21 UTC (rev 15)
+++ openbios-devel/arch/sparc32/elfload.c 2006-05-10 23:00:34 UTC (rev 16)
@@ -369,7 +369,22 @@
debug("entry point is %#x\n", addr_fixup(ehdr.e_entry));
printf("Jumping to entry point...\n");
+
+#if 1
+ {
+ extern unsigned int qemu_mem_size;
+ void *init_openprom(unsigned long memsize, const char *cmdline, char boot_device);
+
+ int (*entry)(const void *romvec, int p2, int p3, int p4, int p5);
+ const void *romvec;
+
+ romvec = init_openprom(qemu_mem_size, NULL, 'c');
+ entry = (void *) addr_fixup(ehdr.e_entry);
+ image_retval = entry(romvec, 0, 0, 0, 0);
+ }
+#else
image_retval = start_elf(addr_fixup(ehdr.e_entry), virt_to_phys(boot_notes));
+#endif
// console_init(); FIXME
printf("Image returned with return value %#x\n", image_retval);
Modified: openbios-devel/arch/sparc32/openbios.c
===================================================================
--- openbios-devel/arch/sparc32/openbios.c 2006-05-10 21:41:21 UTC (rev 15)
+++ openbios-devel/arch/sparc32/openbios.c 2006-05-10 23:00:34 UTC (rev 16)
@@ -23,6 +23,8 @@
static void init_memory(void)
{
+ extern char _heap, _eheap;
+
/* push start and end of available memory to the stack
* so that the forth word QUIT can initialize memory
* management. For now we use hardcoded memory between
@@ -30,8 +32,8 @@
* than that we have serious bloat.
*/
- PUSH(0x10000);
- PUSH(0x9FFFF);
+ PUSH((unsigned int)&_heap);
+ PUSH((unsigned int)&_eheap);
}
void exception(cell no)
Added: openbios-devel/arch/sparc32/openprom.h
===================================================================
--- openbios-devel/arch/sparc32/openprom.h (rev 0)
+++ openbios-devel/arch/sparc32/openprom.h 2006-05-10 23:00:34 UTC (rev 16)
@@ -0,0 +1,257 @@
+#ifndef __SPARC_OPENPROM_H
+#define __SPARC_OPENPROM_H
+
+/* openprom.h: Prom structures and defines for access to the OPENBOOT
+ * prom routines and data areas.
+ *
+ * Copyright (C) 1995 David S. Miller (davem(a)caip.rutgers.edu)
+ */
+
+// #include <asm/vaddrs.h>
+
+/* Empirical constants... */
+#define LINUX_OPPROM_MAGIC 0x10010407
+
+#ifndef __ASSEMBLY__
+/* V0 prom device operations. */
+struct linux_dev_v0_funcs {
+ int (*v0_devopen)(char *device_str);
+ int (*v0_devclose)(int dev_desc);
+ int (*v0_rdblkdev)(int dev_desc, int num_blks, int blk_st, char *buf);
+ int (*v0_wrblkdev)(int dev_desc, int num_blks, int blk_st, char *buf);
+ int (*v0_wrnetdev)(int dev_desc, int num_bytes, char *buf);
+ int (*v0_rdnetdev)(int dev_desc, int num_bytes, char *buf);
+ int (*v0_rdchardev)(int dev_desc, int num_bytes, int dummy, char *buf);
+ int (*v0_wrchardev)(int dev_desc, int num_bytes, int dummy, char *buf);
+ int (*v0_seekdev)(int dev_desc, long logical_offst, int from);
+};
+
+/* V2 and later prom device operations. */
+struct linux_dev_v2_funcs {
+ int (*v2_inst2pkg)(int d); /* Convert ihandle to phandle */
+ char * (*v2_dumb_mem_alloc)(char *va, unsigned sz);
+ void (*v2_dumb_mem_free)(char *va, unsigned sz);
+
+ /* To map devices into virtual I/O space. */
+ char * (*v2_dumb_mmap)(char *virta, int which_io, unsigned paddr, unsigned sz);
+ void (*v2_dumb_munmap)(char *virta, unsigned size);
+
+ int (*v2_dev_open)(char *devpath);
+ void (*v2_dev_close)(int d);
+ int (*v2_dev_read)(int d, char *buf, int nbytes);
+ int (*v2_dev_write)(int d, char *buf, int nbytes);
+ int (*v2_dev_seek)(int d, int hi, int lo);
+
+ /* Never issued (multistage load support) */
+ void (*v2_wheee2)(void);
+ void (*v2_wheee3)(void);
+};
+
+struct linux_mlist_v0 {
+ struct linux_mlist_v0 *theres_more;
+ char *start_adr;
+ unsigned num_bytes;
+};
+
+struct linux_mem_v0 {
+ struct linux_mlist_v0 * const *v0_totphys;
+ struct linux_mlist_v0 * const *v0_prommap;
+ struct linux_mlist_v0 * const *v0_available; /* What we can use */
+};
+
+/* Arguments sent to the kernel from the boot prompt. */
+struct linux_arguments_v0 {
+ const char *argv[8];
+ char args[100];
+ char boot_dev[2];
+ int boot_dev_ctrl;
+ int boot_dev_unit;
+ int dev_partition;
+ const char *kernel_file_name;
+ void *aieee1; /* XXX */
+};
+
+/* V2 and up boot things. */
+struct linux_bootargs_v2 {
+ const char **bootpath;
+ const char **bootargs;
+ const int *fd_stdin;
+ const int *fd_stdout;
+};
+
+/* The top level PROM vector. */
+struct linux_romvec {
+ /* Version numbers. */
+ unsigned int pv_magic_cookie;
+ unsigned int pv_romvers;
+ unsigned int pv_plugin_revision;
+ unsigned int pv_printrev;
+
+ /* Version 0 memory descriptors. */
+ struct linux_mem_v0 pv_v0mem;
+
+ /* Node operations. */
+ const struct linux_nodeops *pv_nodeops;
+
+ char **pv_bootstr;
+ struct linux_dev_v0_funcs pv_v0devops;
+
+ const char *pv_stdin;
+ const char *pv_stdout;
+#define PROMDEV_KBD 0 /* input from keyboard */
+#define PROMDEV_SCREEN 0 /* output to screen */
+#define PROMDEV_TTYA 1 /* in/out to ttya */
+#define PROMDEV_TTYB 2 /* in/out to ttyb */
+
+ /* Blocking getchar/putchar. NOT REENTRANT! (grr) */
+ int (*pv_getchar)(void);
+ void (*pv_putchar)(int ch);
+
+ /* Non-blocking variants. */
+ int (*pv_nbgetchar)(void);
+ int (*pv_nbputchar)(int ch);
+
+ void (*pv_putstr)(char *str, int len);
+
+ /* Miscellany. */
+ void (*pv_reboot)(char *bootstr);
+ void (*pv_printf)(__const__ char *fmt, ...);
+ void (*pv_abort)(void);
+ __volatile__ int *pv_ticks;
+ void (*pv_halt)(void);
+ void (**pv_synchook)(void);
+
+ /* Evaluate a forth string, not different proto for V0 and V2->up. */
+ union {
+ void (*v0_eval)(int len, char *str);
+ void (*v2_eval)(char *str);
+ } pv_fortheval;
+
+ const struct linux_arguments_v0 * const *pv_v0bootargs;
+
+ /* Get ether address. */
+ unsigned int (*pv_enaddr)(int d, char *enaddr);
+
+ struct linux_bootargs_v2 pv_v2bootargs;
+ struct linux_dev_v2_funcs pv_v2devops;
+
+ int filler[15];
+
+ /* This one is sun4c/sun4 only. */
+ void (*pv_setctxt)(int ctxt, char *va, int pmeg);
+
+ /* Prom version 3 Multiprocessor routines. This stuff is crazy.
+ * No joke. Calling these when there is only one cpu probably
+ * crashes the machine, have to test this. :-)
+ */
+
+ /* v3_cpustart() will start the cpu 'whichcpu' in mmu-context
+ * 'thiscontext' executing at address 'prog_counter'
+ */
+ int (*v3_cpustart)(unsigned int whichcpu, int ctxtbl_ptr,
+ int thiscontext, char *prog_counter);
+
+ /* v3_cpustop() will cause cpu 'whichcpu' to stop executing
+ * until a resume cpu call is made.
+ */
+ int (*v3_cpustop)(unsigned int whichcpu);
+
+ /* v3_cpuidle() will idle cpu 'whichcpu' until a stop or
+ * resume cpu call is made.
+ */
+ int (*v3_cpuidle)(unsigned int whichcpu);
+
+ /* v3_cpuresume() will resume processor 'whichcpu' executing
+ * starting with whatever 'pc' and 'npc' were left at the
+ * last 'idle' or 'stop' call.
+ */
+ int (*v3_cpuresume)(unsigned int whichcpu);
+};
+
+/* Routines for traversing the prom device tree. */
+struct linux_nodeops {
+ int (*no_nextnode)(int node);
+ int (*no_child)(int node);
+ int (*no_proplen)(int node, char *name);
+ int (*no_getprop)(int node, char *name, char *val);
+ int (*no_setprop)(int node, char *name, char *val, int len);
+ const char * (*no_nextprop)(int node, char *name);
+};
+
+/* More fun PROM structures for device probing. */
+#define PROMREG_MAX 16
+#define PROMVADDR_MAX 16
+#define PROMINTR_MAX 15
+
+struct linux_prom_registers {
+ unsigned int which_io; /* is this in OBIO space? */
+ unsigned int phys_addr; /* The physical address of this register */
+ unsigned int reg_size; /* How many bytes does this register take up? */
+};
+
+struct linux_prom_irqs {
+ int pri; /* IRQ priority */
+ int vector; /* This is foobar, what does it do? */
+};
+
+/* Element of the "ranges" vector */
+struct linux_prom_ranges {
+ unsigned int ot_child_space;
+ unsigned int ot_child_base; /* Bus feels this */
+ unsigned int ot_parent_space;
+ unsigned int ot_parent_base; /* CPU looks from here */
+ unsigned int or_size;
+};
+
+/* Ranges and reg properties are a bit different for PCI. */
+struct linux_prom_pci_registers {
+ /*
+ * We don't know what information this field contain.
+ * We guess, PCI device function is in bits 15:8
+ * So, ...
+ */
+ unsigned int which_io; /* Let it be which_io */
+
+ unsigned int phys_hi;
+ unsigned int phys_lo;
+
+ unsigned int size_hi;
+ unsigned int size_lo;
+};
+
+struct linux_prom_pci_ranges {
+ unsigned int child_phys_hi; /* Only certain bits are encoded here. */
+ unsigned int child_phys_mid;
+ unsigned int child_phys_lo;
+
+ unsigned int parent_phys_hi;
+ unsigned int parent_phys_lo;
+
+ unsigned int size_hi;
+ unsigned int size_lo;
+};
+
+struct linux_prom_pci_assigned_addresses {
+ unsigned int which_io;
+
+ unsigned int phys_hi;
+ unsigned int phys_lo;
+
+ unsigned int size_hi;
+ unsigned int size_lo;
+};
+
+struct linux_prom_ebus_ranges {
+ unsigned int child_phys_hi;
+ unsigned int child_phys_lo;
+
+ unsigned int parent_phys_hi;
+ unsigned int parent_phys_mid;
+ unsigned int parent_phys_lo;
+
+ unsigned int size;
+};
+
+#endif /* !(__ASSEMBLY__) */
+
+#endif /* !(__SPARC_OPENPROM_H) */
Added: openbios-devel/arch/sparc32/romvec.c
===================================================================
--- openbios-devel/arch/sparc32/romvec.c (rev 0)
+++ openbios-devel/arch/sparc32/romvec.c 2006-05-10 23:00:34 UTC (rev 16)
@@ -0,0 +1,440 @@
+/*
+ * PROM interface support
+ * Copyright 1996 The Australian National University.
+ * Copyright 1996 Fujitsu Laboratories Limited
+ * Copyright 1999 Pete A. Zaitcev
+ * This software may be distributed under the terms of the Gnu
+ * Public License version 2 or later
+ */
+
+#include "openprom.h"
+#include "stdint.h"
+#include "asm/io.h"
+#include "asm/types.h"
+#include "libc/vsprintf.h"
+#include "openbios/config.h"
+#include "openbios/bindings.h"
+#include "openbios/kernel.h"
+#include "openbios/sysinclude.h"
+
+//#define DEBUG_OBP
+
+#ifdef DEBUG_OBP
+#define DPRINTF(fmt, args...) \
+ do { printk(fmt , ##args); } while (0)
+#else
+#define DPRINTF(fmt, args...)
+#endif
+
+#define PAGE_SIZE 4096
+
+static struct linux_mlist_v0 totphys[1];
+static struct linux_mlist_v0 totmap[1];
+static struct linux_mlist_v0 totavail[1];
+
+static struct linux_mlist_v0 *ptphys;
+static struct linux_mlist_v0 *ptmap;
+static struct linux_mlist_v0 *ptavail;
+static char obp_stdin, obp_stdout;
+static int obp_fd_stdin, obp_fd_stdout;
+
+static int obp_nextnode(int node);
+static int obp_child(int node);
+static int obp_proplen(int node, char *name);
+static int obp_getprop(int node, char *name, char *val);
+static int obp_setprop(int node, char *name, char *val, int len);
+static const char *obp_nextprop(int node, char *name);
+
+static const struct linux_nodeops nodeops0 = {
+ obp_nextnode, /* int (*no_nextnode)(int node); */
+ obp_child, /* int (*no_child)(int node); */
+ obp_proplen, /* int (*no_proplen)(int node, char *name); */
+ obp_getprop, /* int (*no_getprop)(int node,char *name,char *val); */
+ obp_setprop, /* int (*no_setprop)(int node, char *name,
+ char *val, int len); */
+ obp_nextprop /* char * (*no_nextprop)(int node, char *name); */
+};
+
+static struct linux_arguments_v0 obp_arg;
+static const struct linux_arguments_v0 * const obp_argp = &obp_arg;
+
+static void (*synch_hook)(void);
+
+static struct linux_romvec romvec0;
+static int prop_mem_reg[3];
+static int prop_mem_avail[3];
+static int prop_vmem_avail[6];
+
+static void doublewalk(unsigned ptab1, unsigned va)
+{
+}
+
+static int obp_nextnode(int node)
+{
+ int peer;
+
+ PUSH(node);
+ fword("peer");
+ peer = POP();
+ DPRINTF("obp_nextnode(%x) = %x\n", node, peer);
+
+ return peer;
+}
+
+static int obp_child(int node)
+{
+ int child;
+
+ PUSH(node);
+ fword("child");
+ child = POP();
+ DPRINTF("obp_child(%x) = %x\n", node, child);
+
+ return child;
+}
+
+static int obp_proplen(int node, char *name)
+{
+ int notfound;
+
+ push_str(name);
+ PUSH(node);
+ fword("get-package-property");
+ notfound = POP();
+
+ if (notfound) {
+ DPRINTF("obp_proplen(%x, %s) (not found)\n", node, name);
+ (void) POP();
+ (void) POP();
+
+ return -1;
+ } else {
+ int len;
+
+ len = POP();
+ (void) POP();
+ DPRINTF("obp_proplen(%x, %s) = %d\n", node, name, len);
+
+ return len;
+ }
+}
+
+static int obp_getprop(int node, char *name, char *value)
+{
+ int notfound;
+
+ if (!name) {
+ // NULL name means get first property
+ name = "NULL";
+ push_str("");
+ PUSH(node);
+ fword("next-property");
+ notfound = POP();
+ notfound = !notfound; // Different return value
+ } else {
+ push_str(name);
+ PUSH(node);
+ fword("get-package-property");
+ notfound = POP();
+ }
+ if (notfound) {
+ DPRINTF("obp_getprop(%x, %s) (not found)\n", node, name);
+ (void) POP();
+ (void) POP();
+
+ return -1;
+ } else {
+ int len;
+ char *str;
+
+ len = POP();
+ str = (char *) POP();
+ memcpy(value, str, len);
+
+ DPRINTF("obp_getprop(%x, %s) = %s\n", node, name, str);
+
+ return len;
+ }
+}
+
+static int obp_setprop(__attribute__((unused)) int node,
+ __attribute__((unused)) char *name,
+ __attribute__((unused)) char *value,
+ __attribute__((unused)) int len)
+{
+ DPRINTF("obp_setprop(%x, %s) = %s (%d)\n", node, name, value, len);
+
+ return -1;
+}
+
+static const char *obp_nextprop(int node, char *name)
+{
+ if (!name || *name == '\0') {
+ // NULL name means get first property
+ DPRINTF("obp_nextprop(%x, NULL)\n", node);
+ return 0;
+ }
+ DPRINTF("obp_nextprop(%x, %s)\n", node, name);
+
+ return 0;
+}
+
+static int obp_nbgetchar(void)
+{
+ return 0;
+}
+
+static int obp_nbputchar(int ch)
+{
+ putchar(ch);
+
+ return 0;
+}
+
+static void obp_reboot(char *str)
+{
+ printk("rebooting (%s)\n", str);
+ outb(0x71f00000, 1);
+ for (;;) {}
+}
+
+static void obp_abort()
+{
+ printk("abort, power off\n");
+ outb(0x71910000, 1);
+ for (;;) {}
+}
+
+static void obp_halt()
+{
+ printk("halt, power off\n");
+ outb(0x71910000, 1);
+ for (;;) {}
+}
+
+static int obp_devopen(char *str)
+{
+ DPRINTF("obp_devopen(%s)\n", str);
+
+ return 0;
+}
+
+static int obp_devclose(__attribute__((unused)) int dev_desc)
+{
+ DPRINTF("obp_devclose %x\n", dev_desc);
+
+ return 0;
+}
+
+static int obp_rdblkdev(int dev_desc, int num_blks, int offset, char *buf)
+{
+ DPRINTF("obp_rdblkdev: fd %x, num_blks %d, offset %d, buf 0x%x\n", dev_desc, num_blks, offset, buf);
+
+ return 0;
+}
+
+static char *obp_dumb_mmap(char *va, __attribute__((unused)) int which_io,
+ unsigned int pa, unsigned int size)
+{
+ unsigned int npages;
+ unsigned int off;
+ unsigned int mva;
+
+ DPRINTF("obp_dumb_mmap: virta %x, which_io %d, paddr %x, sz %d\n", va, which_io, pa, size);
+ off = pa & (PAGE_SIZE-1);
+ npages = (off + size + (PAGE_SIZE-1)) / PAGE_SIZE;
+ pa &= ~(PAGE_SIZE-1);
+
+ mva = (unsigned int) va;
+ while (npages-- != 0) {
+ map_page(mva, pa, 1);
+ mva += PAGE_SIZE;
+ pa += PAGE_SIZE;
+ }
+
+ return va;
+}
+
+static void obp_dumb_munmap(__attribute__((unused)) char *va,
+ __attribute__((unused)) unsigned int size)
+{
+ DPRINTF("obp_dumb_munmap: virta %x, sz %d\n", va, size);
+}
+
+static int obp_devread(int dev_desc, char *buf, int nbytes)
+{
+ DPRINTF("obp_devread: fd %d, nbytes %d\n", dev_desc, nbytes);
+
+ return 0;
+}
+
+static int obp_devwrite(int dev_desc, char *buf, int nbytes)
+{
+ DPRINTF("obp_devwrite: fd %d, buf %s, nbytes %d\n", dev_desc, buf, nbytes);
+
+ return nbytes;
+}
+
+static int obp_devseek(int dev_desc, __attribute__((unused)) int hi, int lo)
+{
+ DPRINTF("obp_devseek: fd %d, hi %d, lo %d\n", dev_desc, hi, lo);
+
+ return 0;
+}
+
+static int obp_inst2pkg(int dev_desc)
+{
+ DPRINTF("obp_inst2pkg: fd %d\n", dev_desc);
+
+ return 0;
+}
+
+static int obp_cpustart(unsigned int whichcpu, int ctxtbl_ptr,
+ int thiscontext, char *prog_counter)
+{
+ //int cpu, found;
+ struct linux_prom_registers *smp_ctable = (void *)ctxtbl_ptr;
+
+ DPRINTF("obp_cpustart: cpu %d, ctxptr %x, ctx %d, pc %x\n", whichcpu,
+ smp_ctable->phys_addr, thiscontext, prog_counter);
+#if 0
+ found = obp_getprop(whichcpu, "mid", (char *)&cpu);
+ if (found == -1)
+ return -1;
+ st_bypass(PHYS_JJ_EEPROM + 0x38, (unsigned int)prog_counter);
+ st_bypass(PHYS_JJ_EEPROM + 0x3C, ((unsigned int)smp_ctable->phys_addr) >> 4);
+ st_bypass(PHYS_JJ_EEPROM + 0x40, thiscontext);
+ DPRINTF("obp_cpustart: sending interrupt to CPU %d\n", cpu);
+ st_bypass(PHYS_JJ_INTR0 + 0x1000 * cpu + 8, 0x40000000);
+#endif
+
+ return 0;
+}
+
+static int obp_cpustop(__attribute__((unused)) unsigned int whichcpu)
+{
+ DPRINTF("obp_cpustop: cpu %d\n", whichcpu);
+
+ return 0;
+}
+
+static int obp_cpuidle(__attribute__((unused)) unsigned int whichcpu)
+{
+ DPRINTF("obp_cpuidle: cpu %d\n", whichcpu);
+
+ return 0;
+}
+
+static int obp_cpuresume(__attribute__((unused)) unsigned int whichcpu)
+{
+ DPRINTF("obp_cpuresume: cpu %d\n", whichcpu);
+
+ return 0;
+}
+
+void *
+init_openprom(unsigned long memsize, const char *cmdline, char boot_device)
+{
+ ptphys = totphys;
+ ptmap = totmap;
+ ptavail = totavail;
+
+ /*
+ * Form memory descriptors.
+ */
+ totphys[0].theres_more = 0;
+ totphys[0].start_adr = (char *) 0;
+ totphys[0].num_bytes = memsize;
+
+ totavail[0].theres_more = 0;
+ totavail[0].start_adr = (char*) 0;
+ totavail[0].num_bytes = memsize;
+
+ totmap[0].theres_more = 0;
+ totmap[0].start_adr = &_start;
+ totmap[0].num_bytes = (unsigned long) &_iomem - (unsigned long) &_start;
+
+ prop_mem_reg[0] = 0;
+ prop_mem_reg[1] = 0;
+ prop_mem_reg[2] = memsize;
+ prop_mem_avail[0] = 0;
+ prop_mem_avail[1] = 0;
+ prop_mem_avail[2] = va2pa((unsigned long)&_data);
+ prop_vmem_avail[0] = 0;
+ prop_vmem_avail[1] = 0;
+ prop_vmem_avail[2] = (unsigned long)&_start - 1;
+ prop_vmem_avail[3] = 0;
+ prop_vmem_avail[4] = 0xffe00000;
+ prop_vmem_avail[5] = 0x00200000;
+
+ // Linux wants a R/W romvec table
+ romvec0.pv_magic_cookie = LINUX_OPPROM_MAGIC;
+ romvec0.pv_romvers = 0;
+ romvec0.pv_plugin_revision = 77;
+ romvec0.pv_printrev = 0x10203;
+ romvec0.pv_v0mem.v0_totphys = &ptphys;
+ romvec0.pv_v0mem.v0_prommap = &ptmap;
+ romvec0.pv_v0mem.v0_available = &ptavail;
+ romvec0.pv_nodeops = &nodeops0;
+ romvec0.pv_bootstr = (void *)doublewalk;
+ romvec0.pv_v0devops.v0_devopen = &obp_devopen;
+ romvec0.pv_v0devops.v0_devclose = &obp_devclose;
+ romvec0.pv_v0devops.v0_rdblkdev = &obp_rdblkdev;
+ romvec0.pv_stdin = &obp_stdin;
+ romvec0.pv_stdout = &obp_stdout;
+ romvec0.pv_getchar = obp_nbgetchar;
+ romvec0.pv_putchar = (void (*)(int))obp_nbputchar;
+ romvec0.pv_nbgetchar = obp_nbgetchar;
+ romvec0.pv_nbputchar = obp_nbputchar;
+ romvec0.pv_reboot = obp_reboot;
+ romvec0.pv_printf = (void (*)(const char *fmt, ...))printk;
+ romvec0.pv_abort = obp_abort;
+ romvec0.pv_halt = obp_halt;
+ romvec0.pv_synchook = &synch_hook;
+ romvec0.pv_v0bootargs = &obp_argp;
+ romvec0.pv_v2devops.v2_inst2pkg = obp_inst2pkg;
+ romvec0.pv_v2devops.v2_dumb_mmap = obp_dumb_mmap;
+ romvec0.pv_v2devops.v2_dumb_munmap = obp_dumb_munmap;
+ romvec0.pv_v2devops.v2_dev_open = obp_devopen;
+ romvec0.pv_v2devops.v2_dev_close = (void (*)(int))obp_devclose;
+ romvec0.pv_v2devops.v2_dev_read = obp_devread;
+ romvec0.pv_v2devops.v2_dev_write = obp_devwrite;
+ romvec0.pv_v2devops.v2_dev_seek = obp_devseek;
+ obp_arg.boot_dev_ctrl = 0;
+ obp_arg.boot_dev_unit = '0';
+ obp_arg.argv[0] = "sd(0,0,0):d";
+
+ switch(boot_device) {
+ default:
+ case 'a':
+ obp_arg.argv[0] = "fd()";
+ obp_arg.boot_dev[0] = 'f';
+ obp_arg.boot_dev[1] = 'd';
+ break;
+ case 'd':
+ obp_arg.boot_dev_unit = '2';
+ obp_arg.argv[0] = "sd(0,2,0):d";
+ // Fall through
+ case 'c':
+ obp_arg.boot_dev[0] = 's';
+ obp_arg.boot_dev[1] = 'd';
+ break;
+ case 'n':
+ obp_arg.argv[0] = "le()";
+ obp_arg.boot_dev[0] = 'l';
+ obp_arg.boot_dev[1] = 'e';
+ break;
+ }
+ obp_arg.argv[1] = cmdline;
+ romvec0.pv_v2bootargs.bootpath = &obp_arg.argv[0];
+ romvec0.pv_v2bootargs.bootargs = &cmdline;
+ romvec0.pv_v2bootargs.fd_stdin = &obp_fd_stdin;
+ romvec0.pv_v2bootargs.fd_stdout = &obp_fd_stdout;
+
+ romvec0.v3_cpustart = obp_cpustart;
+ romvec0.v3_cpustop = obp_cpustop;
+ romvec0.v3_cpuidle = obp_cpuidle;
+ romvec0.v3_cpuresume = obp_cpuresume;
+
+ return &romvec0;
+}
Modified: openbios-devel/arch/sparc32/tree.fs
===================================================================
--- openbios-devel/arch/sparc32/tree.fs 2006-05-10 21:41:21 UTC (rev 15)
+++ openbios-devel/arch/sparc32/tree.fs 2006-05-10 23:00:34 UTC (rev 16)
@@ -3,14 +3,18 @@
2 encode-int " #address-cells" property
1 encode-int " #size-cells" property
" SUNW,SparcStation-5" encode-string " name" property
- " " encode-string " idprom" property
" SparcStation" encode-string " banner-name" property
" sun4m" encode-string " compatible" property
+ h# 01800000 encode-int 0 encode-int encode+ 0 encode-int encode+ h# 00000081 encode-int encode+
+ 0 encode-int encode+ 0 encode-int encode+ 0 encode-int encode+ 0 encode-int encode+
+ " idprom" property \ XXX
: encode-unit encode-unit-sbus ;
: decode-unit decode-unit-sbus ;
new-device
" memory" device-name
+ h# 100000 encode-int " available" property \ XXX
+ h# 0 encode-int h# 10000000 encode-int encode+ h# 00000300 encode-int encode+ " reg" property \ XXX
external
: open true ;
: close ;
@@ -19,6 +23,17 @@
finish-device
new-device
+ " virtual-memory" device-name
+ h# 100000 encode-int " available" property \ XXX
+ h# 0 encode-int h# 10000000 encode-int encode+ h# 00000300 encode-int encode+ " reg" property \ XXX
+ external
+ : open true ;
+ : close ;
+ \ claim ( phys size align -- base )
+ \ release ( phys size -- )
+finish-device
+
+new-device
" STP1012PGA" device-name
" cpu" device-type
d# 256 encode-int " mmu-nctx" property
@@ -33,7 +48,7 @@
1 encode-int " #size-cells" property
h# 0 encode-int h# 10000000 encode-int encode+ h# 00000300 encode-int encode+ " reg" property
external
- : open cr ." opening iommu" cr true ;
+ : open ( cr ." opening iommu" cr) true ;
: close ;
: encode-unit encode-unit-sbus ;
: decode-unit decode-unit-sbus ;
@@ -53,7 +68,7 @@
" ranges" property
h# 0 encode-int h# 10001000 encode-int encode+ h# 00000028 encode-int encode+ " reg" property
external
- : open cr ." opening SBus" cr true ;
+ : open ( cr ." opening SBus" cr) true ;
: close ;
: encode-unit encode-unit-sbus ;
: decode-unit decode-unit-sbus ;
@@ -157,7 +172,7 @@
h# 0 encode-int h# 0 encode-int encode+ h# 0 encode-int encode+ h# 71000000 encode-int encode+ h# 01000000 encode-int encode+
" ranges" property
external
- : open cr ." opening obio" cr true ;
+ : open ( cr ." opening obio" cr) true ;
: close ;
: encode-unit encode-unit-sbus ;
: decode-unit decode-unit-sbus ;
Modified: openbios-devel/config/examples/cross-sparc32_config.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc32_config.xml 2006-05-10 21:41:21 UTC (rev 15)
+++ openbios-devel/config/examples/cross-sparc32_config.xml 2006-05-10 23:00:34 UTC (rev 16)
@@ -26,7 +26,8 @@
<option name="CONFIG_DEBUG_INTERPRETER" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_CONSOLE" type="boolean" value="true"/>
<option name="CONFIG_DEBUG_CONSOLE_SERIAL" type="boolean" value="true"/>
- <option name="CONFIG_DEBUG_ESP" type="boolean" value="true"/>
+ <option name="CONFIG_DEBUG_ESP" type="boolean" value="false"/>
+ <option name="CONFIG_DEBUG_SUN_PARTS" type="boolean" value="false"/>
<option name="CONFIG_SERIAL_PORT" type="integer" value="0"/>
<option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/>
@@ -43,13 +44,13 @@
<option name="CONFIG_SUN_PARTS" type="boolean" value="true"/>
<option name="CONFIG_FS" type="boolean" value="true"/>
<option name="CONFIG_HFS" type="boolean" value="false"/>
- <option name="CONFIG_HFSP" type="boolean" value="true"/>
+ <option name="CONFIG_HFSP" type="boolean" value="false"/>
<option name="CONFIG_GRUBFS" type="boolean" value="true"/>
<option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/>
<option name="CONFIG_FSYS_FAT" type="boolean" value="false"/>
<option name="CONFIG_FSYS_JFS" type="boolean" value="false"/>
<option name="CONFIG_FSYS_MINIX" type="boolean" value="false"/>
- <option name="CONFIG_FSYS_REISERFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_REISERFS" type="boolean" value="false"/>
<option name="CONFIG_FSYS_XFS" type="boolean" value="false"/>
<option name="CONFIG_FSYS_UFS" type="boolean" value="true"/>
<option name="CONFIG_FSYS_ISO9660" type="boolean" value="true"/>
Modified: openbios-devel/config/examples/sparc32_config.xml
===================================================================
--- openbios-devel/config/examples/sparc32_config.xml 2006-05-10 21:41:21 UTC (rev 15)
+++ openbios-devel/config/examples/sparc32_config.xml 2006-05-10 23:00:34 UTC (rev 16)
@@ -26,6 +26,8 @@
<option name="CONFIG_DEBUG_INTERPRETER" type="boolean" value="false"/>
<option name="CONFIG_DEBUG_CONSOLE" type="boolean" value="true"/>
<option name="CONFIG_DEBUG_CONSOLE_SERIAL" type="boolean" value="true"/>
+ <option name="CONFIG_DEBUG_ESP" type="boolean" value="false"/>
+ <option name="CONFIG_DEBUG_SUN_PARTS" type="boolean" value="false"/>
<option name="CONFIG_SERIAL_PORT" type="integer" value="0"/>
<option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/>
@@ -42,13 +44,13 @@
<option name="CONFIG_SUN_PARTS" type="boolean" value="true"/>
<option name="CONFIG_FS" type="boolean" value="true"/>
<option name="CONFIG_HFS" type="boolean" value="false"/>
- <option name="CONFIG_HFSP" type="boolean" value="true"/>
+ <option name="CONFIG_HFSP" type="boolean" value="false"/>
<option name="CONFIG_GRUBFS" type="boolean" value="true"/>
<option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/>
<option name="CONFIG_FSYS_FAT" type="boolean" value="false"/>
<option name="CONFIG_FSYS_JFS" type="boolean" value="false"/>
<option name="CONFIG_FSYS_MINIX" type="boolean" value="false"/>
- <option name="CONFIG_FSYS_REISERFS" type="boolean" value="true"/>
+ <option name="CONFIG_FSYS_REISERFS" type="boolean" value="false"/>
<option name="CONFIG_FSYS_XFS" type="boolean" value="false"/>
<option name="CONFIG_FSYS_UFS" type="boolean" value="true"/>
<option name="CONFIG_FSYS_ISO9660" type="boolean" value="true"/>
Modified: openbios-devel/drivers/esp.c
===================================================================
--- openbios-devel/drivers/esp.c 2006-05-10 21:41:21 UTC (rev 15)
+++ openbios-devel/drivers/esp.c 2006-05-10 23:00:34 UTC (rev 16)
@@ -35,7 +35,7 @@
} while(0)
#define REGISTER_NODE_METHODS( name, path ) do { \
- char *paths[1]; \
+ const char *paths[1]; \
\
paths[0] = path; \
bind_node( name##_flags_, name##_size_, \
@@ -76,9 +76,9 @@
DECLARE_UNNAMED_NODE(ob_sd, INSTALL_OPEN, sizeof(sd_private_t *));
DECLARE_UNNAMED_NODE(ob_esp, INSTALL_OPEN, sizeof(esp_private_t *));
+#ifdef CONFIG_DEBUG_ESP
static void dump_drive(sd_private_t *drive)
{
-#ifdef CONFIG_DEBUG_ESP
printk("SCSI DRIVE @%lx:\n", (unsigned long)drive);
printk("id: %d\n", drive->id);
printk("media: %s\n", drive->media_str);
@@ -86,8 +86,8 @@
printk("sectors: %d\n", drive->sectors);
printk("present: %d\n", drive->present);
printk("bs: %d\n", drive->bs);
+}
#endif
-}
static int
do_command(esp_private_t *esp, sd_private_t *sd, int cmdlen, int replylen)
Modified: openbios-devel/drivers/iommu.c
===================================================================
--- openbios-devel/drivers/iommu.c 2006-05-10 21:41:21 UTC (rev 15)
+++ openbios-devel/drivers/iommu.c 2006-05-10 23:00:34 UTC (rev 16)
@@ -35,8 +35,8 @@
unsigned int va_shift;
-unsigned long *context_table;
-unsigned long *l1;
+static unsigned long *context_table;
+static unsigned long *l1;
/*
* IOMMU parameters
@@ -105,21 +105,20 @@
* highbase is used for v2p translation.
*/
int
-map_page(unsigned long *pgd, unsigned long va,
- unsigned long epa, int type)
+map_page(unsigned long va, unsigned long epa, int type)
{
uint32_t pte;
void *p;
unsigned long pa;
- pte = pgd[(va >> SRMMU_PGDIR_SHIFT) & (SRMMU_PTRS_PER_PGD - 1)];
+ pte = l1[(va >> SRMMU_PGDIR_SHIFT) & (SRMMU_PTRS_PER_PGD - 1)];
if ((pte & SRMMU_ET_MASK) == SRMMU_ET_INVALID) {
p = mem_zalloc(&cmem, SRMMU_PTRS_PER_PMD * sizeof(int),
SRMMU_PTRS_PER_PMD * sizeof(int));
if (p == 0)
goto drop;
pte = SRMMU_ET_PTD | ((va2pa((unsigned long)p)) >> 4);
- pgd[(va >> SRMMU_PGDIR_SHIFT) & (SRMMU_PTRS_PER_PGD - 1)] = pte;
+ l1[(va >> SRMMU_PGDIR_SHIFT) & (SRMMU_PTRS_PER_PGD - 1)] = pte;
/* barrier() */
}
@@ -178,9 +177,9 @@
return va;
mva = (unsigned int) va;
- printk("map_io: va 0x%p pa 0x%x off 0x%x npages %d\n", va, pa, off, npages); /* P3 */
+ //printk("map_io: va 0x%p pa 0x%x off 0x%x npages %d\n", va, pa, off, npages); /* P3 */
while (npages-- != 0) {
- map_page(l1, mva, pa, 1);
+ map_page(mva, pa, 1);
mva += PAGE_SIZE;
pa += PAGE_SIZE;
}
@@ -215,20 +214,20 @@
// 1:1 mapping for ROM
pa = va = (unsigned long)&_start;
for (; va < (unsigned long)&_data; va += PAGE_SIZE, pa += PAGE_SIZE) {
- map_page(l1, va, pa, 0);
+ map_page(va, pa, 0);
}
// data & bss mapped to end of RAM
va = (unsigned long)&_data;
for (; va < (unsigned long)&_end; va += PAGE_SIZE) {
pa = va2pa(va);
- map_page(l1, va, pa, 0);
+ map_page(va, pa, 0);
}
// 1:1 mapping for RAM
pa = va = 0;
for (; va < LOWMEMSZ; va += PAGE_SIZE, pa += PAGE_SIZE) {
- map_page(l1, va, pa, 0);
+ map_page(va, pa, 0);
}
/*
@@ -279,7 +278,7 @@
mva = (unsigned int) va;
mpa = (unsigned int) pa;
for (i = 0; i < npages; i++) {
- map_page(l1, mva, mpa, 1);
+ map_page(mva, mpa, 1);
mva += PAGE_SIZE;
mpa += PAGE_SIZE;
}
Modified: openbios-devel/drivers/sbus.c
===================================================================
--- openbios-devel/drivers/sbus.c 2006-05-10 21:41:21 UTC (rev 15)
+++ openbios-devel/drivers/sbus.c 2006-05-10 23:00:34 UTC (rev 16)
@@ -46,7 +46,7 @@
int ob_sbus_init(void)
{
- printk("Initializing SBus devices...\n");
+ //printk("Initializing SBus devices...\n");
return 0;
}
Modified: openbios-devel/include/openbios/bindings.h
===================================================================
--- openbios-devel/include/openbios/bindings.h 2006-05-10 21:41:21 UTC (rev 15)
+++ openbios-devel/include/openbios/bindings.h 2006-05-10 23:00:34 UTC (rev 16)
@@ -124,11 +124,11 @@
name##_m, sizeof(name##_m)/sizeof(method_t) ); \
} while(0)
-extern void bind_node( int flags, int size, char **paths, int npaths,
- method_t *methods, int nmethods );
+extern void bind_node( int flags, int size, const char * const *paths, int npaths,
+ const method_t *methods, int nmethods );
-extern void bind_new_node( int flags, int size, char *name,
- method_t *methods, int nmethods );
+extern void bind_new_node( int flags, int size, const char *name,
+ const method_t *methods, int nmethods );
#define INSTALL_OPEN 1 /* install trivial open and close methods */
Modified: openbios-devel/include/sparc32/io.h
===================================================================
--- openbios-devel/include/sparc32/io.h 2006-05-10 21:41:21 UTC (rev 15)
+++ openbios-devel/include/sparc32/io.h 2006-05-10 23:00:34 UTC (rev 16)
@@ -34,8 +34,7 @@
void *mem_alloc(struct mem *t, int size, int align);
void *mem_zalloc(struct mem *t, int size, int align);
-int map_page(unsigned long *pgd, unsigned long va,
- unsigned long epa, int type);
+int map_page(unsigned long va, unsigned long epa, int type);
void *map_io(unsigned pa, int size);
void init_mmu_swift();
void *dvma_alloc(int size, unsigned int *pphys);
Modified: openbios-devel/libc/misc.c
===================================================================
--- openbios-devel/libc/misc.c 2006-05-10 21:41:21 UTC (rev 15)
+++ openbios-devel/libc/misc.c 2006-05-10 23:00:34 UTC (rev 16)
@@ -22,7 +22,7 @@
void
qsort( void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void*) )
{
- int worked, i, j;
+ unsigned int worked, i, j;
/* even more inefficient than the glibc variant :-) */
do {
Modified: openbios-devel/modules/bindings.c
===================================================================
--- openbios-devel/modules/bindings.c 2006-05-10 21:41:21 UTC (rev 15)
+++ openbios-devel/modules/bindings.c 2006-05-10 23:00:34 UTC (rev 16)
@@ -431,7 +431,7 @@
static void
-add_methods( int flags, int size, method_t *methods, int nmet )
+add_methods( int flags, int size, const method_t *methods, int nmet )
{
xt_t xt=0;
int i;
@@ -470,14 +470,14 @@
}
void
-bind_node( int flags, int size, char **paths, int npaths,
- method_t *methods, int nmet )
+bind_node( int flags, int size, const char * const *paths, int npaths,
+ const method_t *methods, int nmet )
{
phandle_t save_ph = get_cur_dev();
int i;
for( i=0; i<npaths; i++ ) {
- char *name = paths[i];
+ const char *name = paths[i];
/* type matching? */
if( *name == 'T' ) {
@@ -506,8 +506,8 @@
}
void
-bind_new_node( int flags, int size, char *name,
- method_t *methods, int nmet )
+bind_new_node( int flags, int size, const char *name,
+ const method_t *methods, int nmet )
{
phandle_t save_ph = get_cur_dev();
Modified: openbios-devel/modules/sun-parts.c
===================================================================
--- openbios-devel/modules/sun-parts.c 2006-05-10 21:41:21 UTC (rev 15)
+++ openbios-devel/modules/sun-parts.c 2006-05-10 23:00:34 UTC (rev 16)
@@ -17,6 +17,13 @@
#include "libc/byteorder.h"
#include "modules.h"
+#ifdef CONFIG_DEBUG_SUN_PARTS
+#define DPRINTF(fmt, args...) \
+ do { printk(fmt , ##args); } while (0)
+#else
+#define DPRINTF(fmt, args...)
+#endif
+
typedef struct {
ullong offs;
ullong size;
@@ -88,7 +95,7 @@
struct sun_disklabel *p;
unsigned int i;
- printk("sunparts_open '%s'\n", str );
+ DPRINTF("sunparts_open '%s'\n", str );
if( str ) {
parnum = atol(str);
@@ -103,7 +110,7 @@
/* Check Magic */
if (!has_sun_part_magic(buf)) {
- printk("sun partition magic not found.\n");
+ DPRINTF("sun partition magic not found.\n");
RET(0);
}
@@ -111,7 +118,7 @@
p = (struct sun_disklabel *)buf;
for (i = 0; i < 8; i++) {
- printk("%c: %d + %d, id %x, flags %x\n", 'a' + i, p->partitions[i].start_cylinder,
+ DPRINTF("%c: %d + %d, id %x, flags %x\n", 'a' + i, p->partitions[i].start_cylinder,
p->partitions[i].num_sectors, p->infos[i].id, p->infos[i].flags);
if (parnum < 0) {
if (p->partitions[i].num_sectors != 0 && p->infos[i].id != 0)
@@ -122,7 +129,7 @@
__be16_to_cpu(p->ntrks) * __be16_to_cpu(p->nsect);
di->size = (llong)__be32_to_cpu(p->partitions[parnum].num_sectors) ;
- printk("Found Sun partition table, offs %d size %d\n", (int)di->offs, (int)di->size);
+ DPRINTF("Found Sun partition table, offs %d size %d\n", (int)di->offs, (int)di->size);
RET( -1 );
}
1
0
I added some of the legacy OBP methods and now we get this far, the last
line is Linux output:
2 > boot disk
[sparc] Booting file 'disk' with parameters '<NULL>'
Unknown filesystem type
Loading image...
segment 0 addr:0x0 file:0x2780e0 mem:0x2a3828 loading... clearing...
clearing checksum... ok
Loaded 2588896 bytes
entry point is 0x4000
Jumping to entry point...
PROMLIB: obio_ranges 1
Linux makes some OBP calls, probing the device tree. For some reason, Linux
expects the CPU node to be just after the root node (or at least all nodes
before CPU must have a device_type property), or it crashes. I moved some
nodes from forth/device/tree.fs to arch/sparc32/tree.fs, but that made the
system crash at start.
Other strange thing is that if the code size increses still a bit, for
example by enabling some disabled parts, the disks won't be recognized or
there are cryptic error messages from forth startup.
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
1
0
The loading error happened because Forth stack was in the middle of the
kernel file being loaded. I moved it away.
Now, with an ELF kernel file as -hda:
2 > boot disk
[sparc] Booting file 'disk' with parameters '<NULL>'
Unknown filesystem type
Loading image...
segment 0 addr:0x0 file:0x2780e0 mem:0x2a3828 loading... clearing...
clearing checksum... ok
Loaded 2588896 bytes
entry point is 0x4000
Jumping to entry point...
halt, power off
Looking at /tmp/qemu.log we find that Linux mapped itself to 0xf0000000,
called a few Openprom functions and because of the bad results decided to
halt.
Now we need to implement the Openprom functions for browsing the device tree
and others in romvec.c. For example, the sequence Linux uses to find root
node properties is something like:
node = nextnode(0); // get handle for "/"
ok = getprop(node, NULL, &str); // str should be the first property, for
example "compatible"
How can I get this kind of handles from C?
It would be nice to get booting by loading boot sectors working so that
instead of Linux we can try SILO.
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
4
5
ESP works now, I had the memcpy arguments switched (brown paper bag time).
I added Sun partition table handling:
opening SBus
opening drive 2
ob_sd_read_blocks id 2 ffdc28d8 block=0 n=1
ob_sd_read_sectors id 2 ffdc28d8 block=0 len=1
sunparts_open '<NULL>'
ob_sd_read_blocks id 2 ffdc2468 block=0 n=1
ob_sd_read_sectors id 2 ffdc2468 block=0 len=1
a: 0 + 1193664, id 83, flags 18
b: 0 + 0, id 83, flags 18
c: 0 + 0, id 83, flags 18
d: 0 + 0, id 83, flags 18
e: 0 + 0, id 83, flags 18
f: 0 + 0, id 83, flags 18
g: 0 + 0, id 83, flags 18
h: 0 + 0, id 83, flags 18
Found Sun partition table, offs 0 size 1193664
ob_sd_read_blocks id 2 ffdc2198 block=2 n=1
It would be nice to have more than one partition table model (PC and Sun)
supported at a time.
If I use a kernel file as a device image, OpenBIOS loads a lot of it but
crashes before it's finished:
Loading image...
segment 0 addr:0x0 file:0x2780e0 mem:0x2a3828 loading... ob_sd_read_blocks
id 2
0 block=0 n=5056
ob_sd_read_sectors id 2 0 block=0 len=1
--- clip ---
ob_sd_read_sectors id 2 12600 block=147 len=1
ob_sd_read_sectors id 2 12800 block=148 len=1
Unhandled Exception 0x00000009
PC = 0xffd0b7e4 NPC = 0xffd0b7e8
Stopping execution
I threw in some const qualifiers to make the data segment vanish, but there
are still some.
_________________________________________________________________
FREE pop-up blocking with the new MSN Toolbar - get it now!
http://toolbar.msn.click-url.com/go/onm00200415ave/direct/01/
2
3
Hi,
I tried unsubscribing from the list, but there is no 'openbios'
mailing-list listed at:
http://www.openbios.org/mailman/listinfo
Andre
2
1
The checksum problem was caused by bad pointer arithmetic (difference of
pointers to long is not equal to their byte difference).
Now also IOMMU and MMU mappings work. ESP is pretty close to working, we can
really probe for the devices and get their properties, but READ_10 still
returns zero data.
00000000-08000000
RAM 128 MB
forth started.
initializing memory...done
map_io: va 0xffdc4000 pa 0x10000000 off 0x0 npages 3
IOMMU: impl 0 vers 0 page table at 0xffda8000 of size 32768 bytes
Initializing SBus devices...
Initializing SCSI...map_io: va 0xffdc7000 pa 0x78400000 off 0x0 npages 1
dma1: Revision 0
map_io: va 0xffdc8000 pa 0x78800000 off 0x0 npages 1
done
Initializing SCSI devices...SCSI DRIVE @ffd70030:
id: 0
media: disk
model: QEMU HARDDISK
sectors: 23017
present: 1
bs: 512
SCSI DRIVE @ffd700a0:
id: 2
media: cdrom
model: QEMU CDROM
sectors: 0
present: 1
bs: 2048
done
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
1
0
Adding device aliases helped a bit, now the system attempts to load a
kernel!
qemu-system-sparc -L . -kernel /dev/null -nographic
boot arg = 0x0
00000000-08000000
RAM 128 MB
Checksum invalid (ba854bc8)!
forth started.
initializing memory...done
Initializing SBus devices...
Initializing SCSI...done
Initializing SCSI devices...done
Welcome to OpenBIOS v1.0RC1 built on May 4 2006 21:21
Type 'help' for detailed information
[sparc] Booting file 'cdrom' with parameters '<NULL>'
opening iommu
opening SBus
opening drive 2
ob_sd_read_blocks ffd9fe38 block=0 n=1
ob_sd_read_blocks ffd9f6f8 block=2 n=1
ob_sd_read_blocks ffd90560 block=2 n=2
ob_sd_read_blocks ffd6e018 block=128 n=1
ob_sd_read_blocks ffd6e018 block=16 n=1
ob_sd_read_blocks ffd92560 block=128 n=16
ob_sd_read_blocks ffd92560 block=16 n=16
ob_sd_read_blocks ffd92560 block=0 n=16
ob_sd_read_blocks ffd92560 block=512 n=16
ob_sd_read_blocks ffd90d60 block=64 n=4
ob_sd_read_blocks ffd90d60 block=68 n=4
ob_sd_read_blocks ffd90d60 block=72 n=4
ob_sd_read_blocks ffd90d60 block=76 n=4
ob_sd_read_blocks ffd90d60 block=80 n=4
ob_sd_read_blocks ffd90d60 block=84 n=4
ob_sd_read_blocks ffd90d60 block=88 n=4
ob_sd_read_blocks ffd90d60 block=92 n=4
ob_sd_read_blocks ffd90d60 block=96 n=4
ob_sd_read_blocks ffd90d60 block=100 n=4
ob_sd_read_blocks ffd90d60 block=104 n=4
ob_sd_read_blocks ffd90d60 block=108 n=4
ob_sd_read_blocks ffd90d60 block=112 n=4
ob_sd_read_blocks ffd90d60 block=116 n=4
ob_sd_read_blocks ffd90d60 block=120 n=4
ob_sd_read_blocks ffd90d60 block=124 n=4
Unknown filesystem type
ob_sd_read_blocks ffd6e018 block=0 n=1
Not a bootable ELF image
Because IO is unimplemented, the ELF image is not right.
Now the device tree is flawless, including correct SCSI device names:
2 > show-devs
-2c3700 /
-2c35e4 /aliases
-2c3540 /openprom (BootROM)
-2c3398 /openprom/client-services
-2c32ec /options
-2c3274 /chosen
-2c3190 /builtin
-2c30ec /builtin/console
-2be2fc /packages
-2be008 /packages/client-iface
-2bd37c /packages/disk-label
-2bcef0 /packages/cmdline
-2bb050 /packages/deblocker
-2bad04 /packages/misc-files
-2baa30 /packages/pc-parts
-2bcad8 /memory
-2bca34 /STP1012PGA (cpu)
-2bc918 /iommu@0,10000000
-2bc7ac /iommu@0,10000000/sbus@0,10001000 (hierarchical)
-2bc59c /iommu@0,10000000/sbus@0,10001000/SUNW,CS4231@3,c000000 (serial)
-2bc47c /iommu@0,10000000/sbus@0,10001000/SUNW,bpp@4,c800000
-2bc3c0 /iommu@0,10000000/sbus@0,10001000/SUNW,tcx@2,800000 (display)
-2bc0bc /iommu@0,10000000/sbus@0,10001000/espdma@4,8400000
-2ba8e8 /iommu@0,10000000/sbus@0,10001000/espdma@4,8400000/esp@4,8800000
(scsi)
-2ba704
/iommu@0,10000000/sbus@0,10001000/espdma@4,8400000/esp@4,8800000/sd@0,0
(block)
-2ba3f0
/iommu@0,10000000/sbus@0,10001000/espdma@4,8400000/esp@4,8800000/sd@2,0
(block)
-2bbfe4 /iommu@0,10000000/sbus@0,10001000/ledma@4,8400010
-2bbeec /iommu@0,10000000/sbus@0,10001000/ledma@4,8400010/le@4,8c00000
(network)
-2bbdec /iommu@0,10000000/sbus@0,10001000/xxxpower-management@4,a000000
-2bbd48 /obio (hierarchical)
-2bbba8 /obio/SUNW,fdtwo@0,400000 (block)
-2bbac8 /obio/auxio@0,900000
-2bba30 /obio/counter@0,d00000
-2bb98c /obio/eeprom@0,200000
-2bb8d4 /obio/interrupt@0,e00000
-2bb82c /obio/power@0,910000
-2bb774 /obio/slavioconfig@0,800000
-2bb6d4 /obio/zs@0,0 (serial)
-2bb5a4 /obio/zs@0,100000 (serial)
ok
I think the next step is to make real disk I/O (which needs DVMA
allocation).
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
2
3
I wrote:
>I added dummy methods, but there is no change. I'm afraid my Forth skills
>are so basic that while I can guess what the drivers/pci.fs and util/pci.fs
>are doing, I can't make a Sbus version. Could you help me?
Reading the 1275 I figured out how. Now we get a nice, very realistic device
tree:
>show-devs
-2c3700 /
-2c35e4 /aliases
-2c3540 /openprom (BootROM)
-2c3398 /openprom/client-services
-2c32ec /options
-2c3274 /chosen
-2c3190 /builtin
-2c30ec /builtin/console
-2be2fc /packages
-2be008 /packages/client-iface
-2bd37c /packages/disk-label
-2bcef0 /packages/cmdline
-2bb050 /packages/deblocker
-2bad04 /packages/misc-files
-2baa30 /packages/pc-parts
-2bcad8 /memory
-2bca34 /STP1012PGA (cpu)
-2bc918 /iommu@0,10000000
-2bc7ac /iommu@0,10000000/sbus@0,10001000 (hierarchical)
-2bc59c /iommu@0,10000000/sbus@0,10001000/SUNW,CS4231@3,c000000 (serial)
-2bc47c /iommu@0,10000000/sbus@0,10001000/SUNW,bpp@4,c800000
-2bc3c0 /iommu@0,10000000/sbus@0,10001000/SUNW,tcx@2,800000 (display)
-2bc0bc /iommu@0,10000000/sbus@0,10001000/espdma@4,8400000
-2ba8e8 /iommu@0,10000000/sbus@0,10001000/espdma@4,8400000/esp@4,8800000
(scsi)
-2ba748
/iommu@0,10000000/sbus@0,10001000/espdma@4,8400000/esp@4,8800000/sd@0
(block)
-2ba4ac
/iommu@0,10000000/sbus@0,10001000/espdma@4,8400000/esp@4,8800000/sd@2
(block)
-2bbfe4 /iommu@0,10000000/sbus@0,10001000/ledma@4,8400010
-2bbeec /iommu@0,10000000/sbus@0,10001000/ledma@4,8400010/le@4,8c00000
(network)
-2bbdec /iommu@0,10000000/sbus@0,10001000/xxxpower-management@4,a000000
-2bbd48 /obio (hierarchical)
-2bbba8 /obio/SUNW,fdtwo@0,400000 (block)
-2bbac8 /obio/auxio@0,900000
-2bba30 /obio/counter@0,d00000
-2bb98c /obio/eeprom@0,200000
-2bb8d4 /obio/interrupt@0,e00000
-2bb82c /obio/power@0,910000
-2bb774 /obio/slavioconfig@0,800000
-2bb6d4 /obio/zs@0,0 (serial)
-2bb5a4 /obio/zs@0,100000 (serial)
ok
The SCSI devices are still not correctly named, they should be sd@0,0 and
sd@2,0. What can be wrong?
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
1
0
>Going to some non-native implementation would probably be doable but it
>would also make the thing unneccesarily big and slow.
I found C versions of ash(l|r)di3 and moved all the files to libgcc
directory, is this better?
> > In real hardware, the zs nodes are named zs@0,0 and zs@0,100000. Maybe
>the
> > address has some effect to naming?
>
>yes, the parent node needs a decode-unit and encode-unit method. See
>drivers/pci.fs
I added dummy methods, but there is no change. I'm afraid my Forth skills
are so basic that while I can guess what the drivers/pci.fs and util/pci.fs
are doing, I can't make a Sbus version. Could you help me?
_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today it's FREE!
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/
1
0
>But I did not check in the libgcc files. Instead I added inclusion of
>gcc --print-libgcc in the make process. Can you try whether this works
>for you?
Maybe when not cross-compiling, but that's way too slow for me. I have built
four different versions of cross-gcc's and while they all can compile, none
has a working libgcc. That's why I had to remove the linking to libgcc and
add the files. I think not using system libgcc is cleaner way, the same
approach as taken in Linux kernel. Another solution would be getting rid of
long long arithmetic.
Here's my current version against SVN revision 3. I added most of the
devices to the tree.
There are two zs devices, but the other one can't be reached:
2 > cd /obio ok
2 > ls
-2bc228 interrupt@0
-2bc180 counter@0
-2bc0dc eeprom@0
-2bc024 zs@0
-2bbed4 zs@0
ok
2 > cd zs ok
2 > .properties
name "zs"
device_type "serial"
reg -- c : 0 0 0 0 0 0 0 0 0 0 0 8
slave 1
model "mk48t08"
intr -- 8 : 0 0 0 2c 0 0 0 0
keyboard 1
mouse 1
ok
In real hardware, the zs nodes are named zs@0,0 and zs@0,100000. Maybe the
address has some effect to naming?
_________________________________________________________________
Don't just search. Find. Check out the new MSN Search!
http://search.msn.click-url.com/go/onm00200636ave/direct/01/
2
4
Paul,
I dont have any test docs or drafts for fibre-channel, iSCSI
(and ethernet as well) for OpenBIOS at this point.
Currently I develope FCode for Sun's and IBM's OpenFirmware.
We hired a contractor to port existing FCode to the Apple server.
But it did not get much recognition.
Anyway, it would be awesome if QLogic at first released a
none supported version of FCode for the OpenBIOS/PC platform.
Then when it gets enough recognition from the OpenBIOS community,
I will further endorse QLogic to release supported versions of
fibre-channel, iSCSI and ethernet FCode for OpenBIOS.
Then it would be even more awesome if companies like Dell/HP and
may be even Sun and IBM realized the value of OpenBIOS for their
x86 machines. To make this happen, the interest should start somewhere.
I am going to attempt to make QLogic the pioneer in trying OpenBIOS.
_____________
Asif Haswarey
C1069W
QLogic Corporation
26650 Aliso Viejo Parkway
Aliso Viejo, CA 92656
Phone: 949.389.7607
Fax: 949.389.6308
-----Original Message-----
From: openbios-bounces(a)openbios.org
[mailto:openbios-bounces@openbios.org] On Behalf Of Paul Nasrat
Sent: Wednesday, April 26, 2006 1:02 PM
To: The OpenBIOS Mailinglist
Subject: Re: [OpenBIOS] Sparc32 progress
On Wed, 2006-04-26 at 12:13 -0700, Asif Haswarey wrote:
> At some point I plan to start testing with OpenBIOS and endorse the
> support of OpenBIOS in our fibre-channel and iSCSI products.
Out of curiosity do you have drafts of how you see fibre-channel/iSCSI
working with OpenBIOS/1275?
Paul
--
OpenBIOS http://openbios.org/
Mailinglist: http://www.openbios.org/mailman/listinfo
Free your System - May the Forth be with you
1
0