va_list: headers

[Richard Henderson <rth at cygnus dot com>]

For the record, and for those port maintainers to whom I'm
going to be passing changes over the next few days, here's
the header file changes.


r~


	* ginclude/stdarg.h: Gut for use with new builtins.
	* ginclude/varargs.h: Likewise.


Index: ginclude/stdarg.h
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/ginclude/stdarg.h,v
retrieving revision 1.9
diff -c -p -d -r1.9 stdarg.h
*** stdarg.h	1999/05/08 01:52:35	1.9
--- stdarg.h	1999/07/26 05:49:16
***************
*** 1,4 ****
--- 1,5 ----
  /* stdarg.h for GNU.
+ 
     Note that the type used in va_arg is supposed to match the
     actual type **after default promotions**.
     Thus, va_arg (..., short) is not valid.  */
***************
*** 11,145 ****
  #endif /* not __need___va_list */
  #undef __need___va_list
  
- #ifdef __clipper__
- #include "va-clipper.h"
- #else
- #ifdef __m88k__
- #include "va-m88k.h"
- #else
- #ifdef __i860__
- #include "va-i860.h"
- #else
- #ifdef __hppa__
- #include "va-pa.h"
- #else
- #ifdef __mips__
- #include "va-mips.h"
- #else
- #ifdef __sparc__
- #include "va-sparc.h"
- #else
- #ifdef __i960__
- #include "va-i960.h"
- #else
- #ifdef __alpha__
- #include "va-alpha.h"
- #else
- #if defined (__H8300__) || defined (__H8300H__) || defined (__H8300S__)
- #include "va-h8300.h"
- #else
- #if defined (__PPC__) && (defined (_CALL_SYSV) || defined (_WIN32))
- #include "va-ppc.h"
- #else
- #ifdef __arc__
- #include "va-arc.h"
- #else
- #ifdef __M32R__
- #include "va-m32r.h"
- #else
- #ifdef __sh__
- #include "va-sh.h"
- #else
- #ifdef __mn10300__
- #include "va-mn10300.h"
- #else
- #ifdef __mn10200__
- #include "va-mn10200.h"
- #else
- #ifdef __v850__
- #include "va-v850.h"
- #else
- #if defined (_TMS320C4x) || defined (_TMS320C3x)
- #include <va-c4x.h>
- #else
- 
  /* Define __gnuc_va_list.  */
  
  #ifndef __GNUC_VA_LIST
  #define __GNUC_VA_LIST
! #if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__)
! typedef char *__gnuc_va_list;
! #else
! typedef void *__gnuc_va_list;
! #endif
  #endif
  
  /* Define the standard macros for the user,
     if this invocation was from the user program.  */
  #ifdef _STDARG_H
- 
- /* Amount of space required in an argument list for an arg of type TYPE.
-    TYPE may alternatively be an expression whose type is used.  */
  
! #if defined(sysV68)
! #define __va_rounded_size(TYPE)  \
!   (((sizeof (TYPE) + sizeof (short) - 1) / sizeof (short)) * sizeof (short))
! #elif defined(_AIX)
! #define __va_rounded_size(TYPE)  \
!   (((sizeof (TYPE) + sizeof (long) - 1) / sizeof (long)) * sizeof (long))
! #else
! #define __va_rounded_size(TYPE)  \
!   (((sizeof (TYPE) + sizeof (int) - 1) / sizeof (int)) * sizeof (int))
! #endif
! 
! #define va_start(AP, LASTARG) 						\
!  (AP = ((__gnuc_va_list) __builtin_next_arg (LASTARG)))
! 
! #undef va_end
! void va_end (__gnuc_va_list);		/* Defined in libgcc.a */
! #define va_end(AP)	((void)0)
! 
! /* We cast to void * and then to TYPE * because this avoids
!    a warning about increasing the alignment requirement.  */
! 
! #if (defined (__arm__) && ! defined (__ARMEB__)) || defined (__i386__) || defined (__i860__) || defined (__ns32000__) || defined (__vax__)
! /* This is for little-endian machines; small args are padded upward.  */
! #define va_arg(AP, TYPE)						\
!  (AP = (__gnuc_va_list) ((char *) (AP) + __va_rounded_size (TYPE)),	\
!   *((TYPE *) (void *) ((char *) (AP) - __va_rounded_size (TYPE))))
! #else /* big-endian */
! /* This is for big-endian machines; small args are padded downward.  */
! #define va_arg(AP, TYPE)						\
!  (AP = (__gnuc_va_list) ((char *) (AP) + __va_rounded_size (TYPE)),	\
!   *((TYPE *) (void *) ((char *) (AP)					\
! 		       - ((sizeof (TYPE) < __va_rounded_size (char)	\
! 			   ? sizeof (TYPE) : __va_rounded_size (TYPE))))))
! #endif /* big-endian */
! 
! /* Copy __gnuc_va_list into another variable of this type.  */
! #define __va_copy(dest, src) (dest) = (src)
! 
! #endif /* _STDARG_H */
  
