prerelease work

5 files changed, 273 insertions, 177 deletions

diff --git a/Drivers.macros b/Drivers.macros
new file mode 100644
index 0000000..95bab83
--- /dev/null
+++ b/Drivers.macros
@@ -0,0 +1,44 @@
+dnl
+dnl Some autoconf macros useful for device driver configuration
+dnl
+
+AC_SUBST(device_drivers)
+
+dnl AC_DRIVER_ALIAS(alias, canonical) makes --enable-alias have the
+dnl same effect as --enable-canonical.
+
+AC_DEFUN(AC_DRIVER_ALIAS, [
+[#] Checking for alias [$1]
+AC_ARG_ENABLE([$1],,
+enable_[$2]="$enable_[$1]"
+)])
+
+dnl AC_DRIVER_CLASS(name,option,files) defines a class of drivers.  If
+dnl any driver declared by AC_DRIVER to be in that class is selected
+dnl by the user, then set the specified option with AC_DEFINE and add
+dnl the specified files to the output variable `device_drivers'.  This
+dnl macro must precede the use of any corresponding AC_DRIVER macros.
+
+AC_DEFUN(AC_DRIVER_CLASS, [
+driver_class_[$1]_option=[$2]
+driver_class_[$1]_files="[$3]"
+])
+
+dnl AC_DRIVER(name,option,files [,class]) detects option --enable-name.  If
+dnl it's set, then `option' is defined with AC_DEFINE, and files is
+dnl added to the output variable `device_drivers'.  The driver is of class 
+dnl `class'; see the comments on AC_DRIVER_CLASS for more information.
+
+AC_DEFUN(AC_DRIVER, [
+[#] Checking for device driver option [$1]
+AC_ARG_ENABLE([$1],,
+AC_DEFINE([$2])
+device_drivers="$device_drivers [$3]"
+if test "driver_class_[$4]_selected+set" != set; then
+  driver_class_[$4]_selected=yes
+  AC_DEFINE_UNQUOTED($driver_class_[$4]_option)
+  device_drivers="$device_drivers $driver_class_[$4]_files"
+fi
+)])
+
+
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..50dbe43
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,183 @@
+Basic Installation
+==================
+
+   These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, a file
+`config.cache' that saves the results of its tests to speed up
+reconfiguring, and a file `config.log' containing compiler output
+(useful mainly for debugging `configure').
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If at some point `config.cache'
+contains results you don't want to keep, you may remove or edit it.
+
+   The file `configure.in' is used to create `configure' by a program
+called `autoconf'.  You only need `configure.in' if you want to change
+it or regenerate `configure' using a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  You can give `configure'
+initial values for variables by setting them in the environment.  Using
+a Bourne-compatible shell, you can do that on the command line like
+this:
+     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
+
+Or on systems that have the `env' program, you can do it like this:
+     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not supports the `VPATH'
+variable, you have to compile the package for one architecture at a time
+in the source code directory.  After you have installed the package for
+one architecture, use `make distclean' before reconfiguring for another
+architecture.
+
+Installation Names
+==================
+
+   By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=PATH' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' can not figure out
+automatically, but needs to determine by the type of host the package
+will run on.  Usually `configure' can figure that out, but if it prints
+a message saying it can not guess the host type, give it the
+`--host=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name with three fields:
+     CPU-COMPANY-SYSTEM
+
+See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the host type.
+
+   If you are building compiler tools for cross-compiling, you can also
+use the `--target=TYPE' option to select the type of system they will
+produce code for and the `--build=TYPE' option to select the type of
+system on which you are compiling the package.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Operation Controls
+==================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--cache-file=FILE'
+     Use and save the results of the tests in FILE instead of
+     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
+     debugging `configure'.
+
+`--help'
+     Print a summary of the options to `configure', and exit.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--version'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`configure' also accepts some other, not widely useful, options.
+
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 558b094..0000000
--- a/Makefile
+++ /dev/null
@@ -1,176 +0,0 @@
-# Makefile for Mach 4 kernel directory
-# Copyright 1996 Free Software Foundation, Inc.
-# This file is part of GNU Mach.  Redistribution terms are not yet decided. 
-
-
-
-# Set at entry:
-# $(srcdir) $(systype) $(installed-clib)
-
-sysdep = $(srcdir)/$(systype)
-
-ifeq ($(MIG),)
-MIG := mig
-endif
-
-ifeq ($(AWK),)
-AWK := awk
-endif
-
-all:
-
-# All the source in each directory.  Note that `bogus' contains no source,
-# only header files.
-
-# Generic code for various hardware drivers
-chips-files = atm.c audio.c bt431.c bt455.c bt459.c build_font.c busses.c \
-	cfb_hdw.c cfb_misc.c dc503.c dtop_handlers.c dtop_hdw.c dz_hdw.c \
-	fb_hdw.c fb_misc.c fdc_82077_hdw.c frc.c ims332.c isdn_79c30_hdw.c \
-	kernel_font.c lance.c lance_mapped.c lk201.c mc_clock.c mouse.c \
-	nc.c nw_mk.c pm_hdw.c pm_misc.c scc_8530_hdw.c screen.c \
-	screen_switch.c serial_console.c sfb_hdw.c sfb_misc.c spans.c \
-	tca100.c tca100_if.c xcfb_hdb.c xcfb_misc.c
-
-# Generic code for various SCSI unit types
-scsi-files = disk_label.c mapped_scsi.c pc_scsi_label.c rz.c rz_audio.c \
-	rz_cpu.c rz_disk.c rz_disk_bbr.c rz_host.c rz_tape.c scsi.c \
-	scsi_alldevs.c scsi_comm.c scsi_cpu.c scsi_disk.c scsi_jukebox.c \
-	scsi_optical.c scsi_printer.c scsi_rom.c scsi_scanner.c \
-	scsi_tape.c scsi_worm.c
-
-# Icky kernel debugger
-ddb-files = $(addprefix db_,$(ddb-names))
-ddb-names = access.c aout.c break.c command.c cond.c examine.c expr.c \
-	ext_symtab.c input.c lex.c macro.c mp.c output.c print.c run.c \
-	sym.c task_thread.c trap.c variables.c watch.c write_cmd.c
-
-# Device support interfaces
-device-files = blkio.c chario.c cirbuf.c cons.c dev_lookup.c dev_name.c \
-	dev_pager.c device_init.c dk_label.c ds_routines.c net_io.c subrs.c
-
-# IPC implementation
-ipc-files = $(addprefix ipc_,$(ipc-names)) \
-		mach_msg.c mach_port.c mach_rpc.c mach_debug.c fipc.c
-ipc-names = entry.c hash.c init.c kmsg.c marequest.c mqueue.c \
-	notify.c object.c port.c pset.c right.c space.c splay.c \
-	table.c target.c thread.c 
-
-# "kernel" implementation (tasks, threads, trivia, etc.)
-kern-files = act.c ast.c bootstrap.c counters.c debug.c eventcount.c \
-	exception.c host.c ipc_host.c ipc_kobject.c ipc_mig.c ipc_sched.c \
-	ipc_tt.c kalloc.c lock.c lock_mon.c mach_clock.c mach_factor.c \
-	machine.c pc_sample.c printf.c priority.c processor.c profile.c \
-	queue.c sched_prim.c startup.c strings.c syscall_emulation.c \
-	syscall_subr.c syscall_sw.c task.c thread.c thread_swap.c \
-	time_stamp.c timer.c xpr.c zalloc.c elf-load.c
-
-# Still more trivia
-util-files = about_to_die.c cpu.c cpu_init.c die.c putchar.c puts.c
-
-# Virtual memory implementation
-vm-files = $(addprefix vm_,$(vm-names)) memory_object.c 
-vm-names = debug.c external.c fault.c init.c kern.c map.c \
-	object.c pageout.c resident.c user.c
-
-
-
-# Object files that go into the kernel image.  (This will be augmented by the
-# machine dependent Makefile fragment.)
-
-# Basic kernel source for Mach
-objfiles := $(subst .c,.o,$(ipc-files) $(kern-files) $(util-files) $(vm-files))
-vpath %.c $(srcdir)/ipc $(srcdir)/kern $(srcdir)/util $(srcdir)/vm
-
-# These device support files are always needed; the others are needed only
-# if particular drivers want the routines.
-# XXX functions in device/subrs.c should each be moved elsewhere
-objfiles += cons.o dev_lookup.o dev_name.o dev_pager.o device_init.o \
-	ds_routines.o subrs.o net_io.o blkio.o chario.o
-vpath %.c $(srcdir)/device
-
-# DDB support -- eventually to die.  Please.
-objfiles += $(subst .c,.o,$(ddb-files))
-vpath %.c $(srcdir)/ddb
-
-# Version number
-objfiles += version.o
-vpath version.c $(srcdir)
-
-
-# We steal routines from the C library and put them here.
-objfiles += clib-routines.o
-
-clib-routines = memcpy memset bcopy bzero htonl ntohl ntohs
-
-clib-routines.o: $(installed-clib)
-	$(LD) -o clib-routines.o -r $(addprefix -u ,$(clib-routines)) $(installed-clib)
-
-
-# Automatically generated source
-
-# User stubs
-objfiles += memory_object_user_user.o memory_object_default_user.o \
-	device_reply_user.o memory_object_reply_user.o
-
-# Server stubs
-objfiles += device_server.o device_pager_server.o mach_port_server.o \
-	mach_server.o mach4_server.o mach_debug_server.o mach_host_server.o
-
-# Where to find the relevant Mig source files
-vpath %.cli $(srcdir)/vm $(srcdir)/device
-vpath %.srv $(srcdir)/device $(srcdir)/ipc $(srcdir)/kern
-
-
-# XXXX temporary
-vm_fault.o: memory_object_user.h
-vm_object.o: memory_object_default.h
-ds_routines.o: device_reply.h
-
-
-
-
-#
-# Compilation flags
-#
-
-DEFINES += -DMACH -DCMU -DMACH_KERNEL -DKERNEL
-INCLUDES += -I. -I$(srcdir) -I$(srcdir)/util -I$(srcdir)/bogus  \
-	-I$(srcdir)/kern -I$(srcdir)/device \
-	-I$(srcdir)/include -I$(srcdir)/include/mach/sa 
-
-include $(sysdep)/Makefrag
-
-CPPFLAGS += -nostdinc $(DEFINES) $(INCLUDES) 
-
-MIGFLAGS += $(CPPFLAGS)
-
-#
-# Image
-#
-# (The newline in this command makes it much easier to read in make output.)
-all: kernel
-kernel: $(objfiles)
-	$(LD) -o $@ $(LDFLAGS) \
-		$(objfiles)
-#
-# How to do some things
-# 
-
-# Building foo.h from foo.sym:
-%.symc: %.sym
-	$(AWK) -f $(srcdir)/gensym.awk $< >$*.symc
-%.symc.o: %.symc
-	$(CC) -S $(CPPFLAGS) $(CFLAGS) $(CPPFLAGS-$@) -x c -o $@ $<
-%.h: %.symc.o
-	sed <$< -e 's/^[^*].*$$//' | \
-		sed -e 's/^[*]/#define/' -e 's/mAgIc[^-0-9]*//' >$@
-
-# Building from foo.cli
-%.h %_user.c: %.cli
-	$(MIG) $(MIGFLAGS) -header $*.h -user $*_user.c -server /dev/null $<
-
-# Building from foo.srv
-%_interface.h %_server.c: %.srv
-	$(MIG) $(MIGFLAGS) -header $*_interface.h -server $*_server.c -user /dev/null $<
-
-
diff --git a/configure.in b/configure.in
new file mode 100644
index 0000000..aef8c73
--- /dev/null
+++ b/configure.in
@@ -0,0 +1,45 @@
+dnl Configure script for GNU Mach.
+dnl Copyright 1997 Free Software Foundation, Inc.
+dnl This file is part of GNU Mach.  Redistribution terms are not yet decided.
+
+AC_INIT(kern/ipc_kobject.c)
+
+#
+# Deduce output var `systype' from configuration parms.
+#
+AC_CANONICAL_HOST
+
+case "$host_cpu" in
+i[[345]]86) systype=i386 ;;
+*) AC_MSG_ERROR([unsupported CPU type]) ;;
+esac
+
+AC_SUBST(systype)
+AC_SUBST(cross_compiling)
+
+# Default prefix is / for the kernel.
+AC_PREFIX_DEFAULT()
+
+#
+# Programs
+#
+AC_PROG_CC
+AC_PROG_AWK
+AC_PROG_INSTALL
+AC_PROG_LEX
+AC_PROG_YACC
+AC_CHECK_TOOL(MIG, mig, mig)
+
+if test $host != $build; then
+  AC_CHECK_PROG(BUILD_CC, gcc cc)
+fi
+
+# Set up `machine' link in build directory for easier header file location.
+AC_LINK_FILES(${systype}/${systype},machine)
+
+# Do machine-specific configuration last so that it can override anything
+# set above if necessary.
+
+AC_CONFIG_SUBDIRS($systype)
+
+AC_OUTPUT(Makefile)
diff --git a/version.c b/version.c
index 3cf20d9..f673e86 100644
--- a/version.c
+++ b/version.c
@@ -1 +1 @@
-char version[] = "GNUmach 0.2";
+char version[] = "GNUmach 1.0";