This commit was manufactured by cvs2svn to create tag 'V1_171'.

git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/tags/V1_171@14712 87f5fb63-7c3d-0410-a384-fd976d0f7a62

library/GNUmakefile.68k

@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.68k,v 1.3 2004-08-07 09:15:32 obarthel Exp $
+# $Id: GNUmakefile.68k,v 1.6 2004-08-16 09:33:11 obarthel Exp $
 #
 # :ts=8
 #
@@ -103,9 +103,9 @@ WARNINGS = \
 	-Wundef -Wbad-function-cast -Wmissing-declarations -Wconversion
 
 INCLUDES = -Iinclude -I. -Inetinclude
- OPTIONS = -DNDEBUG -fno-builtin -DNO_INLINE_STDARG
-#OPTIONS = -D__MEM_DEBUG -fno-builtin
-#OPTIONS = -DDEBUG -D__MEM_DEBUG -DNO_INLINE_STDARG -fno-builtin
+ OPTIONS = -DUSE_64_BIT_INTS -DNDEBUG -fno-builtin -DNO_INLINE_STDARG
+#OPTIONS = -DUSE_64_BIT_INTS -D__MEM_DEBUG -fno-builtin
+#OPTIONS = -DUSE_64_BIT_INTS -DDEBUG -D__MEM_DEBUG -DNO_INLINE_STDARG -fno-builtin
  OPTIMIZE = -O
 #OPTIMIZE = -O2 -fomit-frame-pointer
 #DEBUG = -g2
@@ -452,12 +452,14 @@ MATH_LIB = \
 	math_floor.o \
 	math_fmod.o \
 	math_frexp.o \
+	math_hypot.o \
 	math_init_exit.o \
 	math_isinf.o \
 	math_isnan.o \
 	math_ldexp.o \
 	math_log.o \
 	math_log10.o \
+	math_logb.o \
 	math_modf.o \
 	math_pow.o \
 	math_rint.o \
@@ -698,11 +700,6 @@ STARTUPS := nrcrt0.o nbcrt0.o nr32crt0.o nb32crt0.o ncrt0.o mainnb.o mainb.o mai
 ##############################################################################
 
 all: \
-	lib/libm020/libm.a \
-	lib/libm.a \
-	lib/libb/libm020/libm.a \
-	lib/libb/libm.a \
-	lib/libb32/libm020/libm.a \
 	lib/nrcrt0.o \
 	lib/nbcrt0.o \
 	lib/ncrt0.o \
@@ -710,7 +707,12 @@ all: \
 	lib/n32rcrt0.o \
 	lib/mainnb.o \
 	lib/mainb.o \
-	lib/mainb32.o
+	lib/mainb32.o \
+	lib/libm.a \
+	lib/libm020/libm.a \
+	lib/libb/libm.a \
+	lib/libb/libm020/libm.a \
+	lib/libb32/libm020/libm.a
 
 ##############################################################################
 

library/GNUmakefile.os4

@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.os4,v 1.3 2004-08-07 09:15:32 obarthel Exp $
+# $Id: GNUmakefile.os4,v 1.5 2004-08-16 09:33:11 obarthel Exp $
 #
 # :ts=8
 #
@@ -444,12 +444,14 @@ MATH_LIB = \
 	math_floor.o \
 	math_fmod.o \
 	math_frexp.o \
+	math_hypot.o \
 	math_init_exit.o \
 	math_isnan.o \
 	math_isinf.o \
 	math_ldexp.o \
 	math_log.o \
 	math_log10.o \
+	math_logb.o \
 	math_modf.o \
 	math_pow.o \
 	math_rint.o \

library/amiga.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	169
-#define DATE		"8.8.2004"
-#define VERS		"amiga.lib 1.169"
-#define VSTRING		"amiga.lib 1.169 (8.8.2004)\r\n"
-#define VERSTAG		"\0$VER: amiga.lib 1.169 (8.8.2004)"
+#define REVISION	171
+#define DATE		"16.8.2004"
+#define VERS		"amiga.lib 1.171"
+#define VSTRING		"amiga.lib 1.171 (16.8.2004)\r\n"
+#define VERSTAG		"\0$VER: amiga.lib 1.171 (16.8.2004)"

