Get rid of va-ppc.h.

ok miod@

5 files changed, 25 insertions, 290 deletions

diff --git a/sys/arch/macppc/include/va-ppc.h b/sys/arch/macppc/include/va-ppc.h
deleted file mode 100644
index 33c345562a7..00000000000
--- a/sys/arch/macppc/include/va-ppc.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$OpenBSD: va-ppc.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
-
-#include <powerpc/va-ppc.h>
diff --git a/sys/arch/powerpc/include/stdarg.h b/sys/arch/powerpc/include/stdarg.h
index 76e3cda1d08..f6c7fe841da 100644
--- a/sys/arch/powerpc/include/stdarg.h
+++ b/sys/arch/powerpc/include/stdarg.h
@@ -1,7 +1,6 @@
-/*	$OpenBSD: stdarg.h,v 1.6 2006/01/06 18:53:05 millert Exp $	*/
-/*	$NetBSD: stdarg.h,v 1.1 1996/09/30 16:34:35 ws Exp $	*/
+/*	$OpenBSD: stdarg.h,v 1.7 2008/11/08 19:49:24 kettenis Exp $	*/
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -29,19 +28,24 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
+ *	from: @(#)stdarg.h	8.1 (Berkeley) 6/10/93
  */
 
 #ifndef _POWERPC_STDARG_H_
 #define	_POWERPC_STDARG_H_
 
+#include <sys/cdefs.h>
 #include <machine/_types.h>
 
-#ifndef	_STDARG_H
-#define	_STDARG_H
-#endif
-#include <machine/va-ppc.h>
-
 typedef __va_list	va_list;
 
+#ifdef __lint__
+#define va_start(ap, last)	((ap) = (ap))
+#define va_arg(ap, type)	(*(type *)(void *)&ap)
+#define va_end(ap)
+#define __va_copy(dst, src)	((dst) = (src))
+#else
+# error "Unsupported compiler"
+#endif
+
 #endif /* !_POWERPC_STDARG_H_ */
diff --git a/sys/arch/powerpc/include/va-ppc.h b/sys/arch/powerpc/include/va-ppc.h
deleted file mode 100644
index 32e819535aa..00000000000
--- a/sys/arch/powerpc/include/va-ppc.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/*	$OpenBSD: va-ppc.h,v 1.14 2008/10/23 21:25:07 kettenis Exp $	*/
-/* GNU C varargs support for the PowerPC with either the V.4 or Windows NT calling sequences */
-
-#include <sys/cdefs.h>
-
-#ifndef _WIN32
-/* System V.4 support */
-/* Define __gnuc_va_list.  */
-
-#ifndef __GNUC_VA_LIST
-#define __GNUC_VA_LIST
-
-#ifndef _SYS_VA_LIST_H
-#define _SYS_VA_LIST_H		/* Solaris sys/va_list.h */
-
-/* Solaris decided to rename overflow_arg_area to input_arg_area,
-   so handle it via a macro.  */
-#define __va_overflow(AP) (AP)->overflow_arg_area
-
-/* Note that the names in this structure are in the user's namespace, but
-   that the V.4 abi explicitly states that these names should be used.  */
-typedef struct __va_list_tag {
-  unsigned char gpr;		/* index into the array of 8 GPRs stored in the
-				   register save area gpr=0 corresponds to r3,
-				   gpr=1 to r4, etc. */
-  unsigned char fpr;		/* index into the array of 8 FPRs stored in the
-				   register save area fpr=0 corresponds to f1,
-				   fpr=1 to f2, etc. */
-  char *overflow_arg_area;	/* location on stack that holds the next
-				   overflow argument */
-  char *reg_save_area;		/* where r3:r10 and f1:f8, if saved are stored */
-} __gnuc_va_list[1];
-
-#else /* _SYS_VA_LIST */
-
-typedef __va_list __gnuc_va_list;
-#define __va_overflow(AP) (AP)->input_arg_area
-
-#endif /* not _SYS_VA_LIST */
-#endif /* not __GNUC_VA_LIST */
-
-/* If this is for internal libc use, don't define anything but
-   __gnuc_va_list.  */
-#if defined (_STDARG_H) || defined (_VARARGS_H)
-
-/* Register save area located below the frame pointer */
-#ifndef __VA_PPC_H__
-#define __VA_PPC_H__
-typedef struct {
-  long   __gp_save[8];		/* save area for GP registers */
-  double __fp_save[8];		/* save area for FP registers */
-} __va_regsave_t;
-
-/* Macros to access the register save area */
-/* We cast to void * and then to TYPE * because this avoids
-   a warning about increasing the alignment requirement.  */
-#define __VA_FP_REGSAVE(AP,OFS,TYPE)					\
-  ((TYPE *) (void *) (&(((__va_regsave_t *)				\
-			 (AP)->reg_save_area)->__fp_save[OFS])))
-
-#define __VA_GP_REGSAVE(AP,OFS,TYPE)					\
-  ((TYPE *) (void *) (&(((__va_regsave_t *)				\
-			 (AP)->reg_save_area)->__gp_save[OFS])))
-
-/* Common code for va_start for both varargs and stdarg.  We allow all
-   the work to be done by __builtin_saveregs.  It returns a pointer to
-   a va_list that was constructed on the stack; we must simply copy it
-   to the user's variable.  */
-
-#define __va_start_common(AP, FAKE) \
-__extension__ ({							\
-   (AP) = (struct __va_list_tag *)__builtin_alloca(sizeof(__gnuc_va_list));   \
-  __builtin_memcpy ((AP), __builtin_saveregs (), sizeof(__gnuc_va_list)); \
-  })
-
-#ifdef _STDARG_H /* stdarg.h support */
-
-/* Calling __builtin_next_arg gives the proper error message if LASTARG is
-   not indeed the last argument.  */
-#ifdef lint
-#define va_start(AP,LASTARG)	((AP) = (AP))
-#else
-#define va_start(AP,LASTARG) \
-  (__builtin_next_arg (LASTARG), __va_start_common (AP, 0))
-#endif /* lint */
-
-#else /* varargs.h support */
-
-#define va_start(AP) __va_start_common (AP, 1)
-#define va_alist __va_1st_arg
-#define va_dcl register int va_alist; ...
-
-#endif /* _STDARG_H */
-
-#ifdef _SOFT_FLOAT
-#define __va_float_p(TYPE)	0
-#else
-#define __va_float_p(TYPE)	(__builtin_classify_type(*(TYPE *)0) == 8)
-#endif
-
-#define __va_aggregate_p(TYPE)	(__builtin_classify_type(*(TYPE *)0) >= 12)
-#define __va_size(TYPE)		((sizeof(TYPE) + sizeof (long) - 1) / sizeof (long))
-
-/* This symbol isn't defined.  It is used to flag type promotion violations
-   at link time.  We can only do this when optimizing.  Use __builtin_trap
-   instead of abort so that we don't require a prototype for abort.
-
-   __builtin_trap stuff is not available on the gcc-2.95 branch, so we just
-   avoid calling it for now.  */
-
-#ifdef __OPTIMIZE__
-extern void __va_arg_type_violation(void) __attribute__((__noreturn__));
-#else
-#define __va_arg_type_violation()
-#endif
-
-#define va_arg(AP,TYPE)							   \
-__extension__ (*({							   \
-  register TYPE *__ptr;							   \
-									   \
-  if (__va_float_p (TYPE) && sizeof (TYPE) < 16)			   \
-    {									   \
-      unsigned char __fpr = (AP)->fpr;					   \
-      if (__fpr < 8)							   \
-	{								   \
-	  __ptr = __VA_FP_REGSAVE (AP, __fpr, TYPE);			   \
-	  (AP)->fpr = __fpr + 1;					   \
-	}								   \
-      else if (sizeof (TYPE) == 8)					   \
-	{								   \
-	  unsigned long __addr = (unsigned long) (__va_overflow (AP));	   \
-	  __ptr = (TYPE *)((__addr + 7) & -8);				   \
-	  __va_overflow (AP) = (char *)(__ptr + 1);			   \
-	}								   \
-      else								   \
-	{								   \
-	  /* float is promoted to double.  */				   \
-	  __va_arg_type_violation ();					   \
-	}								   \
-    }									   \
-									   \
-  /* Aggregates and long doubles are passed by reference.  */		   \
-  else if (__va_aggregate_p (TYPE) || __va_float_p (TYPE))		   \
-    {									   \
-      unsigned char __gpr = (AP)->gpr;					   \
-      if (__gpr < 8)							   \
-	{								   \
-	  __ptr = * __VA_GP_REGSAVE (AP, __gpr, TYPE *);		   \
-	  (AP)->gpr = __gpr + 1;					   \
-	}								   \
-      else								   \
-	{								   \
-	  TYPE **__pptr = (TYPE **) (__va_overflow (AP));		   \
-	  __ptr = * __pptr;						   \
-	  __va_overflow (AP) = (char *) (__pptr + 1);			   \
-	}								   \
-    }									   \
-									   \
-  /* Only integrals remaining.  */					   \
-  else									   \
-    {									   \
-      /* longlong is aligned.  */					   \
-      if (sizeof (TYPE) == 8)						   \
-	{								   \
-	  unsigned char __gpr = (AP)->gpr;				   \
-	  if (__gpr < 7)						   \
-	    {								   \
-	      __gpr += __gpr & 1;					   \
-	      __ptr = __VA_GP_REGSAVE (AP, __gpr, TYPE);		   \
-	      (AP)->gpr = __gpr + 2;					   \
-	    }								   \
-	  else								   \
-	    {								   \
-	      unsigned long __addr = (unsigned long) (__va_overflow (AP)); \
-	      __ptr = (TYPE *)((__addr + 7) & -8);			   \
-	      (AP)->gpr = 8;						   \
-	      __va_overflow (AP) = (char *)(__ptr + 1);			   \
-	    }								   \
-	}								   \
-      else if (sizeof (TYPE) == 4)					   \
-	{								   \
-	  unsigned char __gpr = (AP)->gpr;				   \
-	  if (__gpr < 8)						   \
-	    {								   \
-	      __ptr = __VA_GP_REGSAVE (AP, __gpr, TYPE);		   \
-	      (AP)->gpr = __gpr + 1;					   \
-	    }								   \
-	  else								   \
-	    {								   \
-	      __ptr = (TYPE *) __va_overflow (AP);			   \
-	      __va_overflow (AP) = (char *)(__ptr + 1);			   \
-	    }								   \
-	}								   \
-      else								   \
-	{								   \
-	  /* Everything else was promoted to int.  */			   \
-	  __va_arg_type_violation ();					   \
-	}								   \
-    }									   \
-  __ptr;								   \
-}))
-
-#define va_end(AP)	
-
-/* Copy __gnuc_va_list into another variable of this type.  */
-#define __va_copy(dest, src) \
-__extension__ ({ \
-        (dest) =  \
-           (struct __va_list_tag *)__builtin_alloca(sizeof(__gnuc_va_list)); \
-        *(dest) = *(src);\
-  })
-
-#endif /* __VA_PPC_H__ */
-#endif /* defined (_STDARG_H) || defined (_VARARGS_H) */
-
-
-#else
-/* Windows NT */
-/* Define __gnuc_va_list.  */
-
-#ifndef __GNUC_VA_LIST
-#define __GNUC_VA_LIST
-typedef char *__gnuc_va_list;
-#endif /* not __GNUC_VA_LIST */
-
-/* If this is for internal libc use, don't define anything but
-   __gnuc_va_list.  */
-#if defined (_STDARG_H) || defined (_VARARGS_H)
-
-#define __va_start_common(AP, LASTARG, FAKE)				\
-  ((__builtin_saveregs ()), ((AP) = ((char *) &LASTARG) + __va_rounded_size (AP)), 0)
-
-#ifdef _STDARG_H /* stdarg.h support */
-
-/* Calling __builtin_next_arg gives the proper error message if LASTARG is
-   not indeed the last argument.  */
-#define va_start(AP,LASTARG)						\
-  (__builtin_saveregs (),						\
-   (AP) = __builtin_next_arg (LASTARG),					\
-   0)
-
-#else /* varargs.h support */
-
-#define va_start(AP)							\
-  (__builtin_saveregs (),						\
-   (AP) = __builtin_next_arg (__va_1st_arg) - sizeof (int),		\
-   0)
-
-#define va_alist __va_1st_arg
-#define va_dcl register int __va_1st_arg; ...
-
-#endif /* _STDARG_H */
-
-#define __va_rounded_size(TYPE) ((sizeof (TYPE) + 3) & ~3)
-#define __va_align(AP, TYPE)						\
-     ((((unsigned long)(AP)) + ((sizeof (TYPE) >= 8) ? 7 : 3))		\
-      & ~((sizeof (TYPE) >= 8) ? 7 : 3))
-
-#define va_arg(AP,TYPE)							\
-( *(TYPE *)((AP = (char *) (__va_align(AP, TYPE)			\
-			    + __va_rounded_size(TYPE)))			\
-	    - __va_rounded_size(TYPE)))
-
-#define va_end(AP)	
-
-/* Copy __gnuc_va_list into another variable of this type.  */
-#define __va_copy(dest, src) (dest) = (src)
-
-#endif /* defined (_STDARG_H) || defined (_VARARGS_H) */
-#endif /* Windows NT */
diff --git a/sys/arch/powerpc/include/varargs.h b/sys/arch/powerpc/include/varargs.h
index e17efff0df7..8d7b8ce7300 100644
--- a/sys/arch/powerpc/include/varargs.h
+++ b/sys/arch/powerpc/include/varargs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: varargs.h,v 1.5 2006/01/06 18:53:05 millert Exp $	*/
+/*	$OpenBSD: varargs.h,v 1.6 2008/11/08 19:49:24 kettenis Exp $	*/
 /*	$NetBSD: varargs.h,v 1.1 1996/09/30 16:34:37 ws Exp $	*/
 
 /*-
@@ -40,11 +40,18 @@
 #ifndef _POWERPC_VARARGS_H_
 #define	_POWERPC_VARARGS_H_
 
-#define _VARARGS_H
+#include <machine/stdarg.h>
 
-#include <machine/_types.h>
-#include <machine/va-ppc.h>
+#if __GNUC__ == 1
+#define	__va_ellipsis
+#else
+#define	__va_ellipsis	...
+#endif
 
-typedef __va_list va_list;
+#define	va_alist	__builtin_va_alist
+#define	va_dcl		__builtin_va_alist_t __builtin_va_alist; __va_ellipsis
+
+#undef va_start
+#define	va_start(ap)	__builtin_varargs_start((ap))
 
 #endif /* !_POWERPC_VARARGS_H_ */
diff --git a/sys/arch/socppc/include/va-ppc.h b/sys/arch/socppc/include/va-ppc.h
deleted file mode 100644
index 604df21a17e..00000000000
--- a/sys/arch/socppc/include/va-ppc.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$OpenBSD: va-ppc.h,v 1.1 2008/05/12 09:06:20 kettenis Exp $	*/
-
-#include <powerpc/va-ppc.h>