Change headers to comply with the new toolchain changes.

This commit is contained in:
matt 2003-10-06 05:27:19 +00:00
parent 420f3b76ba
commit 0c7bac0672
6 changed files with 28 additions and 218 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: ansi.h,v 1.3 2003/08/07 16:27:51 agc Exp $ */
/* $NetBSD: ansi.h,v 1.4 2003/10/06 05:27:19 matt Exp $ */
/* $OpenBSD: ansi.h,v 1.4 2000/02/22 17:29:12 millert Exp $ */
@ -36,6 +36,9 @@
#ifndef _ANSI_H_
#define _ANSI_H_
#include <sys/cdefs.h>
#include <machine/int_types.h>
/*
* Types which are fundamental to the implementation and may appear in
* more than one standard header are defined here. Standard headers
@ -45,10 +48,10 @@
* #undef _BSD_SIZE_T_
* #endif
*/
#define _BSD_CLOCK_T_ unsigned long /* clock() */
#define _BSD_PTRDIFF_T_ int /* ptr1 - ptr2 */
#define _BSD_SIZE_T_ unsigned int /* sizeof() */
#define _BSD_SSIZE_T_ int /* byte count or error */
#define _BSD_CLOCK_T_ unsigned long int /* clock() */
#define _BSD_PTRDIFF_T_ long int /* ptr1 - ptr2 */
#define _BSD_SIZE_T_ unsigned long int /* sizeof() */
#define _BSD_SSIZE_T_ long int /* byte count or error */
#define _BSD_TIME_T_ int /* time() */
#define _BSD_VA_LIST_ double * /* va_list */
#define _BSD_CLOCKID_T_ int

View File