library/amiga.lib_rev.rev

@@ -1 +1 @@
-169
+171

library/c.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	169
-#define DATE		"8.8.2004"
-#define VERS		"c.lib 1.169"
-#define VSTRING		"c.lib 1.169 (8.8.2004)\r\n"
-#define VERSTAG		"\0$VER: c.lib 1.169 (8.8.2004)"
+#define REVISION	171
+#define DATE		"16.8.2004"
+#define VERS		"c.lib 1.171"
+#define VSTRING		"c.lib 1.171 (16.8.2004)\r\n"
+#define VERSTAG		"\0$VER: c.lib 1.171 (16.8.2004)"

library/c.lib_rev.rev

@@ -1 +1 @@
-169
+171

library/debug.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	169
-#define DATE		"8.8.2004"
-#define VERS		"debug.lib 1.169"
-#define VSTRING		"debug.lib 1.169 (8.8.2004)\r\n"
-#define VERSTAG		"\0$VER: debug.lib 1.169 (8.8.2004)"
+#define REVISION	171
+#define DATE		"16.8.2004"
+#define VERS		"debug.lib 1.171"
+#define VSTRING		"debug.lib 1.171 (16.8.2004)\r\n"
+#define VERSTAG		"\0$VER: debug.lib 1.171 (16.8.2004)"

library/debug.lib_rev.rev

@@ -1 +1 @@
-169
+171

library/include/math.h

@@ -1,5 +1,5 @@
 /*
- * $Id: math.h,v 1.2 2004-08-07 09:15:33 obarthel Exp $
+ * $Id: math.h,v 1.4 2004-08-16 09:33:13 obarthel Exp $
  *
  * :ts=4
  *
@@ -89,6 +89,8 @@ extern double rint(double x);
 extern float rintf(float x);
 extern int isinf(double x);
 extern int isnan(double x);
+extern double logb(double x);
+extern double hypot(double x,double y);
 
 /****************************************************************************/
 

library/m.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	169
-#define DATE		"8.8.2004"
-#define VERS		"m.lib 1.169"
-#define VSTRING		"m.lib 1.169 (8.8.2004)\r\n"
-#define VERSTAG		"\0$VER: m.lib 1.169 (8.8.2004)"
+#define REVISION	171
+#define DATE		"16.8.2004"
+#define VERS		"m.lib 1.171"
+#define VSTRING		"m.lib 1.171 (16.8.2004)\r\n"
+#define VERSTAG		"\0$VER: m.lib 1.171 (16.8.2004)"

library/m.lib_rev.rev

@@ -1 +1 @@
-169
+171

library/m881.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	169
-#define DATE		"8.8.2004"
-#define VERS		"m881.lib 1.169"
-#define VSTRING		"m881.lib 1.169 (8.8.2004)\r\n"
-#define VERSTAG		"\0$VER: m881.lib 1.169 (8.8.2004)"
+#define REVISION	171
+#define DATE		"16.8.2004"
+#define VERS		"m881.lib 1.171"
+#define VSTRING		"m881.lib 1.171 (16.8.2004)\r\n"
+#define VERSTAG		"\0$VER: m881.lib 1.171 (16.8.2004)"

library/m881.lib_rev.rev

@@ -1 +1 @@
-169
+171

library/math_headers.h

@@ -1,5 +1,5 @@
 /*
- * $Id: math_headers.h,v 1.1.1.1 2004-07-26 16:30:45 obarthel Exp $
+ * $Id: math_headers.h,v 1.2 2004-08-12 12:31:16 obarthel Exp $
  *
  * :ts=4
  *
@@ -38,6 +38,7 @@
 
 #include <limits.h>
 #include <errno.h>
+#include <float.h>
 #include <math.h>
 
 /****************************************************************************/

library/math_hypot.c

