2007-11-16 Neal H. Walfield <neal@gnu.org>

	* viengoos/Makefile.am: New file based on ../wortel/Makefile.am.
	* viengoos/headers.m4: New file.
	* viengoos/config.m4: New file based on ../wortel/config.m4.

	* viengoos/viengoos.h: New file.
	* viengoos/viengoos.c: New file.
	* viengoos/activity.h: Likewise.
	* viengoos/activity.c: Likewise.
	* viengoos/as.h: Likewise.
	* viengoos/as.c: Likewise.
	* viengoos/cap-lookup.c: Likewise.
	* viengoos/cap.h: Likewise.
	* viengoos/cap.c: Likewise.
	* viengoos/thread.h: New file.
	* viengoos/thread.c: New file.
	* viengoos/object.h: New file.
	* viengoos/object.c: New file.
	* viengoos/rm.h: New file.
	* viengoos/server.c: New file.
	* viengoos/server.h: New file.

	* viengoos/zalloc.h: Copied from ../physmem.
	* viengoos/zalloc.c: Copied from ../physmem.
	Don't include "output.h".
	Include <hurd/stddef.h>.
	Change uses of min_page_size to PAGESIZE.
	* viengoos/memory.h: New file.
	* viengoos/memory.c: New file.
	* viengoos/sigma0.c: Copy from ../wortel.
	* viengoos/sigma0.h: Copy from ../wortel.
	Don't include "shutdown.h".
	Include <hurd/stddef.h>.

	* viengoos/bits.h: Likewise.

	* viengoos/panic.c: New file.
	* viengoos/debug.c: Likewise.
	* viengoos/debug.h: Likewise.

	* viengoos/boot-modules.h: Likewise.
	* viengoos/boot-modules.c: Likewise.
	* viengoos/elf.h: Copied from ../wortel.
	* viengoos/loader.c: New file based on ../wortel/loader.c.
	* viengoos/loader.h: New file.
	* viengoos/multiboot.h: Copied from Grub.

	* viengoos/mmap.c: New file based on ../physmem/mmap.c.
	* viengoos/malloc-wrap.c: New file based on ../physmem/malloc-wrap.c.
	* viengoos/malloc.c: Version 2.8.3 of Doug Lea's malloc.c.
	* viengoos/malloc.h: Version 2.8.3 of Doug Lea's malloc.h.

	* viengoos/ia32-cmain.c: New file based on ../wortel/ia32-cmain.c.
	* viengoos/ia32-crt0.S: Copied from ../wortel.
	(STACK_SIZE): Use a 16 page stack.
	* viengoos/ia32-output.c: Copied from ../wortel.
	* viengoos/ia32-shutdown.c: Likewise.

	* viengoos/output.h: New file based on ../wortel/output.h.
	Include <stdarg.h>.
	(cprintf): New definition.
	(output_debug): Don't define.
	(debug): Don't define.
	* viengoos/output.c: New file based on ../wortel/output.c.
	Don't include <stdlib.h>.
	(vprintf): New function.
	(printf): Implement in terms of vprintf.
	* viengoos/output-none.c: Copied from ../wortel.
	* viengoos/output-serial.c: Likewise.
	* viengoos/output-stdio.c: New file.
	* viengoos/output-vga.c: Copied from ../wortel.

	* viengoos/shutdown.h: New file based on ../wortel/shutdown.h.
	Don't include "output.h".
	(panic): Don't define.
	(shutdown): Rename from this...
	(shutdown_machine): ... to this.
	* viengoos/shutdown.c: New file based on ../wortel/shutdown.c.
	(reset) [_L4_TEST_ENVIRONMENT]: Call abort.
	(halt) [_L4_TEST_ENVIRONMENT]: Call abort.
	(shutdown): Rename from this...
	(shutdown_machine): ... to this.

	* viengoos/t-environment.h: New file based on
	../libl4/tests/environment.h.
	Protect from multiple inclusion.
	Include <hurd/stddef.h>.
	Include <string.h>.
	Include <l4/stubs.h>.
	(program_name): New declaration.
	(check_nr): Don't assume that val1 and val2 are _L4_word_t, use
	typeof instead.
	(main): Call output_init.
	* viengoos/t-as.c: New file.