- #endif /* not TMS320C3x or TMS320C4x */
- #endif /* not v850 */
- #endif /* not mn10200 */
- #endif /* not mn10300 */
- #endif /* not sh */
- #endif /* not m32r */
- #endif /* not arc */
- #endif /* not powerpc with V.4 calling sequence */
- #endif /* not h8300 */
- #endif /* not alpha */
- #endif /* not i960 */
- #endif /* not sparc */
- #endif /* not mips */
- #endif /* not hppa */
- #endif /* not i860 */
- #endif /* not m88k */
- #endif /* not clipper */
  
- #ifdef _STDARG_H
  /* Define va_list, if desired, from __gnuc_va_list. */
  /* We deliberately do not define va_list when called from
     stdio.h, because ANSI C says that stdio.h is not supposed to define
--- 12,34 ----
  #endif /* not __need___va_list */
  #undef __need___va_list
  
  /* Define __gnuc_va_list.  */
  
  #ifndef __GNUC_VA_LIST
  #define __GNUC_VA_LIST
! typedef __builtin_va_list __gnuc_va_list;
  #endif
  
  /* Define the standard macros for the user,
     if this invocation was from the user program.  */
  #ifdef _STDARG_H
  
! #define va_start(v,l)	__builtin_stdarg_start(&(v),l)
! #define va_end		__builtin_va_end
! #define va_arg		__builtin_va_arg
! #define va_copy(d,s)	__builtin_va_copy(&(d),(s))
  
  
  /* Define va_list, if desired, from __gnuc_va_list. */
  /* We deliberately do not define va_list when called from
     stdio.h, because ANSI C says that stdio.h is not supposed to define
Index: ginclude/varargs.h
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/ginclude/varargs.h,v
retrieving revision 1.11
diff -c -p -d -r1.11 varargs.h
*** varargs.h	1999/07/07 00:18:05	1.11
--- varargs.h	1999/07/26 05:49:16
***************
*** 3,66 ****
  #ifndef _VARARGS_H
  #define _VARARGS_H
  
- #ifdef __sparc__
- #include "va-sparc.h"
- #else
- #ifdef __spur__
- #include "va-spur.h"
- #else
- #ifdef __mips__
- #include "va-mips.h"
- #else
- #ifdef __i860__
- #include "va-i860.h"
- #else
- #ifdef __pyr__
- #include "va-pyr.h"
- #else
- #ifdef __clipper__
- #include "va-clipper.h"
- #else
- #ifdef __m88k__
- #include "va-m88k.h"
- #else
- #if defined(__hppa__) || defined(hp800)
- #include "va-pa.h"
- #else
- #ifdef __i960__
- #include "va-i960.h"
- #else
- #ifdef __alpha__
- #include "va-alpha.h"
- #else
- #if defined (__H8300__) || defined (__H8300H__) || defined (__H8300S__)
- #include "va-h8300.h"
- #else
- #if defined (__PPC__) && (defined (_CALL_SYSV) || defined (_WIN32))
- #include "va-ppc.h"
- #else
- #ifdef __arc__
- #include "va-arc.h"
- #else
- #ifdef __M32R__
- #include "va-m32r.h"
- #else
- #ifdef __sh__
- #include "va-sh.h"
- #else
- #ifdef __mn10300__
- #include "va-mn10300.h"
- #else
- #ifdef __mn10200__
- #include "va-mn10200.h"
- #else
- #ifdef __v850__
- #include "va-v850.h"
- #else
- #if defined (_TMS320C4x) || defined (_TMS320C3x)
- #include <va-c4x.h>
- #else
- 
  #ifdef __NeXT__
  
  /* On Next, erase any vestiges of stdarg.h.  */
--- 3,8 ----
***************
*** 75,165 ****
  #undef va_list
  #undef va_start
  #undef va_end
- #undef __va_rounded_size
  #undef va_arg
  #endif  /* __NeXT__ */
  
- /* In GCC version 2, we want an ellipsis at the end of the declaration
-    of the argument list.  GCC version 1 can't parse it.  */
- 
- #if __GNUC__ > 1
- #define __va_ellipsis ...
- #else
- #define __va_ellipsis
- #endif
- 
  /* These macros implement traditional (non-ANSI) varargs
     for GNU C.  */
  
  #define va_alist  __builtin_va_alist