@@ -0,0 +1,171 @@
+/*
+ * $Id: math_hypot.c,v 1.1 2004-08-16 09:33:11 obarthel Exp $
+ *
+ * :ts=4
+ *
+ * Portable ISO 'C' (1994) runtime library for the Amiga computer
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Neither the name of Olaf Barthel nor the names of contributors
+ *     may be used to endorse or promote products derived from this
+ *     software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
+ *
+ *
+ * PowerPC math library based in part on work by Sun Microsystems
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ */
+
+#ifndef _MATH_HEADERS_H
+#include "math_headers.h"
+#endif /* _MATH_HEADERS_H */
+
+/****************************************************************************/
+
+#if defined(FLOATING_POINT_SUPPORT)
+
+/****************************************************************************/
+
+#if defined(IEEE_FLOATING_POINT_SUPPORT) || defined(M68881_FLOATING_POINT_SUPPORT)
+
+INLINE static const double
+__hypot(double x,double y)
+{
+	double yx;
+
+	x = fabs(x);
+	y = fabs(y);
+	if ( x < y )
+	{
+		double temp = x;
+		x = y;
+		y = temp;
+	}
+
+	if (x == 0.)
+	{
+		return 0.;
+	}
+	else
+	{
+		yx = y/x;
+		return x*sqrt(1. + yx*yx);
+	}
+}
+
+#endif /* IEEE_FLOATING_POINT_SUPPORT || M68881_FLOATING_POINT_SUPPORT */
+
+/****************************************************************************/
+
+#if defined(PPC_FLOATING_POINT_SUPPORT)
+
+static const double one = 1.0;
+
+INLINE static const double
+__hypot(double x,double y)
+{
+	int n0;
+	double a=x,b=y,t1,t2,y1,y2,w;
+	int j,k,ha,hb;
+
+	n0 = ((*(int*)&one)>>29)^1;	/* high word index */
+	ha = *(n0+(int*)&x)&0x7fffffff;	/* high word of  x */
+	hb = *(n0+(int*)&y)&0x7fffffff;	/* high word of  y */
+	if(hb > ha) {a=y;b=x;j=ha; ha=hb;hb=j;} else {a=x;b=y;}
+	*(n0+(int*)&a) = ha;	/* a <- |a| */
+	*(n0+(int*)&b) = hb;	/* b <- |b| */
+	if((ha-hb)>0x3c00000) {return a+b;} /* x/y > 2**60 */
+	k=0;
+	if(ha > 0x5f300000) {	/* a>2**500 */
+	   if(ha >= 0x7ff00000) {	/* Inf or NaN */
+	       w = a+b;			/* for sNaN */
+	       if(((ha&0xfffff)|*(1-n0+(int*)&a))==0) w = a;
+	       if(((hb^0x7ff00000)|*(1-n0+(int*)&b))==0) w = b;
+	       return w;
+	   }
+	   /* scale a and b by 2**-600 */
+	   ha -= 0x25800000; hb -= 0x25800000;	k += 600;
+	   *(n0+(int*)&a) = ha;
+	   *(n0+(int*)&b) = hb;
+	}
+	if(hb < 0x20b00000) {	/* b < 2**-500 */
+	    if(hb <= 0x000fffff) {	/* subnormal b or 0 */	
+		if((hb|(*(1-n0+(int*)&b)))==0) return a;
+		t1=0;
+		*(n0+(int*)&t1) = 0x7fd00000;	/* t1=2^1022 */
+		b *= t1;
+		a *= t1;
+		k -= 1022;
+	    } else {		/* scale a and b by 2^600 */
+	        ha += 0x25800000; 	/* a *= 2^600 */
+		hb += 0x25800000;	/* b *= 2^600 */
+		k -= 600;
+	   	*(n0+(int*)&a) = ha;
+	   	*(n0+(int*)&b) = hb;
+	    }
+	}
+    /* medium size a and b */
+	w = a-b;
+	if (w>b) {
+	    t1 = 0;
+	    *(n0+(int*)&t1) = ha;
+	    t2 = a-t1;
+	    w  = sqrt(t1*t1-(b*(-b)-t2*(a+t1)));
+	} else {
+	    a  = a+a;
+	    y1 = 0;
+	    *(n0+(int*)&y1) = hb;
+	    y2 = b - y1;
+	    t1 = 0;
+	    *(n0+(int*)&t1) = ha+0x00100000;
+	    t2 = a - t1;
+	    w  = sqrt(t1*y1-(w*(-w)-(t1*y2+t2*b)));
+	}
+	if(k!=0) {
+	    t1 = 1.0;
+	    *(n0+(int*)&t1) += (k<<20);
+	    return t1*w;
+	} else return w;
+}
+
+#endif /* PPC_FLOATING_POINT_SUPPORT */
+
+/****************************************************************************/
+
+double
+hypot(double x,double y)
+{
+	double result;
+
+	result = __hypot(x,y);
+
+	return(result);
+}
+
+/****************************************************************************/
+
+#endif /* FLOATING_POINT_SUPPORT */

