diff options
Diffstat (limited to 'sys/libkern')
| -rw-r--r-- | sys/libkern/alpha/bswap16.S (renamed from sys/libkern/alpha/htons.S) | 11 | ||||
| -rw-r--r-- | sys/libkern/alpha/bswap32.S (renamed from sys/libkern/alpha/htonl.S) | 13 | ||||
| -rw-r--r-- | sys/libkern/alpha/byte_swap_2.S | 5 | ||||
| -rw-r--r-- | sys/libkern/alpha/byte_swap_4.S | 5 | ||||
| -rw-r--r-- | sys/libkern/alpha/ntohl.S | 34 | ||||
| -rw-r--r-- | sys/libkern/alpha/ntohs.S | 34 | ||||
| -rw-r--r-- | sys/libkern/ia64/bswap16.S (renamed from sys/libkern/ia64/htons.S) | 11 | ||||
| -rw-r--r-- | sys/libkern/ia64/bswap32.S (renamed from sys/libkern/ia64/htonl.S) | 11 | ||||
| -rw-r--r-- | sys/libkern/ia64/byte_swap_2.S | 5 | ||||
| -rw-r--r-- | sys/libkern/ia64/byte_swap_4.S | 5 | ||||
| -rw-r--r-- | sys/libkern/ia64/ntohl.S | 34 | ||||
| -rw-r--r-- | sys/libkern/ia64/ntohs.S | 34 |
12 files changed, 33 insertions, 169 deletions
diff --git a/sys/libkern/alpha/htons.S b/sys/libkern/alpha/bswap16.S index 6b8ea16..98cf054 100644 --- a/sys/libkern/alpha/htons.S +++ b/sys/libkern/alpha/bswap16.S @@ -1,6 +1,3 @@ -/* $FreeBSD$ */ -/* $NetBSD: htons.S,v 1.1 1996/04/17 22:36:54 cgd Exp $ */ - /* * Copyright (c) 1996 Carnegie-Mellon University. * All rights reserved. @@ -26,9 +23,13 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. + * + * from: NetBSD: htons.S,v 1.1 1996/04/17 22:36:54 cgd + * from: src/sys/libkern/alpha/htons.S,v 1.3 2002/02/18 20:35:21 + * + * $FreeBSD$ */ -#define ALIAS htons -#define NAME __htons +#define NAME __bswap16 #include <libkern/alpha/byte_swap_2.S> diff --git a/sys/libkern/alpha/htonl.S b/sys/libkern/alpha/bswap32.S index 2604034..bc1b127 100644 --- a/sys/libkern/alpha/htonl.S +++ b/sys/libkern/alpha/bswap32.S @@ -1,6 +1,3 @@ -/* $FreeBSD$ */ -/* $NetBSD: htonl.S,v 1.1 1996/04/17 22:36:52 cgd Exp $ */ - /* * Copyright (c) 1996 Carnegie-Mellon University. * All rights reserved. @@ -25,10 +22,14 @@ * Pittsburgh PA 15213-3890 * * any improvements or extensions that they make and grant Carnegie the - * rights to redistribute these changes. + * rights to redistribute these changes. + * + * from: NetBSD: htonl.S,v 1.1 1996/04/17 22:36:52 cgd + * from: src/sys/libkern/alpha/htonl.S,v 1.3 2002/02/18 20:35:21 + * + * $FreeBSD$ */ -#define ALIAS htonl -#define NAME __htonl +#define NAME __bswap32 #include <libkern/alpha/byte_swap_4.S> diff --git a/sys/libkern/alpha/byte_swap_2.S b/sys/libkern/alpha/byte_swap_2.S index 8111918..613eef6 100644 --- a/sys/libkern/alpha/byte_swap_2.S +++ b/sys/libkern/alpha/byte_swap_2.S @@ -30,8 +30,8 @@ #include <machine/asm.h> -#if !defined(ALIAS) || !defined(NAME) -#error ALIAS or NAME not defined +#ifndef NAME +#error NAME not defined #endif /* @@ -39,7 +39,6 @@ * * Argument is an unsigned 2-byte integer (u_int16_t). */ -XLEAF(ALIAS, 1) LEAF(NAME, 1) /* a0 contains 0x0123 */ extbl a0, 0, t0 /* t0 = 0x 23 */ extbl a0, 1, t1 /* t1 = 0x 01 */ diff --git a/sys/libkern/alpha/byte_swap_4.S b/sys/libkern/alpha/byte_swap_4.S index d31bbe8..2a66f17 100644 --- a/sys/libkern/alpha/byte_swap_4.S +++ b/sys/libkern/alpha/byte_swap_4.S @@ -30,8 +30,8 @@ #include <machine/asm.h> -#if !defined(ALIAS) || !defined(NAME) -#error ALIAS or NAME not defined +#ifndef NAME +#error NAME not defined #endif /* @@ -39,7 +39,6 @@ * * Argument is an unsigned 4-byte integer (u_int32_t). */ -XLEAF(ALIAS, 1) LEAF(NAME, 1) /* a0 contains 0x01234567 */ extbl a0, 0, t0 /* t0 = 0x 67 */ extbl a0, 1, t1 /* t1 = 0x 45 */ diff --git a/sys/libkern/alpha/ntohl.S b/sys/libkern/alpha/ntohl.S deleted file mode 100644 index 590203a..0000000 --- a/sys/libkern/alpha/ntohl.S +++ /dev/null @@ -1,34 +0,0 @@ -/* $FreeBSD$ */ -/* $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 ALIAS ntohl -#define NAME __ntohl - -#include <libkern/alpha/byte_swap_4.S> diff --git a/sys/libkern/alpha/ntohs.S b/sys/libkern/alpha/ntohs.S deleted file mode 100644 index 9306881..0000000 --- a/sys/libkern/alpha/ntohs.S +++ /dev/null @@ -1,34 +0,0 @@ -/* $FreeBSD$ */ -/* $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 ALIAS ntohs -#define NAME __ntohs - -#include <libkern/alpha/byte_swap_2.S> diff --git a/sys/libkern/ia64/htons.S b/sys/libkern/ia64/bswap16.S index 16a83d6..746e906 100644 --- a/sys/libkern/ia64/htons.S +++ b/sys/libkern/ia64/bswap16.S @@ -1,6 +1,3 @@ -/* $FreeBSD$ */ -/* $NetBSD: htons.S,v 1.1 1996/04/17 22:36:54 cgd Exp $ */ - /* * Copyright (c) 1996 Carnegie-Mellon University. * All rights reserved. @@ -26,9 +23,13 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. + * + * from: NetBSD: htons.S,v 1.1 1996/04/17 22:36:54 cgd + * from: src/sys/libkern/ia64/htons.S,v 1.2 2002/02/18 20:35:21 + * + * $FreeBSD$ */ -#define ALIAS htons -#define NAME __htons +#define NAME __bswap16 #include <libkern/ia64/byte_swap_2.S> diff --git a/sys/libkern/ia64/htonl.S b/sys/libkern/ia64/bswap32.S index f0c89f4..d2a22b2 100644 --- a/sys/libkern/ia64/htonl.S +++ b/sys/libkern/ia64/bswap32.S @@ -1,6 +1,3 @@ -/* $FreeBSD$ */ -/* $NetBSD: htonl.S,v 1.1 1996/04/17 22:36:52 cgd Exp $ */ - /* * Copyright (c) 1996 Carnegie-Mellon University. * All rights reserved. @@ -26,9 +23,13 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. + * + * from: NetBSD: htonl.S,v 1.1 1996/04/17 22:36:52 cgd + * from: src/sys/libkern/ia64/htonl.S,v 1.2 2002/02/18 20:35:21 + * + * $FreeBSD$ */ -#define ALIAS htonl -#define NAME __htonl +#define NAME __bswap32 #include <libkern/ia64/byte_swap_4.S> diff --git a/sys/libkern/ia64/byte_swap_2.S b/sys/libkern/ia64/byte_swap_2.S index 19d0eef..b9ea7d2 100644 --- a/sys/libkern/ia64/byte_swap_2.S +++ b/sys/libkern/ia64/byte_swap_2.S @@ -30,8 +30,8 @@ #include <machine/asm.h> -#if !defined(ALIAS) || !defined(NAME) -#error ALIAS or NAME not defined +#ifndef NAME +#error NAME not defined #endif /* @@ -39,7 +39,6 @@ * * Argument is an unsigned 2-byte integer (u_int16_t). */ -WEAK_ALIAS(ALIAS, NAME) ENTRY(NAME, 1) mux1 r16=in0,@rev ;; diff --git a/sys/libkern/ia64/byte_swap_4.S b/sys/libkern/ia64/byte_swap_4.S index 71019ba..facce77 100644 --- a/sys/libkern/ia64/byte_swap_4.S +++ b/sys/libkern/ia64/byte_swap_4.S @@ -30,8 +30,8 @@ #include <machine/asm.h> -#if !defined(ALIAS) || !defined(NAME) -#error ALIAS or NAME not defined +#ifndef NAME +#error NAME not defined #endif /* @@ -39,7 +39,6 @@ * * Argument is an unsigned 4-byte integer (u_int32_t). */ -WEAK_ALIAS(ALIAS, NAME) ENTRY(NAME, 1) mux1 r16=in0,@rev ;; diff --git a/sys/libkern/ia64/ntohl.S b/sys/libkern/ia64/ntohl.S deleted file mode 100644 index 2f2e7ba..0000000 --- a/sys/libkern/ia64/ntohl.S +++ /dev/null @@ -1,34 +0,0 @@ -/* $FreeBSD$ */ -/* $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 ALIAS ntohl -#define NAME __ntohl - -#include <libkern/ia64/byte_swap_4.S> diff --git a/sys/libkern/ia64/ntohs.S b/sys/libkern/ia64/ntohs.S deleted file mode 100644 index 051f103..0000000 --- a/sys/libkern/ia64/ntohs.S +++ /dev/null @@ -1,34 +0,0 @@ -/* $FreeBSD$ */ -/* $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 ALIAS ntohs -#define NAME __ntohs - -#include <libkern/ia64/byte_swap_2.S> |
