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, 283 insertions, 0 deletions

diff --git a/viengoos/output.c b/viengoos/output.c
new file mode 100644
index 0000000..b426a7d
--- /dev/null
+++ b/viengoos/output.c
@@ -0,0 +1,283 @@
+/* output.c - Output routines.
+   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 <stdarg.h>
+#include <string.h>
+
+#include "output.h"
+
+/* The active output driver.  */
+static struct output_driver *output;
+
+
+/* Activate the output driver NAME or the default one if NAME is a
+   null pointer.  Must be called once at startup, before calling
+   putchar or any other output routine.  Returns 0 if NAME is not a
+   valid output driver name, otherwise 1 on success.  */
+int
+output_init (const char *driver)
+{
+  const char *driver_cfg = NULL;
+
+  if (output)
+    {
+      output_deinit ();
+      output = 0;
+    }
+
+  if (driver)
+    {
+      struct output_driver **out = &output_drivers[0];
+      while (*out)
+	{
+	  unsigned int name_len = strlen ((*out)->name);
+	  if (!strncmp (driver, (*out)->name, name_len))
+	    {
+	      const char *cfg = driver + name_len;
+	      if (!*cfg || *cfg == ',') 
+		{
+		  if (*cfg)
+		    driver_cfg = cfg + 1;
+		  output = *out;
+		  break;
+		}
+	    }
+	  out++;
+	}
+      if (!output)
+	return 0;
+    }
+  else
+    output = output_drivers[0];
+
+  if (output->init)
+    (*output->init) (driver_cfg);
+
+  return 1;
+}
+
+
+/* Deactivate the output driver.  Must be called after the last time
+   putchar or any other output routine is called, and before control
+   is passed on to the L4 kernel.  */
+void
+output_deinit (void)
+{
+  if (output && output->deinit)
+    (*output->deinit) ();
+}
+
+
+/* Print the single character CHR on the output device.  */
+int
+putchar (int chr)
+{
+  if (!output)
+    output_init (0);
+
+  if (output->putchar)
+    (*output->putchar) (chr);
+
+  return 0;
+}
+
+
+int
+puts (const char *str)
+{
+  while (*str != '\0')
+    putchar (*(str++));
+
+  putchar ('\n');
+
+  return 0;
+}
+
+
+static void
+print_nr (unsigned long long nr, int base)
+{
+  static char *digits = "0123456789abcdef";
+  char str[30];
+  int i = 0;
+
+  do
+    {
+      str[i++] = digits[nr % base];
+      nr = nr / base;
+    }
+  while (nr);
+
+  i--;
+  while (i >= 0)
+    putchar (str[i--]);
+}
+  
+
+static void
+print_signed_nr (long long nr, int base)
+{
+  unsigned long long unr;
+
+  if (nr < 0)
+    {
+      putchar ('-');
+      unr = -nr;
+    }
+  else
+    unr = nr;
+
+  print_nr (unr, base);
+}
+  
+
+int
+vprintf (const char *fmt, va_list ap)
+{
+  const char *p = fmt;
+
+  while (*p != '\0')
+    {
+      if (*p != '%')
+	{
+	  putchar (*(p++));
+	  continue;
+	}
+
+      p++;
+      switch (*p)
+	{
+	case '%':
+	  putchar ('%');
+	  p++;
+	  break;
+
+	case 'l':
+	  p++;
+	  if (*p != 'l')
+	    {
+	      putchar ('%');
+	      putchar ('l');
+	      putchar (*(p++));
+	      continue;
+	    }
+	  p++;
+	  switch (*p)
+	    {
+	    case 'o':
+	      print_nr (va_arg (ap, unsigned long long), 8);
+	      p++;
+	      break;
+
+	    case 'd':
+	    case 'i':
+	      print_signed_nr (va_arg (ap, long long), 10);
+	      p++;
+	      break;
+
+	    case 'x':
+	    case 'X':
+	      print_nr (va_arg (ap, unsigned long long), 16);
+	      p++;
+	      break;
+
+	    case 'u':
+	      print_nr (va_arg (ap, unsigned long long), 10);
+	      p++;
+	      break;
+
+	    default:
+	      putchar ('%');
+	      putchar ('l');
+	      putchar ('l');
+	      putchar (*(p++));
+	      break;
+	    }
+	  break;
+
+	case 'o':
+	  print_nr (va_arg (ap, unsigned int), 8);
+	  p++;
+	  break;
+
+	case 'd':
+	case 'i':
+	  print_signed_nr (va_arg (ap, int), 10);
+	  p++;
+	  break;
+
+	case 'x':
+	case 'X':
+	  print_nr (va_arg (ap, unsigned int), 16);
+	  p++;
+	  break;
+
+	case 'u':
+	  print_nr (va_arg (ap, unsigned int), 10);
+	  p++;
+	  break;
+
+	case 'c':
+	  putchar (va_arg (ap, int));
+	  p++;
+	  break;
+
+	case 's':
+	  {
+	    char *str = va_arg (ap, char *);
+	    while (*str)
+	      putchar (*(str++));
+	  }
+	  p++;
+	  break;
+
+	case 'p':
+	  putchar ('0');
+	  putchar ('x');
+	  print_nr ((unsigned int) va_arg (ap, void *), 16);
+	  p++;
+	  break;
+
+	default:
+	  putchar ('%');
+	  putchar (*p);
+	  p++;
+	  break;
+	}
+    }
+
+  return 0;
+}
+
+int
+printf (const char *fmt, ...)
+{
+  va_list ap;
+
+  va_start (ap, fmt);
+  int r = vprintf (fmt, ap);
+  va_end (ap);
+
+  return r;
+}