library/math_logb.c

@@ -0,0 +1,136 @@
+/*
+ * $Id: math_logb.c,v 1.2 2004-08-14 11:11:01 obarthel Exp $
+ *
+ * :ts=4
+ *
+ * Portable ISO 'C' (1994) runtime library for the Amiga computer
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Neither the name of Olaf Barthel nor the names of contributors
+ *     may be used to endorse or promote products derived from this
+ *     software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
+ *
+ *
+ * PowerPC math library based in part on work by Sun Microsystems
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ */
+
+#ifndef _MATH_HEADERS_H
+#include "math_headers.h"
+#endif /* _MATH_HEADERS_H */
+
+/****************************************************************************/
+
+#if defined(FLOATING_POINT_SUPPORT)
+
+/****************************************************************************/
+
+#if defined(IEEE_FLOATING_POINT_SUPPORT) || defined(M68881_FLOATING_POINT_SUPPORT)
+
+/****************************************************************************/
+
+INLINE static const double
+__logb(double x)
+{
+	double result;
+
+	result = log(x) / log((double)FLT_RADIX);
+
+	return(result);
+}
+
+#endif /* IEEE_FLOATING_POINT_SUPPORT || M68881_FLOATING_POINT_SUPPORT */
+
+/****************************************************************************/
+
+#if defined(PPC_FLOATING_POINT_SUPPORT)
+
+INLINE static const double
+__logb(double x)
+{
+	unsigned int lx,ix;
+
+	EXTRACT_WORDS(ix,lx,x);
+
+	ix &= 0x7fffffff;	/* high |x| */
+	if((ix|lx)==0)
+		return -1.0/fabs(x);
+
+	if(ix>=0x7ff00000)
+		return x*x;
+
+	if((ix>>=20)==0)	/* IEEE 754 logb */
+		return -1022.0;
+	else
+		return (double) (ix-1023);
+}
+
+#endif /* PPC_FLOATING_POINT_SUPPORT */
+
+/****************************************************************************/
+
+double
+logb(double x)
+{
+	double result;
+
+	int sign;
+
+	if(x == 0.0)
+	{
+		result = -HUGE_VAL;
+		goto out;
+	}
+
+	if(isnan(x))
+	{
+		result = x;
+		goto out;
+	}
+
+	sign = isinf(x);
+	if(sign != 0)
+	{
+		if(sign < 0)
+			result = (-x);
+		else
+			result = x;
+
+		goto out;
+	}
+
+	result = __logb(x);
+
+ out:
+
+	return(result);
+}
+
+/****************************************************************************/
+
+#endif /* FLOATING_POINT_SUPPORT */

library/net.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	169
-#define DATE		"8.8.2004"
-#define VERS		"net.lib 1.169"
-#define VSTRING		"net.lib 1.169 (8.8.2004)\r\n"
-#define VERSTAG		"\0$VER: net.lib 1.169 (8.8.2004)"
+#define REVISION	171
+#define DATE		"16.8.2004"
+#define VERS		"net.lib 1.171"
+#define VSTRING		"net.lib 1.171 (16.8.2004)\r\n"
+#define VERSTAG		"\0$VER: net.lib 1.171 (16.8.2004)"

library/net.lib_rev.rev

@@ -1 +1 @@
-169
+171

library/smakefile

@@ -1,5 +1,5 @@
 #