! /* The ... causes current_function_varargs to be set in cc1.  */
  /* ??? We don't process attributes correctly in K&R argument context.  */
  typedef int __builtin_va_alist_t __attribute__((__mode__(__word__)));
- #define va_dcl	__builtin_va_alist_t __builtin_va_alist; __va_ellipsis
  
! /* Define __gnuc_va_list, just as in gstdarg.h.  */
  
  #ifndef __GNUC_VA_LIST
  #define __GNUC_VA_LIST
! #if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX)
! typedef char *__gnuc_va_list;
! #else
! typedef void *__gnuc_va_list;
! #endif
! #endif
! 
! #define va_start(AP)  AP=(char *) &__builtin_va_alist
! 
! #define va_end(AP)	((void)0)
! 
! #if defined(sysV68)
! #define __va_rounded_size(TYPE)  \
!   (((sizeof (TYPE) + sizeof (short) - 1) / sizeof (short)) * sizeof (short))
! #elif defined(_AIX)
! #define __va_rounded_size(TYPE)  \
!   (((sizeof (TYPE) + sizeof (long) - 1) / sizeof (long)) * sizeof (long))
! #else
! #define __va_rounded_size(TYPE)  \
!   (((sizeof (TYPE) + sizeof (int) - 1) / sizeof (int)) * sizeof (int))
  #endif
- 
- #if (defined (__arm__) && ! defined (__ARMEB__)) || defined (__i386__) || defined (__i860__) || defined (__ns32000__) || defined (__vax__)
- /* This is for little-endian machines; small args are padded upward.  */
- #define va_arg(AP, TYPE)						\
-  (AP = (__gnuc_va_list) ((char *) (AP) + __va_rounded_size (TYPE)),	\
-   *((TYPE *) (void *) ((char *) (AP) - __va_rounded_size (TYPE))))
- #else /* big-endian */
- /* This is for big-endian machines; small args are padded downward.  */
- #define va_arg(AP, TYPE)						\
-  (AP = (__gnuc_va_list) ((char *) (AP) + __va_rounded_size (TYPE)),	\
-   *((TYPE *) (void *) ((char *) (AP)					\
- 		       - ((sizeof (TYPE) < __va_rounded_size (char)	\
- 			   ? sizeof (TYPE) : __va_rounded_size (TYPE))))))
- #endif /* big-endian */
- 
- /* Copy __gnuc_va_list into another variable of this type.  */
- #define __va_copy(dest, src) (dest) = (src)
  
! #endif /* not TMS320C3x or TMS320C4x */
! #endif /* not v850 */
! #endif /* not mn10200 */
! #endif /* not mn10300 */
! #endif /* not sh */
! #endif /* not m32r */
! #endif /* not arc */
! #endif /* not powerpc with V.4 calling sequence */
! #endif /* not h8300 */
! #endif /* not alpha */
! #endif /* not i960 */
! #endif /* not hppa */
! #endif /* not m88k */
! #endif /* not clipper */
! #endif /* not pyr */
! #endif /* not i860 */
! #endif /* not mips */
! #endif /* not spur */
! #endif /* not sparc */
! #endif /* not _VARARGS_H */
  
  /* Define va_list from __gnuc_va_list.  */
  
--- 17,48 ----
  #undef va_list
  #undef va_start
  #undef va_end
  #undef va_arg
  #endif  /* __NeXT__ */
  
  /* These macros implement traditional (non-ANSI) varargs
     for GNU C.  */
  
  #define va_alist  __builtin_va_alist
! 
  /* ??? We don't process attributes correctly in K&R argument context.  */
  typedef int __builtin_va_alist_t __attribute__((__mode__(__word__)));
  
! /* ??? It would be nice to get rid of the ellipsis here.  It causes
!    current_function_varargs to be set in cc1.  */
! #define va_dcl		__builtin_va_alist_t __builtin_va_alist; ...
  
+ /* Define __gnuc_va_list, just as in stdarg.h.  */
+ 
  #ifndef __GNUC_VA_LIST
  #define __GNUC_VA_LIST
! typedef __builtin_va_list __gnuc_va_list;
  #endif
  
! #define va_start(v)	__builtin_varargs_start(&(v))
! #define va_end		__builtin_va_end
! #define va_arg		__builtin_va_arg
! #define __va_copy(d,s)	__builtin_va_copy(&(d),(s))
  
  /* Define va_list from __gnuc_va_list.  */