From: deraadt Date: Wed, 1 May 1996 12:52:30 +0000 (+0000) Subject: sync with netbsd X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=62b02316c8304c09b0002327235a4e50c783cdd5;p=openbsd sync with netbsd --- diff --git a/lib/libc/arch/alpha/Makefile.inc b/lib/libc/arch/alpha/Makefile.inc index 28b9277b11b..72e7e50fbd2 100644 --- a/lib/libc/arch/alpha/Makefile.inc +++ b/lib/libc/arch/alpha/Makefile.inc @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.inc,v 1.1 1995/02/10 17:49:49 cgd Exp $ +# $NetBSD: Makefile.inc,v 1.2 1996/04/17 22:36:30 cgd Exp $ KMINCLUDES= arch/alpha/SYS.h arch/alpha/DEFS.h -KMSRCS= divrem.m4 -#KMSRCS= bcmp.S bzero.S ffs.S strcat.S strcmp.S strcpy.S strlen.S \ -# htonl.S htons.S ntohl.S ntohs.S +KMSRCS= divrem.m4 bzero.S htonl.S htons.S ntohl.S ntohs.S \ + byte_swap_2.S byte_swap_4.S +#KMSRCS= bcmp.S ffs.S strcat.S strcmp.S strcpy.S strlen.S # `source' files built from m4 source SRCS+= __divqu.S __divq.S __divlu.S __divl.S diff --git a/lib/libc/arch/alpha/net/Makefile.inc b/lib/libc/arch/alpha/net/Makefile.inc index 91f20a32992..480bed1a0ea 100644 --- a/lib/libc/arch/alpha/net/Makefile.inc +++ b/lib/libc/arch/alpha/net/Makefile.inc @@ -1,3 +1,3 @@ -# $NetBSD: Makefile.inc,v 1.1 1995/02/25 14:58:43 cgd Exp $ +# $NetBSD: Makefile.inc,v 1.2 1996/04/17 22:36:42 cgd Exp $ -SRCS+= htonl.c htons.c ntohl.c ntohs.c +SRCS+= htonl.S htons.S ntohl.S ntohs.S diff --git a/lib/libc/arch/alpha/net/byte_swap_2.S b/lib/libc/arch/alpha/net/byte_swap_2.S new file mode 100644 index 00000000000..c16f1917216 --- /dev/null +++ b/lib/libc/arch/alpha/net/byte_swap_2.S @@ -0,0 +1,47 @@ +/* $NetBSD: byte_swap_2.S,v 1.1 1996/04/17 22:36:46 cgd Exp $ */ + +/* + * Copyright (c) 1996 Carnegie-Mellon University. + * All rights reserved. + * + * Author: Chris G. Demetriou + * + * Permission to use, copy, modify and distribute this software and + * its documentation is hereby granted, provided that both the copyright + * notice and this permission notice appear in all copies of the + * software, derivative works or modified versions, and any portions + * thereof, and that both notices appear in supporting documentation. + * + * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" + * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND + * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. + * + * Carnegie Mellon requests users of this software to return to + * + * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU + * School of Computer Science + * Carnegie Mellon University + * Pittsburgh PA 15213-3890 + * + * any improvements or extensions that they make and grant Carnegie the + * rights to redistribute these changes. + */ + +#include "DEFS.h" + +#ifndef NAME +#define NAME byte_swap_2 +#endif + +/* + * Byte-swap a 2-byte quantity. (Convert 0x0123 to 0x2301.) + * + * Argument is an unsigned 2-byte integer (u_int16_t). + */ +LEAF(NAME, 1) /* a0 contains 0x0123 */ + extbl a0, 0, t0 /* t0 = 0x 23 */ + extbl a0, 1, t1 /* t1 = 0x 01 */ + sll t0, 8, t0 /* t1 = 0x23 */ + or t0, t1, v0 /* v0 = 0x2301 */ + RET +END(NAME) diff --git a/lib/libc/arch/alpha/net/byte_swap_4.S b/lib/libc/arch/alpha/net/byte_swap_4.S new file mode 100644 index 00000000000..37a53def822 --- /dev/null +++ b/lib/libc/arch/alpha/net/byte_swap_4.S @@ -0,0 +1,53 @@ +/* $NetBSD: byte_swap_4.S,v 1.1 1996/04/17 22:36:49 cgd Exp $ */ + +/* + * Copyright (c) 1996 Carnegie-Mellon University. + * All rights reserved. + * + * Author: Chris G. Demetriou + * + * Permission to use, copy, modify and distribute this software and + * its documentation is hereby granted, provided that both the copyright + * notice and this permission notice appear in all copies of the + * software, derivative works or modified versions, and any portions + * thereof, and that both notices appear in supporting documentation. + * + * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" + * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND + * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. + * + * Carnegie Mellon requests users of this software to return to + * + * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU + * School of Computer Science + * Carnegie Mellon University + * Pittsburgh PA 15213-3890 + * + * any improvements or extensions that they make and grant Carnegie the + * rights to redistribute these changes. + */ + +#include "DEFS.h" + +#ifndef NAME +#define NAME byte_swap_4 +#endif + +/* + * Byte-swap a 4-byte quantity. (Convert 0x01234567 to 0x67452301.) + * + * Argument is an unsigned 4-byte integer (u_int32_t). + */ +LEAF(NAME, 1) /* a0 contains 0x01234567 */ + extbl a0, 0, t0 /* t0 = 0x 67 */ + extbl a0, 1, t1 /* t1 = 0x 45 */ + extbl a0, 2, t2 /* t2 = 0x 23 */ + extbl a0, 3, t3 /* t3 = 0x 01 */ + sll t0, 24, t0 /* t0 = 0x67 */ + sll t1, 16, t1 /* t1 = 0x 45 */ + sll t2, 8, t2 /* t2 = 0x 23 */ + or t3, t0, v0 /* v0 = 0x67 01 */ + or t1, t2, t1 /* t1 = 0x 4523 */ + or t1, v0, v0 /* v0 = 0x67452301 */ + RET +END(NAME) diff --git a/lib/libc/arch/alpha/net/htonl.S b/lib/libc/arch/alpha/net/htonl.S new file mode 100644 index 00000000000..bacab1ede38 --- /dev/null +++ b/lib/libc/arch/alpha/net/htonl.S @@ -0,0 +1,32 @@ +/* $NetBSD: htonl.S,v 1.1 1996/04/17 22:36:52 cgd Exp $ */ + +/* + * Copyright (c) 1996 Carnegie-Mellon University. + * All rights reserved. + * + * Author: Chris G. Demetriou + * + * Permission to use, copy, modify and distribute this software and + * its documentation is hereby granted, provided that both the copyright + * notice and this permission notice appear in all copies of the + * software, derivative works or modified versions, and any portions + * thereof, and that both notices appear in supporting documentation. + * + * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" + * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND + * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. + * + * Carnegie Mellon requests users of this software to return to + * + * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU + * School of Computer Science + * Carnegie Mellon University + * Pittsburgh PA 15213-3890 + * + * any improvements or extensions that they make and grant Carnegie the + * rights to redistribute these changes. + */ + +#define NAME htonl + +#include "byte_swap_4.S" diff --git a/lib/libc/arch/alpha/net/htons.S b/lib/libc/arch/alpha/net/htons.S new file mode 100644 index 00000000000..fb082223a9d --- /dev/null +++ b/lib/libc/arch/alpha/net/htons.S @@ -0,0 +1,32 @@ +/* $NetBSD: htons.S,v 1.1 1996/04/17 22:36:54 cgd Exp $ */ + +/* + * Copyright (c) 1996 Carnegie-Mellon University. + * All rights reserved. + * + * Author: Chris G. Demetriou + * + * Permission to use, copy, modify and distribute this software and + * its documentation is hereby granted, provided that both the copyright + * notice and this permission notice appear in all copies of the + * software, derivative works or modified versions, and any portions + * thereof, and that both notices appear in supporting documentation. + * + * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" + * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND + * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. + * + * Carnegie Mellon requests users of this software to return to + * + * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU + * School of Computer Science + * Carnegie Mellon University + * Pittsburgh PA 15213-3890 + * + * any improvements or extensions that they make and grant Carnegie the + * rights to redistribute these changes. + */ + +#define NAME htons + +#include "byte_swap_2.S" diff --git a/lib/libc/arch/alpha/net/ntohl.S b/lib/libc/arch/alpha/net/ntohl.S new file mode 100644 index 00000000000..b571647342f --- /dev/null +++ b/lib/libc/arch/alpha/net/ntohl.S @@ -0,0 +1,32 @@ +/* $NetBSD: ntohl.S,v 1.1 1996/04/17 22:36:57 cgd Exp $ */ + +/* + * Copyright (c) 1996 Carnegie-Mellon University. + * All rights reserved. + * + * Author: Chris G. Demetriou + * + * Permission to use, copy, modify and distribute this software and + * its documentation is hereby granted, provided that both the copyright + * notice and this permission notice appear in all copies of the + * software, derivative works or modified versions, and any portions + * thereof, and that both notices appear in supporting documentation. + * + * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" + * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND + * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. + * + * Carnegie Mellon requests users of this software to return to + * + * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU + * School of Computer Science + * Carnegie Mellon University + * Pittsburgh PA 15213-3890 + * + * any improvements or extensions that they make and grant Carnegie the + * rights to redistribute these changes. + */ + +#define NAME ntohl + +#include "byte_swap_4.S" diff --git a/lib/libc/arch/alpha/net/ntohs.S b/lib/libc/arch/alpha/net/ntohs.S new file mode 100644 index 00000000000..6db99617680 --- /dev/null +++ b/lib/libc/arch/alpha/net/ntohs.S @@ -0,0 +1,32 @@ +/* $NetBSD: ntohs.S,v 1.1 1996/04/17 22:37:02 cgd Exp $ */ + +/* + * Copyright (c) 1996 Carnegie-Mellon University. + * All rights reserved. + * + * Author: Chris G. Demetriou + * + * Permission to use, copy, modify and distribute this software and + * its documentation is hereby granted, provided that both the copyright + * notice and this permission notice appear in all copies of the + * software, derivative works or modified versions, and any portions + * thereof, and that both notices appear in supporting documentation. + * + * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" + * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND + * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. + * + * Carnegie Mellon requests users of this software to return to + * + * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU + * School of Computer Science + * Carnegie Mellon University + * Pittsburgh PA 15213-3890 + * + * any improvements or extensions that they make and grant Carnegie the + * rights to redistribute these changes. + */ + +#define NAME ntohs + +#include "byte_swap_2.S"