-# $Id: smakefile,v 1.4 2004-08-07 09:15:32 obarthel Exp $
+# $Id: smakefile,v 1.6 2004-08-16 09:33:12 obarthel Exp $
 #
 # :ts=8
 #
@@ -189,12 +189,14 @@ MATH_OBJ = \
 	math_floor.o \
 	math_fmod.o \
 	math_frexp.o \
+	math_hypot.o \
 	math_init_exit.o \
 	math_isinf.o \
 	math_isnan.o \
 	math_ldexp.o \
 	math_log.o \
 	math_log10.o \
+	math_logb.o \
 	math_modf.o \
 	math_pow.o \
 	math_rint.o \

library/stack.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	169
-#define DATE		"8.8.2004"
-#define VERS		"stack.lib 1.169"
-#define VSTRING		"stack.lib 1.169 (8.8.2004)\r\n"
-#define VERSTAG		"\0$VER: stack.lib 1.169 (8.8.2004)"
+#define REVISION	171
+#define DATE		"16.8.2004"
+#define VERS		"stack.lib 1.171"
+#define VSTRING		"stack.lib 1.171 (16.8.2004)\r\n"
+#define VERSTAG		"\0$VER: stack.lib 1.171 (16.8.2004)"

library/stack.lib_rev.rev

@@ -1 +1 @@
-169
+171

library/stdio_vfprintf.c

@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_vfprintf.c,v 1.3 2004-08-08 10:55:57 obarthel Exp $
+ * $Id: stdio_vfprintf.c,v 1.4 2004-08-14 11:11:01 obarthel Exp $
  *
  * :ts=4
  *
@@ -635,6 +635,7 @@ vfprintf(FILE * stream,const char * format, va_list arg)
 				char *			buffer_start	= buffer;
 
 				__long_double_t v;
+				int sign;
 
 				output_buffer = buffer_start;
 
@@ -645,14 +646,14 @@ vfprintf(FILE * stream,const char * format, va_list arg)
 				else
 					v = va_arg(arg, double);
 