@ -1,4 +1,4 @@
/* $NetBSD: asm.h,v 1.2 2002/07/04 16:43:21 thorpej Exp $ */
/* $NetBSD: asm.h,v 1.3 2003/10/06 05:27:19 matt Exp $ */
/* $OpenBSD: asm.h,v 1.12 2001/03/29 02:15:57 mickey Exp $ */
@ -31,197 +31,6 @@
* hppa assembler definitions
*/
/*
* Hardware General Registers
*/
r0 .reg %r0
r1 .reg %r1
r2 .reg %r2
r3 .reg %r3
r4 .reg %r4
r5 .reg %r5
r6 .reg %r6
r7 .reg %r7
r8 .reg %r8
r9 .reg %r9
r10 .reg %r10
r11 .reg %r11
r12 .reg %r12
r13 .reg %r13
r14 .reg %r14
r15 .reg %r15
r16 .reg %r16
r17 .reg %r17
r18 .reg %r18
r19 .reg %r19
r20 .reg %r20
r21 .reg %r21
r22 .reg %r22
r23 .reg %r23
r24 .reg %r24
r25 .reg %r25
r26 .reg %r26
r27 .reg %r27
r28 .reg %r28
r29 .reg %r29
r30 .reg %r30
r31 .reg %r31
/*
* Hardware Space Registers
*/
sr0 .reg %sr0
sr1 .reg %sr1
sr2 .reg %sr2
sr3 .reg %sr3
sr4 .reg %sr4
sr5 .reg %sr5
sr6 .reg %sr6
sr7 .reg %sr7
/*
* Hardware Floating Point Registers
*/
fr0 .reg %fr0
fr1 .reg %fr1
fr2 .reg %fr2
fr3 .reg %fr3
fr4 .reg %fr4
fr5 .reg %fr5
fr6 .reg %fr6
fr7 .reg %fr7
fr8 .reg %fr8
fr9 .reg %fr9
fr10 .reg %fr10
fr11 .reg %fr11
fr12 .reg %fr12
fr13 .reg %fr13
fr14 .reg %fr14
fr15 .reg %fr15
fr16 .reg %fr16
fr17 .reg %fr17
fr18 .reg %fr18
fr19 .reg %fr19
fr20 .reg %fr20
fr21 .reg %fr21
fr22 .reg %fr22
fr23 .reg %fr23
fr24 .reg %fr24
fr25 .reg %fr25
fr26 .reg %fr26
fr27 .reg %fr27
fr28 .reg %fr28
fr29 .reg %fr29
fr30 .reg %fr30
fr31 .reg %fr31
/*
* Hardware Control Registers
*/
cr0 .reg %cr0
cr8 .reg %cr8
cr9 .reg %cr9
cr10 .reg %cr10
cr11 .reg %cr11
cr12 .reg %cr12
cr13 .reg %cr13
cr14 .reg %cr14
cr15 .reg %cr15
cr16 .reg %cr16
cr17 .reg %cr17
cr18 .reg %cr18
cr19 .reg %cr19
cr20 .reg %cr20
cr21 .reg %cr21
cr22 .reg %cr22
cr23 .reg %cr23
cr24 .reg %cr24
cr25 .reg %cr25
cr26 .reg %cr26
cr27 .reg %cr27
cr28 .reg %cr28
cr29 .reg %cr29
cr30 .reg %cr30
cr31 .reg %cr31
rctr .reg %cr0
pidr1 .reg %cr8
pidr2 .reg %cr9
ccr .reg %cr10
sar .reg %cr11
pidr3 .reg %cr12
pidr4 .reg %cr13
iva .reg %cr14
eiem .reg %cr15
itmr .reg %cr16
pcsq .reg %cr17
pcoq .reg %cr18
iir .reg %cr19
isr .reg %cr20
ior .reg %cr21
ipsw .reg %cr22
eirr .reg %cr23
hptmask .reg %cr24
tr0 .reg %cr24
vtop .reg %cr25
tr1 .reg %cr25
tr2 .reg %cr26
tr3 .reg %cr27
tr4 .reg %cr28
tr5 .reg %cr29
tr6 .reg %cr30
tr7 .reg %cr31
/*
* Calling Convention
*/
rp .reg %r2
arg3 .reg %r23
arg2 .reg %r24
arg1 .reg %r25
arg0 .reg %r26
dp .reg %r27
ret0 .reg %r28
ret1 .reg %r29
sl .reg %r29
sp .reg %r30
/*
* Temporary registers
*/
t1 .reg %r22
t2 .reg %r21
t3 .reg %r20
t4 .reg %r19
/*
* Temporary space registers
*/
ts1 .reg %sr2
/*
* Space Registers - SW Conventions
*/
sret .reg %sr1 ; return value
sarg .reg %sr1 ; argument
/*
* Floating Point Registers - SW Conventions
*/
farg0 .reg %fr5
farg1 .reg %fr6
farg2 .reg %fr7
farg3 .reg %fr8
fret .reg %fr4
/*
* Temporary floating point registers
*/
tf1 .reg %fr11
tf2 .reg %fr10
tf3 .reg %fr9
tf4 .reg %fr8
#ifdef __STDC__
#define __CONCAT(a,b) a ## b
#else
@ -230,11 +39,11 @@ tf4 .reg %fr8
#ifdef PROF
#define _PROF_PROLOGUE !\
stw rp, HPPA_FRAME_CRP(sr0,sp) !\
ldil L%_mcount,r1 !\
ble R%_mcount(sr0,r1) !\
ldo HPPA_FRAME_SIZE(sp),sp !\
ldw HPPA_FRAME_CRP(sr0,sp),rp
stw %rp, HPPA_FRAME_CRP(%sr0,%sp) !\
ldil L%_mcount,%r1 !\
ble R%_mcount(%sr0,%r1) !\
ldo HPPA_FRAME_SIZE(%sp),%sp !\
ldw HPPA_FRAME_CRP(%sr0,%sp),%rp
#else
#define _PROF_PROLOGUE
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: byte_swap.h,v 1.1 2002/06/05 01:04:21 fredette Exp $ */
/* $NetBSD: byte_swap.h,v 1.2 2003/10/06 05:27:19 matt Exp $ */
/* $OpenBSD: endian.h,v 1.7 2001/06/29 20:28:54 mickey Exp $ */
@ -43,12 +43,12 @@ __byte_swap_long(u_int32_t x)
{
register in_addr_t __swap32md_x; \
\
__asm ("extru %1, 7,8,%%r19\n\t" \
__asm ("extru %1, 7,8,%%r22\n\t" \
"shd %1,%1,8,%0\n\t" \
"dep %0,15,8,%0\n\t" \
"dep %%r19,31,8,%0" \
"dep %%r22,31,8,%0" \
: "=&r" (__swap32md_x) \
: "r" (x) : "r19"); \
: "r" (x) : "r22"); \
return(__swap32md_x);
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: lock.h,v 1.3 2003/09/20 22:28:19 matt Exp $ */
/* $NetBSD: lock.h,v 1.4 2003/10/06 05:27:19 matt Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@ -122,13 +122,6 @@ __cpu_simple_unlock(__cpu_simple_lock_t *alp)
: "r" (__SIMPLELOCK_UNLOCKED));
}
#else /* !MULTIPROCESSOR */
typedef __volatile int __cpu_simple_lock_t;
#define __SIMPLELOCK_LOCKED 1
#define __SIMPLELOCK_UNLOCKED 0
#endif /* !MULTIPROCESSOR */
#endif /* _HPPA_LOCK_H_ */

View File

@ -1,13 +1,13 @@
/* $NetBSD: math.h,v 1.2 2003/04/28 23:16:19 bjh21 Exp $ */
/* $NetBSD: math.h,v 1.3 2003/10/06 05:27:19 matt Exp $ */
#include <sys/featuretest.h>
#define __HAVE_NANF
/*
* ISO C99
*/
#if !defined(_ANSI_SOURCE) && \
(defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L || \
defined(_NETBSD_SOURCE))
extern __const char __nanf[];
#define NAN (*(__const float *)(__const void *)__nanf)
extern const union __float_u __nanf;
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: types.h,v 1.6 2003/08/07 16:27:52 agc Exp $ */
/* $NetBSD: types.h,v 1.7 2003/10/06 05:27:19 matt Exp $ */
/* $OpenBSD: types.h,v 1.6 2001/08/11 01:58:34 art Exp $ */
@ -60,6 +60,11 @@ typedef unsigned long vm_size_t;
#endif
typedef __volatile long __cpu_simple_lock_t;
#define __SIMPLELOCK_LOCKED 1
#define __SIMPLELOCK_UNLOCKED 0
typedef int register_t;
#define __MACHINE_STACK_GROWS_UP /* stack grows to higher addresses */