Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Another attempt to get libsa to contain the right things. 

- put a 'standards conforming' memcmp into memcmp.c
- make bcmp be a second label on the same code
- make bcmp.c be just #include "memcmp.c"
This means that libsa.o might contain both a memcmp.o and a bcmp.o, but
both contain the same code (defining both symbols) so it doesn't matter
which ld uses.
Saves worrying about which of bcmp.c and memcmp.c the architecture specific
Makefile requests.
This commit is contained in:
dsl 2003-09-01 12:28:03 +00:00
parent 7f7c9a3509
commit fafabf93cc
2 changed files with 35 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
sys/lib/libsa/bcmp.c
View File

@ -1,57 +1,3 @@
/* $NetBSD: bcmp.c,v 1.5 2003/08/29 19:53:18 dsl Exp $ */
/* $NetBSD: bcmp.c,v 1.6 2003/09/01 12:28:03 dsl Exp $ */
/*
* Copyright (c) 1987, 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.
*/
#include <sys/types.h>
#include <lib/libkern/libkern.h>
#undef bcmp /* in case of LIBSA_USE_MEMCMP */
#undef memcmp
__strong_alias(memcmp, bcmp) /* libsa has always had an 'unsorting' memcmp */
/*
* bcmp -- vax cmpc3 instruction
*/
int
bcmp(b1, b2, length)
const void *b1, *b2;
size_t length;
{
const char *p1 = b1, *p2 = b2;
if (length == 0)
return(0);
do {
if (*p1++ != *p2++)
break;
} while (--length);
return(length);
}
#include "memcmp.c"

36
sys/lib/libsa/memcmp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: memcmp.c,v 1.8 2003/08/29 19:53:18 dsl Exp $ */
/* $NetBSD: memcmp.c,v 1.9 2003/09/01 12:28:03 dsl Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -36,6 +36,36 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/* memcmp is defined as equivalent to bcmp in bcmp.c */
#include <sys/types.h>
#ifdef _STANDALONE
#include <lib/libkern/libkern.h>
#else
#include <string.h>
#endif
#include "stand.h"
extern int i; /* avoid any 'empty translation unit' problems' */
#undef memcmp
#undef bcmp
/* define bcmp to be the same as memcmp() */
__strong_alias(bcmp, memcmp);
/*
* Conformant memcmp()
*/
int
memcmp(b1, b2, len)
const void *b1, *b2;
size_t len;
{
const unsigned char *c1 = b1, *c2 = b2;
int diff;
while (len > 0) {
diff = *c1++ - *c2++;
len--;
if (diff != 0)
return diff;
}
return 0;
}