-				if(isinf(v) != 0)
+				if((sign = isinf(v)) != 0)
 				{
 					SHOWMSG("infinity");
 
 					strcpy(output_buffer,"Inf");
 					output_len = 3;
 
-					if(v < 0.0)
+					if(sign < 0)
 						SET_FLAG(format_flags,FORMATF_IsNegative);
 
 					fill_character = ' ';

library/stdlib_qsort.c

@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_qsort.c,v 1.1.1.1 2004-07-26 16:32:02 obarthel Exp $
+ * $Id: stdlib_qsort.c,v 1.2 2004-08-14 11:11:01 obarthel Exp $
  *
  * :ts=4
  *
@@ -81,7 +81,7 @@
 /* For an 68030 and beyond the alignment does not matter and you can skip the
    second half of the test (everything beyond the 'nbytes >= sizeof(long)'). */
 #if defined(M68020)
-#define IS_WORD_ALIGNED(a,b) 1
+#define IS_WORD_ALIGNED(a,b) (1)
 #else
 #define IS_WORD_ALIGNED(a,b) (((((unsigned long)(a)) | ((unsigned long)(b))) & 1) == 0)
 #endif /* M68020 */

library/string_headers.h

@@ -1,5 +1,5 @@
 /*
- * $Id: string_headers.h,v 1.1.1.1 2004-07-26 16:32:14 obarthel Exp $
+ * $Id: string_headers.h,v 1.2 2004-08-14 11:11:01 obarthel Exp $
  *
  * :ts=4
  *
@@ -57,4 +57,21 @@
 
 /****************************************************************************/
 
+/* Address is neither aligned to a word or long word boundary. */
+#define IS_UNALIGNED(a) ((((unsigned long)(a)) & 1) != 0)
+
+/* Address is aligned to a word boundary, but not to a long
+   word boundary. */
+#define IS_SHORT_ALIGNED(a) ((((unsigned long)(a)) & 3) == 2)
+
+/* Address is aligned to a long word boundary. For an 68030 and beyond the
+   alignment does not matter. */
+#if defined(M68020)
+#define IS_LONG_ALIGNED(a) ((((unsigned long)(a)) & 3) == 0)
+#else
+#define IS_LONG_ALIGNED(a) (1)
+#endif /* M68020 */
+
+/****************************************************************************/
+
 #endif /* _STRING_HEADERS_H */

library/string_memchr.c

@@ -1,5 +1,5 @@
 /*
- * $Id: string_memchr.c,v 1.1.1.1 2004-07-26 16:32:15 obarthel Exp $
+ * $Id: string_memchr.c,v 1.2 2004-08-14 11:11:01 obarthel Exp $
  *
  * :ts=4
  *
@@ -43,12 +43,6 @@
 
 /****************************************************************************/
 
-#define IS_UNALIGNED(a) 	((((unsigned long)(a)) & 1) != 0)
-#define IS_SHORT_ALIGNED(a)	((((unsigned long)(a)) & 3) == 2)
-#define IS_LONG_ALIGNED(a)	((((unsigned long)(a)) & 1) == 0)
-
-/****************************************************************************/
-
 /* Check if one of the four bytes which make up a long word is zero. */
 #define LONG_CONTAINS_ZERO_OCTET(x) (((x) + 0xfefefeff) & ~((x) | 0x7f7f7f7f))
 

library/string_memcmp.c

@@ -1,5 +1,5 @@
 /*
- * $Id: string_memcmp.c,v 1.1.1.1 2004-07-26 16:32:15 obarthel Exp $
+ * $Id: string_memcmp.c,v 1.3 2004-08-14 11:11:01 obarthel Exp $
  *
  * :ts=4
  *
@@ -43,12 +43,6 @@
 
 /****************************************************************************/
 
-#define IS_UNALIGNED(a) 	((((unsigned long)(a)) & 1) != 0)
-#define IS_SHORT_ALIGNED(a)	((((unsigned long)(a)) & 3) == 2)
-#define IS_LONG_ALIGNED(a)	((((unsigned long)(a)) & 1) == 0)
-
-/****************************************************************************/
-
 INLINE static int
 __memcmp(const char *m1,const char *m2,size_t len)
 {
@@ -154,8 +148,16 @@ __memcmp(const char *m1,const char *m2,size_t len)
 
 /****************************************************************************/
 
+/* This is ugly: GCC 2.95.x assumes that 'unsigned long' is used in the built-in
+   memcmp/memcpy/memset functions instead of 'size_t'. This can produce warnings
+   where none are necessary. */
+#if defined(__GNUC__) && (__GNUC__ < 3)
+int
+memcmp(const void *ptr1, const void *ptr2, unsigned long len)
+#else
 int
 memcmp(const void *ptr1, const void *ptr2, size_t len)
+#endif /* __GNUC__ && __GNUC__ < 3 */
 {
 	int result = 0;
 

library/string_memcpy.c

@@ -1,5 +1,5 @@
 /*
- * $Id: string_memcpy.c,v 1.1.1.1 2004-07-26 16:32:15 obarthel Exp $
+ * $Id: string_memcpy.c,v 1.3 2004-08-14 11:11:01 obarthel Exp $
  *
  * :ts=4
  *
@@ -184,8 +184,16 @@ extern void __bcopy(const void *src,void *dst,size_t len);
 
 /****************************************************************************/
 
+/* This is ugly: GCC 2.95.x assumes that 'unsigned long' is used in the built-in
+   memcmp/memcpy/memset functions instead of 'size_t'. This can produce warnings
+   where none are necessary. */
+#if defined(__GNUC__) && (__GNUC__ < 3)
+void *
+memcpy(void *dst, const void *src, unsigned long len)
+#else
 void *
 memcpy(void *dst, const void *src, size_t len)
+#endif /* __GNUC__ && __GNUC__ < 3 */
 {
 	void * result = dst;
 
@@ -221,12 +229,6 @@ memcpy(void *dst, const void *src, size_t len)
 
 /****************************************************************************/
 
-#define IS_UNALIGNED(a) 	((((unsigned long)(a)) & 1) != 0)
-#define IS_SHORT_ALIGNED(a)	((((unsigned long)(a)) & 3) == 2)
-#define IS_LONG_ALIGNED(a)	((((unsigned long)(a)) & 1) == 0)
-
-/****************************************************************************/
-
 INLINE static void 
 __memcpy(unsigned char * to,unsigned char * from,size_t len)
 {
@@ -322,8 +324,16 @@ __memcpy(unsigned char * to,unsigned char * from,size_t len)
 
 /****************************************************************************/
 
+/* This is ugly: GCC 2.95.x assumes that 'unsigned long' is used in the built-in
+   memcmp/memcpy/memset functions instead of 'size_t'. This can produce warnings
+   where none are necessary. */
+#if defined(__GNUC__) && (__GNUC__ < 3)
+void *
+memcpy(void *dst, const void *src, unsigned long len)
+#else
 void *
 memcpy(void *dst, const void *src, size_t len)
+#endif /* __GNUC__ && __GNUC__ < 3 */
 {
 	void * result = dst;
 

library/string_memmove.c

@@ -1,5 +1,5 @@
 /*
- * $Id: string_memmove.c,v 1.1.1.1 2004-07-26 16:32:16 obarthel Exp $
+ * $Id: string_memmove.c,v 1.2 2004-08-14 11:11:01 obarthel Exp $
  *
  * :ts=4
  *
@@ -351,12 +351,6 @@ memmove(void *dest, const void * src, size_t len)
 
 /****************************************************************************/
 
-#define IS_UNALIGNED(a) 	((((unsigned long)(a)) & 1) != 0)
-#define IS_SHORT_ALIGNED(a)	((((unsigned long)(a)) & 3) == 2)
-#define IS_LONG_ALIGNED(a)	((((unsigned long)(a)) & 1) == 0)
-
-/****************************************************************************/
-
 INLINE static void
 __memmove(unsigned char * to,unsigned char * from,size_t len)
 {

library/string_memset.c

@@ -1,5 +1,5 @@
 /*
- * $Id: string_memset.c,v 1.1.1.1 2004-07-26 16:32:17 obarthel Exp $
+ * $Id: string_memset.c,v 1.3 2004-08-14 11:11:01 obarthel Exp $
  *
  * :ts=4
  *
@@ -43,12 +43,6 @@
 
 /****************************************************************************/
 
-#define IS_UNALIGNED(a) 	((((unsigned long)(a)) & 1) != 0)
-#define IS_SHORT_ALIGNED(a)	((((unsigned long)(a)) & 3) == 2)
-#define IS_LONG_ALIGNED(a)	((((unsigned long)(a)) & 1) == 0)
-
-/****************************************************************************/
-
 INLINE static void
 __memset(unsigned char * to,unsigned char value,size_t len)
 {
@@ -132,8 +126,16 @@ __memset(unsigned char * to,unsigned char value,size_t len)
 
 /****************************************************************************/
 
+/* This is ugly: GCC 2.95.x assumes that 'unsigned long' is used in the built-in
+   memcmp/memcpy/memset functions instead of 'size_t'. This can produce warnings
+   where none are necessary. */
+#if defined(__GNUC__) && (__GNUC__ < 3)
+void *
+memset(void *ptr, int val, unsigned long len)
+#else
 void *
 memset(void *ptr, int val, size_t len)
+#endif /* __GNUC__ && __GNUC__ < 3 */
 {
 	void * result = ptr;
 	unsigned char * m = ptr;

library/unix.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	169
-#define DATE		"8.8.2004"
-#define VERS		"unix.lib 1.169"
-#define VSTRING		"unix.lib 1.169 (8.8.2004)\r\n"
-#define VERSTAG		"\0$VER: unix.lib 1.169 (8.8.2004)"
+#define REVISION	171
+#define DATE		"16.8.2004"
+#define VERS		"unix.lib 1.171"
+#define VSTRING		"unix.lib 1.171 (16.8.2004)\r\n"
+#define VERSTAG		"\0$VER: unix.lib 1.171 (16.8.2004)"

library/unix.lib_rev.rev

@@ -1 +1 @@
-169
+171