From d1ee506ebd11d305e5384ea0edf072d8076b4eac Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu, 9 Nov 2006 23:33:45 +0000
Subject: 2006-11-09  Barry deFreese  <bddebian@comcast.net>

[task #5726 --- ``GCC built-in functions'']
	* include/printf.h: Move file...
	* kern/printf.h: ... here.
	* kern/debug.h (panic_init, panic): Add prototypes.
	* chips/busses.c: Don't include `printf.h', include `kern/printf.h'
	and `kern/debug.h'.
	* ddb/db_command.c: Likewise.
	* ddb/db_cond.c: Likewise.
	* ddb/db_output.c: Likewise.
	* device/cirbuf.c: Likewise.
	* device/cons.c: Likewise.
	* device/dev_name.c: Likewise.
	* device/dev_pager.c: Likewise.
	* device/device_init.c: Likewise.
	* device/dk_label.c: Likewise.
	* device/ds_routines.c: Likewise.
	* device/net_io.c: Likewise.
	* device/subrs.c: Likewise.
	* i386/i386/debug_i386.c: Likewise.
	* i386/i386/fpe_linkage.c: Likewise.
	* i386/i386/fpu.c: Likewise.
	* i386/i386/io_map.c: Likewise.
	* i386/i386/kttd_interface.c: Likewise.
	* i386/i386/mp_desc.c: Likewise.
	* i386/i386/pcb.c: Likewise.
	* i386/i386/pic.c: Likewise.
	* i386/i386/trap.c: Likewise.
	* i386/i386at/autoconf.c: Likewise.
	* i386/i386at/com.c: Likewise.
	* i386/i386at/i386at_ds_routines.c: Likewise.
	* i386/i386at/kd.c: Likewise.
	* i386/i386at/kd_event.c: Likewise.
	* i386/i386at/kd_mouse.c: Likewise.
	* i386/i386at/lpr.c: Likewise.
	* i386/i386at/model_dep.c: Likewise.
	* i386/intel/pmap.c: Likewise.
	* ipc/ipc_entry.c: Likewise.
	* ipc/ipc_hash.c: Likewise.
	* ipc/ipc_kmsg.c: Likewise.
	* ipc/ipc_mqueue.c: Likewise.
	* ipc/ipc_notify.c: Likewise.
	* ipc/ipc_object.c: Likewise.
	* ipc/ipc_port.c: Likewise.
	* ipc/ipc_pset.c: Likewise.
	* ipc/ipc_right.c: Likewise.
	* ipc/mach_msg.c: Likewise.
	* ipc/mach_port.c: Likewise.
	* ipc/mach_rpc.c: Likewise.
	* kern/act.c: Likewise.
	* kern/ast.c: Likewise.
	* kern/bootstrap.c: Likewise.
	* kern/debug.c: Likewise.
	* kern/eventcount.c: Likewise.
	* kern/exception.c: Likewise.
	* kern/host.c: Likewise.
	* kern/ipc_host.c: Likewise.
	* kern/ipc_kobject.c: Likewise.
	* kern/ipc_mig.c: Likewise.
	* kern/ipc_sched.c: Likewise.
	* kern/ipc_tt.c: Likewise.
	* kern/kalloc.c: Likewise.
	* kern/lock.c: Likewise.
	* kern/mach_clock.c: Likewise.
	* kern/machine.c: Likewise.
	* kern/pc_sample.c: Likewise.
	* kern/printf.c: Likewise.
	* kern/processor.c: Likewise.
	* kern/sched_prim.c: Likewise.
	* kern/server_loop.ch: Likewise.
	* kern/startup.c: Likewise.
	* kern/task.c: Likewise.
	* kern/thread.c: Likewise.
	* kern/thread_swap.c: Likewise.
	* kern/xpr.c: Likewise.
	* kern/zalloc.c: Likewise.
	* vm/memory_object.c: Likewise.
	* vm/vm_debug.c: Likewise.
	* vm/vm_fault.c: Likewise.
	* vm/vm_kern.c: Likewise.
	* vm/vm_map.c: Likewise.
	* vm/vm_object.c: Likewise.
	* vm/vm_object.h: Likewise.
	* vm/vm_pageout.c: Likewise.
	* vm/vm_resident.c: Likewise.
---
 kern/act.c          |  1 +
 kern/ast.c          |  1 +
 kern/bootstrap.c    |  3 ++-
 kern/debug.c        |  6 ++----
 kern/debug.h        |  3 +++
 kern/eventcount.c   |  3 ++-
 kern/exception.c    |  1 +
 kern/host.c         |  1 +
 kern/ipc_host.c     |  1 +
 kern/ipc_kobject.c  |  3 ++-
 kern/ipc_mig.c      |  1 +
 kern/ipc_sched.c    |  1 +
 kern/ipc_tt.c       |  1 +
 kern/kalloc.c       |  1 +
 kern/lock.c         |  1 +
 kern/mach_clock.c   |  1 +
 kern/machine.c      |  1 +
 kern/pc_sample.c    |  2 +-
 kern/printf.c       |  2 +-
 kern/printf.h       | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 kern/processor.c    |  1 +
 kern/sched_prim.c   |  3 ++-
 kern/server_loop.ch |  1 +
 kern/startup.c      |  3 ++-
 kern/task.c         |  1 +
 kern/thread.c       |  3 ++-
 kern/thread_swap.c  |  1 +
 kern/xpr.c          |  1 +
 kern/zalloc.c       |  3 ++-
 29 files changed, 90 insertions(+), 13 deletions(-)
 create mode 100644 kern/printf.h

(limited to 'kern')

diff --git a/kern/act.c b/kern/act.c
index a7a8ac99..29548263 100644
--- a/kern/act.c
+++ b/kern/act.c
@@ -35,6 +35,7 @@
 #include <kern/zalloc.h>
 #include <kern/thread.h>
 #include <kern/task.h>
+#include <kern/debug.h> /* for panic() */
 #include <kern/act.h>
 #include <kern/current.h>
 #include "ipc_target.h"
diff --git a/kern/ast.c b/kern/ast.c
index 8fff9978..1d967fc3 100644
--- a/kern/ast.c
+++ b/kern/ast.c
@@ -37,6 +37,7 @@
 
 #include <kern/ast.h>
 #include <kern/counters.h>
+#include <kern/debug.h>  /* for panic() */
 #include "cpu_number.h"
 #include <kern/queue.h>
 #include <kern/sched.h>
diff --git a/kern/bootstrap.c b/kern/bootstrap.c
index 540322dd..4539765e 100644
--- a/kern/bootstrap.c
+++ b/kern/bootstrap.c
@@ -31,14 +31,15 @@
  */
 
 #include <alloca.h>
-#include <printf.h>
 #include <string.h>
 
 #include <mach/port.h>
 #include <mach/message.h>
 #include <machine/vm_param.h>
 #include <ipc/ipc_port.h>
+#include <kern/debug.h>  /* for panic() */
 #include <kern/host.h>
+#include <kern/printf.h>
 #include <kern/task.h>
 #include <kern/thread.h>
 #include <kern/lock.h>
diff --git a/kern/debug.c b/kern/debug.c
index 42764bd7..f8774fc0 100644
--- a/kern/debug.c
+++ b/kern/debug.c
@@ -24,16 +24,14 @@
  * the rights to redistribute these changes.
  */
 
-#include <printf.h>
+#include <kern/printf.h>
 #include <stdarg.h>
 
 #include "cpu_number.h"
 #include <kern/lock.h>
 #include <kern/thread.h>
 
-#warning missing include for panic()
-void panic(const char *s, ...);
-
+#include <kern/debug.h>
 
 extern void cnputc();
 void Debugger();
diff --git a/kern/debug.h b/kern/debug.h
index 526ccc68..28e7b73f 100644
--- a/kern/debug.h
+++ b/kern/debug.h
@@ -57,4 +57,7 @@
 
 #endif /* NDEBUG */
 
+extern void panic_init();
+extern void panic (const char *s, ...);
+
 #endif /* _mach_debug__debug_ */
diff --git a/kern/eventcount.c b/kern/eventcount.c
index 4a8ebd70..576607cb 100644
--- a/kern/eventcount.c
+++ b/kern/eventcount.c
@@ -35,11 +35,12 @@
  *
  */
 
-#include <printf.h>
+#include <kern/printf.h>
 #include <string.h>
 
 #include <mach/machine.h>
 #include <kern/ast.h>
+#include <kern/debug.h> /* For panic() */
 #include "cpu_number.h"
 #include <kern/lock.h>
 #include <kern/processor.h>
diff --git a/kern/exception.c b/kern/exception.c
index 62292b42..21a35811 100644
--- a/kern/exception.c
+++ b/kern/exception.c
@@ -38,6 +38,7 @@
 #include <ipc/mach_msg.h>
 #include <ipc/ipc_machdep.h>
 #include <kern/counters.h>
+#include <kern/debug.h>  /* for panic() */
 #include <kern/ipc_tt.h>
 #include <kern/task.h>
 #include <kern/thread.h>
diff --git a/kern/host.c b/kern/host.c
index 6e98c2cd..b1056af4 100644
--- a/kern/host.c
+++ b/kern/host.c
@@ -32,6 +32,7 @@
 #include <string.h>
 
 #include <kern/assert.h>
+#include <kern/debug.h>  /* for panic() */
 #include <kern/kalloc.h>
 #include <kern/host.h>
 #include <mach/host_info.h>
diff --git a/kern/ipc_host.c b/kern/ipc_host.c
index d4049d24..2cf322d7 100644
--- a/kern/ipc_host.c
+++ b/kern/ipc_host.c
@@ -33,6 +33,7 @@
  */
 
 #include <mach/message.h>
+#include <kern/debug.h>  /* for panic() */
 #include <kern/host.h>
 #include <kern/processor.h>
 #include <kern/task.h>
diff --git a/kern/ipc_kobject.c b/kern/ipc_kobject.c
index d642228f..d9fbe179 100644
--- a/kern/ipc_kobject.c
+++ b/kern/ipc_kobject.c
@@ -33,7 +33,8 @@
  *	Functions for letting a port represent a kernel object.
  */
 
-#include <printf.h>
+#include <kern/debug.h> /* For panic() */
+#include <kern/printf.h>
 #include <mach/port.h>
 #include <mach/kern_return.h>
 #include <mach/message.h>
diff --git a/kern/ipc_mig.c b/kern/ipc_mig.c
index 4f45eba1..cc25f0e5 100644
--- a/kern/ipc_mig.c
+++ b/kern/ipc_mig.c
@@ -29,6 +29,7 @@
 #include <mach/message.h>
 #include <mach/thread_status.h>
 #include <kern/ast.h>
+#include <kern/debug.h>  /* for panic() */
 #include <kern/ipc_tt.h>
 #include <kern/thread.h>
 #include <kern/task.h>
diff --git a/kern/ipc_sched.c b/kern/ipc_sched.c
index e1edfd66..cfd7b90b 100644
--- a/kern/ipc_sched.c
+++ b/kern/ipc_sched.c
@@ -27,6 +27,7 @@
 #include <mach/message.h>
 #include <kern/counters.h>
 #include "cpu_number.h"
+#include <kern/debug.h>  /* for panic() */
 #include <kern/lock.h>
 #include <kern/thread.h>
 #include <kern/sched_prim.h>
diff --git a/kern/ipc_tt.c b/kern/ipc_tt.c
index b1a9443d..b757bb89 100644
--- a/kern/ipc_tt.c
+++ b/kern/ipc_tt.c
@@ -35,6 +35,7 @@
 #include <mach/task_special_ports.h>
 #include <mach/thread_special_ports.h>
 #include <vm/vm_kern.h>
+#include <kern/debug.h>  /* for panic() */
 #include <kern/task.h>
 #include <kern/thread.h>
 #include <kern/ipc_kobject.h>
diff --git a/kern/kalloc.c b/kern/kalloc.c
index 24dfe689..4b9713eb 100644
--- a/kern/kalloc.c
+++ b/kern/kalloc.c
@@ -38,6 +38,7 @@
 #include <mach/machine/vm_types.h>
 #include <mach/vm_param.h>
 
+#include <kern/debug.h>  /* for panic() */
 #include <kern/zalloc.h>
 #include <kern/kalloc.h>
 #include <vm/vm_kern.h>
diff --git a/kern/lock.c b/kern/lock.c
index ba0f0c2f..5bdca08d 100644
--- a/kern/lock.c
+++ b/kern/lock.c
@@ -36,6 +36,7 @@
 
 #include <string.h>
 
+#include <kern/debug.h>  /* for panic() */
 #include <kern/lock.h>
 #include <kern/thread.h>
 #include <kern/sched_prim.h>
diff --git a/kern/mach_clock.c b/kern/mach_clock.c
index d67897b7..c53a7f31 100644
--- a/kern/mach_clock.c
+++ b/kern/mach_clock.c
@@ -43,6 +43,7 @@
 #include <mach/vm_prot.h>
 #include <kern/counters.h>
 #include "cpu_number.h"
+#include <kern/debug.h>  /* for panic() */
 #include <kern/host.h>
 #include <kern/lock.h>
 #include <kern/mach_param.h>
diff --git a/kern/machine.c b/kern/machine.c
index 3a5d21f1..9f737b4a 100644
--- a/kern/machine.c
+++ b/kern/machine.c
@@ -40,6 +40,7 @@
 #include <mach/machine.h>
 #include <mach/host_info.h>
 #include <kern/counters.h>
+#include <kern/debug.h>  /* for panic() */
 #include <kern/ipc_host.h>
 #include <kern/host.h>
 #include <kern/lock.h>
diff --git a/kern/pc_sample.c b/kern/pc_sample.c
index a335c470..e26fd41c 100644
--- a/kern/pc_sample.c
+++ b/kern/pc_sample.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  */
 
-#include <printf.h>
+#include <kern/printf.h>
 #include <string.h>
 
 #include <mach/mach_types.h>	/* vm_address_t */
diff --git a/kern/printf.c b/kern/printf.c
index 37543b36..22b09879 100644
--- a/kern/printf.c
+++ b/kern/printf.c
@@ -114,7 +114,7 @@
  */
 
 #include <string.h>
-#include <printf.h>
+#include <kern/printf.h>
 #include <mach/boolean.h>
 #include <kern/lock.h>
 #include <stdarg.h>
diff --git a/kern/printf.h b/kern/printf.h
new file mode 100644
index 00000000..f5930dc5
--- /dev/null
+++ b/kern/printf.h
@@ -0,0 +1,52 @@
+/*
+ * Header file for printf type functions.
+ * Copyright (C) 2006 Free Software Foundation.
+ *
+ * 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, 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/*
+ *     String handling functions.
+ *
+ */
+
+#ifndef _MACH_SA_SYS_PRINTF_H_
+#define _MACH_SA_SYS_PRINTF_H_
+
+#include <sys/types.h>
+#include <stdarg.h>
+
+extern void printf_init ();
+
+extern void _doprnt (const char *fmt,
+		     va_list *argp, 
+		     void (*putc)(char, vm_offset_t), 
+		     int radix, 
+		     vm_offset_t putc_arg);
+
+extern void printnum (unsigned long u, int base,
+                      void (*putc)(char, vm_offset_t),
+                      vm_offset_t putc_arg);
+
+extern int sprintf (char *buf, const char *fmt, ...);
+
+extern int printf (const char *fmt, ...);
+
+extern int indent;
+extern void iprintf (const char *fmt, ...);
+
+extern int vprintf(const char *fmt, va_list listp);
+
+#endif /* _MACH_SA_SYS_PRINTF_H_ */
+
diff --git a/kern/processor.c b/kern/processor.c
index df9cb2eb..6b471f8e 100644
--- a/kern/processor.c
+++ b/kern/processor.c
@@ -34,6 +34,7 @@
 #include <mach/processor_info.h>
 #include <mach/vm_param.h>
 #include <kern/cpu_number.h>
+#include <kern/debug.h>  /* for panic() */
 #include <kern/lock.h>
 #include <kern/host.h>
 #include <kern/processor.h>
diff --git a/kern/sched_prim.c b/kern/sched_prim.c
index 116bfe6f..eee02585 100644
--- a/kern/sched_prim.c
+++ b/kern/sched_prim.c
@@ -32,11 +32,12 @@
  *
  */
 
-#include <printf.h>
+#include <kern/printf.h>
 #include <mach/machine.h>
 #include <kern/ast.h>
 #include <kern/counters.h>
 #include <kern/cpu_number.h>
+#include <kern/debug.h> /* for panic() */
 #include <kern/lock.h>
 #include <kern/macro_help.h>
 #include <kern/processor.h>
diff --git a/kern/server_loop.ch b/kern/server_loop.ch
index 5a0c69ce..7b7b1a5c 100644
--- a/kern/server_loop.ch
+++ b/kern/server_loop.ch
@@ -38,6 +38,7 @@
  *	Must redefine symbols for pager_server functions.
  */
 
+#include <kern/debug.h>  /* for panic() */
 #include <mach/port.h>
 #include <mach/message.h>
 #include <vm/vm_kern.h>		/* for kernel_map */
diff --git a/kern/startup.c b/kern/startup.c
index 29577183..16ab5080 100644
--- a/kern/startup.c
+++ b/kern/startup.c
@@ -27,13 +27,14 @@
  *	Mach kernel startup.
  */
 
-#include <printf.h>
 #include <mach/boolean.h>
 #include <mach/machine.h>
 #include <mach/task_special_ports.h>
 #include <mach/vm_param.h>
 #include <ipc/ipc_init.h>
 #include <kern/cpu_number.h>
+#include <kern/debug.h> /* for panic() */
+#include <kern/printf.h>
 #include <kern/processor.h>
 #include <kern/sched_prim.h>
 #include <kern/task.h>
diff --git a/kern/task.c b/kern/task.c
index f620bdfa..d4fa825e 100644
--- a/kern/task.c
+++ b/kern/task.c
@@ -39,6 +39,7 @@
 #include <mach/task_special_ports.h>
 #include <ipc/ipc_space.h>
 #include <ipc/ipc_types.h>
+#include <kern/debug.h>  /* for panic() */
 #include <kern/mach_param.h>
 #include <kern/task.h>
 #include <kern/thread.h>
diff --git a/kern/thread.c b/kern/thread.c
index 911ceb97..67b77067 100644
--- a/kern/thread.c
+++ b/kern/thread.c
@@ -31,7 +31,7 @@
  *	Thread management primitives implementation.
  */
 
-#include <printf.h>
+#include <kern/printf.h>
 #include <mach/std_types.h>
 #include <mach/policy.h>
 #include <mach/thread_info.h>
@@ -41,6 +41,7 @@
 #include <machine/vm_param.h>
 #include <kern/ast.h>
 #include <kern/counters.h>
+#include <kern/debug.h> /* For panic() */
 #include <kern/ipc_tt.h>
 #include <kern/mach_param.h>
 #include <kern/processor.h>
diff --git a/kern/thread_swap.c b/kern/thread_swap.c
index 173b6ae4..c5d51835 100644
--- a/kern/thread_swap.c
+++ b/kern/thread_swap.c
@@ -46,6 +46,7 @@
 
 #include <ipc/ipc_kmsg.h>
 #include <kern/counters.h>
+#include <kern/debug.h>  /* for panic() */
 #include <kern/thread.h>
 #include <kern/lock.h>
 #include <vm/vm_map.h>
diff --git a/kern/xpr.c b/kern/xpr.c
index b5f6e713..147e3afd 100644
--- a/kern/xpr.c
+++ b/kern/xpr.c
@@ -29,6 +29,7 @@
  */
 #include <string.h>
 
+#include <kern/debug.h>  /* for panic() */
 #include <kern/xpr.h>
 #include <kern/lock.h>
 #include "cpu_number.h"
diff --git a/kern/zalloc.c b/kern/zalloc.c
index e089023e..e006177b 100644
--- a/kern/zalloc.c
+++ b/kern/zalloc.c
@@ -34,10 +34,11 @@
  *	data blocks for which quick allocation/deallocation is possible.
  */
 
-#include <printf.h>
 #include <string.h>
 
+#include <kern/debug.h> /* For panic() */
 #include <kern/macro_help.h>
+#include <kern/printf.h>
 #include <kern/sched.h>
 #include <kern/time_out.h>
 #include <kern/zalloc.h>
-- 
cgit v1.2.3