1 files changed, 146 insertions, 0 deletions

diff --git a/viengoos/ia32-cmain.c b/viengoos/ia32-cmain.c
new file mode 100644
index 0000000..0ea9a5b
--- /dev/null
+++ b/viengoos/ia32-cmain.c
@@ -0,0 +1,146 @@
+/* ia32-cmain.c - Startup code for the ia32.
+   Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+   Written by Marcus Brinkmann.
+
+   This file is part of the GNU Hurd.
+
+   The GNU Hurd 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.
+
+   The GNU Hurd 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., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <alloca.h>
+#include <stdint.h>
+
+#include <hurd/stddef.h>
+
+#include <l4/globals.h>
+#include <l4/init.h>
+#include <l4/stubs.h>
+#include <l4/stubs-init.h>
+
+#include "viengoos.h"
+#include "multiboot.h"
+#include "boot-modules.h"
+
+
+/* Check if the bit BIT in FLAGS is set.  */
+#define CHECK_FLAG(flags,bit)	((flags) & (1 << (bit)))
+
+
+/* Initialize libl4, setup the argument vector, and pass control over
+   to the main function.  */
+void
+cmain (void)
+{
+  multiboot_info_t *mbi;
+  int argc = 0;
+  char **argv = 0;
+
+  l4_init ();
+  l4_init_stubs ();
+
+  mbi = (multiboot_info_t *) l4_boot_info ();
+  debug (3, "Multiboot Info: %p", mbi);
+
+  if (CHECK_FLAG (mbi->flags, 3) && mbi->mods_count > 0)
+    {
+      /* A command line is available.  */
+      module_t *mod = (module_t *) mbi->mods_addr;
+      char *str = (char *) mod[0].string;
+      int nr = 0;
+
+      /* First time around we count the number of arguments.  */
+      argc = 1;
+      while (*str && *str == ' ')
+	str++;
+
+      while (*str)
+	if (*(str++) == ' ')
+	  {
+	    while (*str && *str == ' ')
+	      str++;
+	    if (*str)
+	      argc++;
+	  }
+      argv = alloca (sizeof (char *) * (argc + 1));
+
+      /* Second time around we fill in the argv.  */
+      str = (char *) mod[0].string;
+
+      while (*str && *str == ' ')
+	str++;
+      argv[nr++] = str;
+
+      while (*str)
+	{
+	  if (*str == ' ')
+	    {
+	      *(str++) = '\0';
+	      while (*str && *str == ' ')
+		str++;
+	      if (*str)
+		argv[nr++] = str;
+	    }
+	  else
+	    str++;
+	}
+      argv[nr] = 0;
+    }
+  else
+    {
+      argc = 1;
+
+      argv = alloca (sizeof (char *) * 2);
+      argv[0] = (char *) program_name;
+      argv[1] = 0;
+    }
+
+  /* Now invoke the main function.  */
+  main (argc, argv);
+
+  /* Never reached.  */
+}
+
+void
+find_components (void)
+{
+  multiboot_info_t *mbi = (multiboot_info_t *) l4_boot_info ();
+
+  /* Load the module information.  */
+  if (CHECK_FLAG (mbi->flags, 3))
+    {
+      module_t *mod = (module_t *) mbi->mods_addr;
+      /* Skip the entry for the rootserver.  */
+      mod++;
+
+      boot_module_count = mbi->mods_count - 1;
+      if (boot_module_count > BOOT_MODULES_MAX)
+	{
+	  printf ("WARNING: passed %d modules but only support %d!",
+		  boot_module_count, BOOT_MODULES_MAX);
+	  boot_module_count = BOOT_MODULES_MAX;
+	}
+
+      int i;
+      for (i = 0; i < boot_module_count; i++)
+	{
+	  boot_modules[i].start = mod[i].mod_start;
+	  boot_modules[i].end = mod[i].mod_end;
+	  boot_modules[i].command_line = (char *) mod[i].string;
+	}
+    }
+}