Improve README.

2008-11-18  Neal H. Walfield  <neal@gnu.org>

	* README: Improve text.

2 files changed, 48 insertions, 29 deletions

diff --git a/README b/README
index 52e088f..942bfbc 100644
--- a/README
+++ b/README
@@ -59,36 +59,29 @@ succeed:
 Also the header files are a good source of documentation.
 
 
-Using the Cross-Compiler
-------------------------
+L4
+--
 
-Does the package you want to cross-compile use the GNU build system
-(`configure' script)?  If not, then...  If yes, then proceed as follows.  Do
-something like ``PATH=$PATH:/where/the/viengoos/build/is/bin'' to make sure
-that `i686-pc-viengoos-gnu-gcc' can be found via `$PATH'.  As the master GNU
-system-guessing scripts don't know about Viengoos (yet), you have to link the
-package's `config.guess' and `config.sub' to the Viengoos ones.  That's what
-`fix_config_guess_and_sub' (see `Makefoo.am') does, used in
-`newlib/Makefile.am', for example.  After that, configuring the to-be-built
-package with ``--host=i686-pc-viengoos-gnu'' is all that *should* be needed,
-for a portable package.  Otherwise you'll see things explode.
+Viengoos uses Pistachio as a hardware abstraction.
 
+Download Pistachio by cloning upstream's mercurial repository.  You
+can find instructions on how to do this at:
 
-Installation on ia32
---------------------
+	http://www.l4ka.org/projects/pistachio/download.php
 
-Prerequisites: Pistachio from CVS with the patch below.  You can find
-information about how to download the Pistachio source distribution
-(which includes the kernel and sigma0) at the following URL:
+Enter the kernel directory and run `make' to set up a build
+environment.  Configure the source.  Select your platform.  Optionally
+enabled the kernel debugger.  And, be sure to enable the following
+option:
 
-	http://www.l4ka.org/projects/pistachio/download.php
+  Kernel -> Experimental Features -> Pager ExchangeRegisters
 
-Make sure that Kernel -> Experimental Features -> Pager ExchangeRegisters
-is enabled.
+You'll also need to build sigma0.  It is in the user
+directory.
 
-sigma0 must be built with a different link base than the default value
-0x20000, because that conflicts with GRUB (on ia32).  I have
-successfully used a link base of 0x40000.  Use the configure option
+sigma0 must be built with a different link base from the default
+(0x20000), because this conflicts with GRUB.  I have successfully used
+a link base of 0x40000.  Use the configure option
 --with-s0-linkbase=0x40000 when configuring the user space of the L4
 distribution.
 
@@ -96,11 +89,16 @@ You only need the ia32-kernel and sigma0 binary from the L4
 distribution.  You may want to install the other programs and
 utilities as well to test your L4 kernel, though.
 
-Then set up GRUB to boot laden as the kernel, and the L4 kernel,
-sigma0, viengoos and hieronymus (in that order).
 
-Try the debug option (-D 3) to laden and viengoos to see some output
-from them.  They are relatively silent by default.
+Booting
+-------
+
+GRUB can boot Viengoos.  Set up GRUB to boot laden as the kernel, and
+load the L4 kernel, sigma0, viengoos and hieronymus as modules (in
+that order).
+
+Try the debug option to laden (-D) and viengoos (-D 3) to see some
+output from them.  They are relatively silent by default.
 
 Here is an example menu.lst file for GNU GRUB:
 
@@ -113,3 +111,18 @@ module /boot/viengoos -D 3
 module /boot/hieronymus -D 3
 
 
+Using the Cross-Compiler
+------------------------
+
+Does the package you want to cross-compile use the GNU build system
+(`configure' script)?  If not, then...  If yes, then proceed as follows.  Do
+something like ``PATH=$PATH:/where/the/viengoos/build/is/bin'' to make sure
+that `i686-pc-viengoos-gnu-gcc' can be found via `$PATH'.  As the master GNU
+system-guessing scripts don't know about Viengoos (yet), you have to link the
+package's `config.guess' and `config.sub' to the Viengoos ones.  That's what
+`fix_config_guess_and_sub' (see `Makefoo.am') does, used in
+`newlib/Makefile.am', for example.  After that, configuring the to-be-built
+package with ``--host=i686-pc-viengoos-gnu'' is all that *should* be needed,
+for a portable package.  Otherwise you'll see things explode.
+
+
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
index adabbdf..f1d8224 100644
--- a/benchmarks/Makefile.am
+++ b/benchmarks/Makefile.am
@@ -20,9 +20,9 @@
 bootdir = $(prefix)/boot
 
 if ! ENABLE_TESTS
-SUBDIRS = sqlite boehm-gc
+SUBDIRS = sqlite # boehm-gc
 
-boot_PROGRAMS = shared-memory-distribution activity-distribution gcbench
+boot_PROGRAMS = shared-memory-distribution activity-distribution cache # gcbench
 endif
 
 shared_memory_distribution_CPPFLAGS = $(USER_CPPFLAGS)
@@ -43,3 +43,9 @@ gcbench_LDFLAGS = $(USER_LDFLAGS) -Lboehm-gc/gc-install/lib
 gcbench_LDADD = -lgc $(USER_LDADD)
 gcbench_SOURCES = GCbench.c
 
+cache_CPPFLAGS = $(USER_CPPFLAGS) -Isqlite/install/include
+cache_CFLAGS = $(USER_CFLAGS)
+cache_LDFLAGS = $(USER_LDFLAGS) -Lsqlite/install/lib
+cache_LDADD = $(USER_LDADD) -lm -lsqlite3
+cache_SOURCES = cache.c zipf.c
+