New stdarg.h and varargs.h based on arm and i386 versions.
Use __builtin_va_* instead of hand written code in va-sh.h that uses LHS casts. Slightly worse code is generated by gcc 3.3.3, but LHS casts are outlawed in gcc 3.3.6 and gcc 4. Build-tested on hpcsh (le) and mmeye (be), run-tested on hpcsh.
This commit is contained in:
uwe
parent
362a260c6d
commit
9458b164a6
|
|
@ -1,36 +1,77 @@
|
|||
/* $NetBSD: stdarg.h,v 1.8 2005/12/11 12:18:58 christos Exp $ */
|
||||
/* $NetBSD: stdarg.h,v 1.9 2006/05/21 22:39:04 uwe Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1991, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)stdarg.h 8.1 (Berkeley) 6/10/93
|
||||
*/
|
||||
|
||||
#ifndef _SH3_STDARG_H_
|
||||
#define _SH3_STDARG_H_
|
||||
|
||||
#ifdef __lint__
|
||||
|
||||
#include <machine/ansi.h>
|
||||
|
||||
typedef _BSD_VA_LIST_ va_list; /* XXX */
|
||||
|
||||
#define va_start(a, l) ((a) = ((l) ? (va_list)0 : (va_list)0))
|
||||
#define va_arg(a, t) ((a) ? (t)0 : (t)0)
|
||||
#define va_end(a) /* nothing */
|
||||
#define __va_copy(d, s) ((d) = (s))
|
||||
|
||||
#else /* ! __lint__ */
|
||||
|
||||
#ifndef _VARARGS_H
|
||||
#define _STDARG_H
|
||||
#endif
|
||||
|
||||
#include <sh3/va-sh.h>
|
||||
#include <sys/featuretest.h>
|
||||
|
||||
typedef __gnuc_va_list va_list;
|
||||
typedef _BSD_VA_LIST_ va_list;
|
||||
|
||||
#endif /* __lint__ */
|
||||
#ifdef __lint__
|
||||
#define __builtin_next_arg(t) ((t) ? 0 : 0)
|
||||
#define __builtin_stdarg_start(a, l) ((a) = ((l) ? 0 : 0))
|
||||
#define __builtin_va_arg(a, t) ((t)((a) ? 0 : 0))
|
||||
#define __builtin_va_end /* nothing */
|
||||
#define __builtin_va_copy(d, s) ((d) = (s))
|
||||
#endif
|
||||
|
||||
#if __GNUC_PREREQ__(2, 96)
|
||||
#define va_start(ap, last) __builtin_stdarg_start((ap), (last))
|
||||
#define va_arg __builtin_va_arg
|
||||
#define va_end __builtin_va_end
|
||||
#define __va_copy(dest, src) __builtin_va_copy((dest), (src))
|
||||
#else
|
||||
#define __va_size(type) \
|
||||
(((sizeof(type) + sizeof(long) - 1) / sizeof(long)) * sizeof(long))
|
||||
|
||||
#define va_start(ap, last) \
|
||||
((ap) = (va_list)__builtin_next_arg(last))
|
||||
|
||||
#define va_arg(ap, type) \
|
||||
((type *)(void *)(ap += __va_size(type)))[-1]
|
||||
|
||||
#define va_end(ap)
|
||||
|
||||
#define __va_copy(dest, src) ((dest) = (src))
|
||||
|
||||
#endif /* __GNUC_PREREQ__(2, 96) */
|
||||
|
||||
#if !defined(_ANSI_SOURCE) && \
|
||||
(defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L || \
|
||||
defined(_NETBSD_SOURCE))
|
||||
#define va_copy __va_copy
|
||||
#define va_copy(dest, src) __va_copy((dest), (src))
|
||||
#endif
|
||||
|
||||
#endif /* _SH3_STDARG_H_ */
|
||||
#endif /* !_SH3_STDARG_H_ */
|
||||
|
|
|
|||
|
|
@ -1,9 +1,67 @@
|
|||
/* $NetBSD: varargs.h,v 1.6 2002/04/28 17:10:37 uch Exp $ */
|
||||
/* $NetBSD: varargs.h,v 1.7 2006/05/21 22:39:04 uwe Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1990, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
* (c) UNIX System Laboratories, Inc.
|
||||
* All or some portions of this file are derived from material licensed
|
||||
* to the University of California by American Telephone and Telegraph
|
||||
* Co. or Unix System Laboratories, Inc. and are reproduced herein with
|
||||
* the permission of UNIX System Laboratories, Inc.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)varargs.h 8.2 (Berkeley) 3/22/94
|
||||
*/
|
||||
|
||||
#ifndef _SH3_VARARGS_H_
|
||||
#define _SH3_VARARGS_H_
|
||||
|
||||
#define _VARARGS_H
|
||||
#include <sh3/stdarg.h>
|
||||
#include <machine/stdarg.h>
|
||||
|
||||
#if !__GNUC_PREREQ__(2, 0)
|
||||
#define __va_ellipsis
|
||||
#else
|
||||
#define __va_ellipsis ...
|
||||
#endif
|
||||
|
||||
#if __GNUC_PREREQ__(2, 96)
|
||||
#define __va_alist_t __builtin_va_alist_t
|
||||
#else
|
||||
#define __va_alist_t long
|
||||
#endif
|
||||
|
||||
#define va_alist __builtin_va_alist
|
||||
#define va_dcl __va_alist_t __builtin_va_alist; __va_ellipsis
|
||||
|
||||
#undef va_start
|
||||
#if __GNUC_PREREQ__(2, 96)
|
||||
#define va_start(ap) __builtin_varargs_start((ap))
|
||||
#else
|
||||
#define va_start(ap) \
|
||||
((ap) = (va_list)&__builtin_va_alist)
|
||||
#endif
|
||||
|
||||
#endif /* !_SH3_VARARGS_H_ */
|
||||
|
|
|
|||
Loading…
Reference in New Issue