Module Name: src
Committed By: matt
Date: Sat Sep 5 18:46:38 UTC 2009
Modified Files:
src/common/lib/libc/arch/mips/gen [matt-nb5-mips64]: byte_swap_8.S
src/lib/libc/arch/mips/gen [matt-nb5-mips64]: Makefile.inc
src/sys/lib/libkern/arch/mips [matt-nb5-mips64]: Makefile.inc
Log Message:
Add an assmebly version of bswap64
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \
src/common/lib/libc/arch/mips/gen/byte_swap_8.S
cvs rdiff -u -r1.28 -r1.28.34.1 src/lib/libc/arch/mips/gen/Makefile.inc
cvs rdiff -u -r1.18.138.1 -r1.18.138.2 \
src/sys/lib/libkern/arch/mips/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/mips/gen/byte_swap_8.S
diff -u src/common/lib/libc/arch/mips/gen/byte_swap_8.S:1.1.2.2 src/common/lib/libc/arch/mips/gen/byte_swap_8.S:1.1.2.3
--- src/common/lib/libc/arch/mips/gen/byte_swap_8.S:1.1.2.2 Sun Aug 30 23:27:35 2009
+++ src/common/lib/libc/arch/mips/gen/byte_swap_8.S Sat Sep 5 18:46:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: byte_swap_8.S,v 1.1.2.2 2009/08/30 23:27:35 matt Exp $ */
+/* $NetBSD: byte_swap_8.S,v 1.1.2.3 2009/09/05 18:46:37 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -35,20 +35,14 @@
#include <mips/asm.h>
#if defined(LIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: byte_swap_8.S,v 1.1.2.2 2009/08/30 23:27:35 matt Exp $")
+ RCSID("$NetBSD: byte_swap_8.S,v 1.1.2.3 2009/09/05 18:46:37 matt Exp $")
#endif /* LIBC_SCCS and not lint */
#undef _LOCORE
#define _LOCORE /* XXX not really, just assembly-code source */
#include <machine/endian.h>
-#if defined(_KERNEL) || defined(_STANDALONE)
-#define BSWAP64_NAME bswap64
-#else
-#define BSWAP64_NAME __bswap64
-#endif
-
-NLEAF(BSWAP64_NAME) # a0 = 0xffeeddccbbaa9988 return 0x8899aabbccddeeff
+NLEAF(bswap64) # a0 = 0xffeeddccbbaa9988 return 0x8899aabbccddeeff
#if (__mips == 32 || __mips == 64) && __mips_isa_rev == 2
#if !defined(__mips_o32)
/*
@@ -121,4 +115,4 @@
or v0, ta1, t1 # v0 = 0xbbaa9988
j ra
#endif /* defined(__mips_o32) */
-END(BSWAP64_NAME)
+END(bswap64)
Index: src/lib/libc/arch/mips/gen/Makefile.inc
diff -u src/lib/libc/arch/mips/gen/Makefile.inc:1.28 src/lib/libc/arch/mips/gen/Makefile.inc:1.28.34.1
--- src/lib/libc/arch/mips/gen/Makefile.inc:1.28 Mon Jul 3 12:58:55 2006
+++ src/lib/libc/arch/mips/gen/Makefile.inc Sat Sep 5 18:46:38 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.28 2006/07/03 12:58:55 drochner Exp $
+# $NetBSD: Makefile.inc,v 1.28.34.1 2009/09/05 18:46:38 matt Exp $
SRCS+= fabs.S ldexp.S modf.S
@@ -18,7 +18,7 @@
SRCS+= setjmp.S longjmp.c
SRCS+= _setjmp.S
SRCS+= sigsetjmp.S
-SRCS+= byte_swap_2.S byte_swap_4.S bswap64.c
+SRCS+= byte_swap_2.S byte_swap_4.S byte_swap_8.S
SRCS+= makecontext.c resumecontext.c _resumecontext.S swapcontext.S _lwp.c
Index: src/sys/lib/libkern/arch/mips/Makefile.inc
diff -u src/sys/lib/libkern/arch/mips/Makefile.inc:1.18.138.1 src/sys/lib/libkern/arch/mips/Makefile.inc:1.18.138.2
--- src/sys/lib/libkern/arch/mips/Makefile.inc:1.18.138.1 Tue Aug 18 15:27:42 2009
+++ src/sys/lib/libkern/arch/mips/Makefile.inc Sat Sep 5 18:46:38 2009
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.18.138.1 2009/08/18 15:27:42 matt Exp $
+# $NetBSD: Makefile.inc,v 1.18.138.2 2009/09/05 18:46:38 matt Exp $
#
# There are likely more that we will notice when we go native
-SRCS+= __assert.c bswap64.c memchr.c memcmp.c random.c scanc.c \
+SRCS+= __assert.c memchr.c memcmp.c random.c scanc.c \
skpc.c strcat.c strcpy.c strcasecmp.c \
strncasecmp.c strncmp.c strncpy.c strtoul.c
-SRCS+= byte_swap_2.S byte_swap_4.S ffs.S memcpy.S memset2.c memmove.S \
+SRCS+= byte_swap_2.S byte_swap_4.S byte_swap_8.S \
+ ffs.S memcpy.S memset2.c memmove.S \
strlen.S strcmp.S