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

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

library/GNUmakefile.68k

@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.68k,v 1.5 2004-08-14 08:54:25 obarthel Exp $
+# $Id: GNUmakefile.68k,v 1.9 2004-09-20 17:16:06 obarthel Exp $
 #
 # :ts=8
 #
@@ -144,6 +144,7 @@ C_LIB = \
 	fcntl_open.o \
 	fcntl_read.o \
 	fcntl_write.o \
+	fcntl_get_default_file.o \
 	libgen_basename.o \
 	libgen_dirname.o \
 	locale_data.o \
@@ -306,6 +307,8 @@ C_LIB = \
 	stdlib_startup.o \
 	stdlib_strtol.o \
 	stdlib_strtoul.o \
+	stdlib_strtoll.o \
+	stdlib_strtoull.o \
 	stdlib_swapstack.o \
 	stdlib_sysbase.o \
 	stdlib_system.o \
@@ -395,6 +398,7 @@ UNIX_LIB = \
 	fcntl_creat.o \
 	fcntl_fcntl.o \
 	fcntl_open.o \
+	fcntl_get_default_file.o \
 	mount_convertinfo.o \
 	mount_statfs.o \
 	stat_chmod.o \
@@ -452,6 +456,7 @@ MATH_LIB = \
 	math_floor.o \
 	math_fmod.o \
 	math_frexp.o \
+	math_hypot.o \
 	math_init_exit.o \
 	math_isinf.o \
 	math_isnan.o \

library/GNUmakefile.os4

@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.os4,v 1.4 2004-08-12 12:31:15 obarthel Exp $
+# $Id: GNUmakefile.os4,v 1.8 2004-09-27 15:04:51 tfrieden Exp $
 #
 # :ts=8
 #
@@ -65,7 +65,7 @@ $(LIBUNIX_OBJS)/%.o : %.c
 
 $(LIBM_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):m]"
-	@$(CC) -o $(LIBM_OBJS)/$*.o -c $(CFLAGS) -DPPC_FLOATING_POINT_SUPPORT $<
+	@$(CC) -o $(LIBM_OBJS)/$*.o -c $(CFLAGS)  $<
 
 $(LIBSTACK_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):stack]"
@@ -86,11 +86,15 @@ $(LIBAMIGA_OBJS)/%.o : %.c
 ##############################################################################
 
 ifeq (small_data,$(TYPE))
-CODE_TYPE := -msdata=sysv -DSMALL_DATA
+CODE_TYPE := -msdata=sysv -DSMALL_DATA -DPPC_FLOATING_POINT_SUPPORT
 endif
 
 ifeq (large_data,$(TYPE))
-CODE_TYPE := -msdata=data
+CODE_TYPE := -msdata=data -DPPC_FLOATING_POINT_SUPPORT
+endif
+
+ifeq (large_data_softfloat, $(TYPE))
+CODE_TYPE := -msdata=data -msoft-float
 endif
 
 ##############################################################################
@@ -138,6 +142,7 @@ C_LIB = \
 	fcntl_open.o \
 	fcntl_read.o \
 	fcntl_write.o \
+	fcntl_get_default_file.o \
 	libgen_basename.o \
 	libgen_dirname.o \
 	locale_data.o \
@@ -301,6 +306,8 @@ C_LIB = \
 	stdlib_startup.o \
 	stdlib_strtol.o \
 	stdlib_strtoul.o \
+	stdlib_strtoll.o \
+	stdlib_strtoull.o \
 	stdlib_swapstack.o \
 	stdlib_system.o \
 	stdlib_termination_message.o \
@@ -387,6 +394,7 @@ UNIX_LIB = \
 	fcntl_creat.o \
 	fcntl_fcntl.o \
 	fcntl_open.o \
+	fcntl_get_default_file.o \
 	mount_convertinfo.o \
 	mount_statfs.o \
 	stat_chmod.o \
@@ -444,6 +452,7 @@ MATH_LIB = \
 	math_floor.o \
 	math_fmod.o \
 	math_frexp.o \
+	math_hypot.o \
 	math_init_exit.o \
 	math_isnan.o \
 	math_isinf.o \
@@ -679,7 +688,12 @@ all: \
 	lib/crtbegin.o \
 	lib/crtend.o \
 	lib/mainnb.o \
-	lib/libm.a
+	lib/libm.a \
+	lib/small-data/libm.a \
+	lib/bcrt0.o \
+	lib/bcrtbegin.o \
+	lib/bcrtend.o \
+	lib/soft-float/libc.a
 
 copy:
 	$(COPY) $(foreach file,$(LIBS),large_data/$(file)) lib
@@ -734,6 +748,12 @@ endif
 lib:
 	-$(MAKEDIR) $@
 
+lib/small-data:
+	-$(MAKEDIR) $@
+
+lib/soft-float:
+	-$(MAKEDIR) $@
+
 lib/libm.a: lib
 	$(MAKE) TYPE=large_data kitchen_sink
 	$(COPY) $(foreach file,$(LIBS),large_data/$(file)) lib
@@ -742,6 +762,10 @@ lib/small-data/libm.a: lib lib/small-data
 	$(MAKE) TYPE=small_data kitchen_sink
 	$(COPY) $(foreach file,$(LIBS),small_data/$(file)) lib/small-data
 
+lib/soft-float/libc.a: lib lib/soft-float
+	$(MAKE) TYPE=large_data_softfloat kitchen_sink
+	$(COPY) $(foreach file,$(LIBS),large_data_softfloat/$(file)) lib/soft-float
+
 lib/crt0.o : lib crt0.o
 	$(COPY) crt0.o lib
 
@@ -757,6 +781,15 @@ lib/mainnb.o : lib mainnb.o
 lib/mainb.o : lib mainb.o
 	$(COPY) mainb.o lib
 
+lib/bcrt0.o : lib bcrt0.o
+	$(COPY) bcrt0.o lib
+
+lib/bcrtbegin.o : lib bcrtbegin.o
+	$(COPY) bcrtbegin.o lib
+
+lib/bcrtend.o : lib bcrtend.o
+	$(COPY) bcrtend.o lib
+	
 ##############################################################################
 
 $(LIBAMIGA_OBJS)/amiga_hookentry.o : amiga_hookentry.c
@@ -877,6 +910,13 @@ mainb.o : stdlib_main.c
 	@echo "Compiling $<"
 	@$(CC) -o mainb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA stdlib_main.c
 
+bcrtbegin.o : crtbegin.c
+	$(CC) -o bcrtbegin.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA crtbegin.c 
+
+bcrtend.o : crtend.c
+	$(CC) -o bcrtend.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA crtend.c 
+
+
 ##############################################################################
 
 mkid:

library/amiga.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	170
+#define REVISION	176
-#define DATE		"14.8.2004"
+#define DATE		"27.9.2004"
-#define VERS		"amiga.lib 1.170"
+#define VERS		"amiga.lib 1.176"
-#define VSTRING		"amiga.lib 1.170 (14.8.2004)\r\n"
+#define VSTRING		"amiga.lib 1.176 (27.9.2004)\r\n"
-#define VERSTAG		"\0$VER: amiga.lib 1.170 (14.8.2004)"
+#define VERSTAG		"\0$VER: amiga.lib 1.176 (27.9.2004)"

library/amiga.lib_rev.rev

@@ -1 +1 @@
-170
+176

library/c.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	170
+#define REVISION	176
-#define DATE		"14.8.2004"
+#define DATE		"27.9.2004"
-#define VERS		"c.lib 1.170"
+#define VERS		"c.lib 1.176"
-#define VSTRING		"c.lib 1.170 (14.8.2004)\r\n"
+#define VSTRING		"c.lib 1.176 (27.9.2004)\r\n"
-#define VERSTAG		"\0$VER: c.lib 1.170 (14.8.2004)"
+#define VERSTAG		"\0$VER: c.lib 1.176 (27.9.2004)"

library/c.lib_rev.rev

@@ -1 +1 @@
-170
+176

library/debug.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	170
+#define REVISION	176
-#define DATE		"14.8.2004"
+#define DATE		"27.9.2004"
-#define VERS		"debug.lib 1.170"
+#define VERS		"debug.lib 1.176"
-#define VSTRING		"debug.lib 1.170 (14.8.2004)\r\n"
+#define VSTRING		"debug.lib 1.176 (27.9.2004)\r\n"
-#define VERSTAG		"\0$VER: debug.lib 1.170 (14.8.2004)"
+#define VERSTAG		"\0$VER: debug.lib 1.176 (27.9.2004)"

library/debug.lib_rev.rev

@@ -1 +1 @@
-170
+176

library/fcntl_get_default_file.c

@@ -0,0 +1,69 @@
+/*
+ * $Id: fcntl_get_default_file.c,v 1.1 2004-08-25 15:27:27 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.
+ */
+
+#ifndef _FCNTL_HEADERS_H
+#include "fcntl_headers.h"
+#endif /* _FCNTL_HEADERS_H */
+
+/****************************************************************************/
+
+/* The following is not part of the ISO 'C' (1994) standard. */
+
+/****************************************************************************/
+
+int
+__get_default_file(int file_descriptor,long * file_ptr)
+{
+	struct fd * fd;
+	int result = -1;
+
+	assert( file_descriptor >= 0 && file_descriptor < __num_fd );
+	assert( __fd[file_descriptor] != NULL );
+	assert( FLAG_IS_SET(__fd[file_descriptor]->fd_Flags,FDF_IN_USE) );
+	assert( file_ptr != NULL );
+
+	fd = __get_file_descriptor(file_descriptor);
+	if(fd == NULL)
+	{
+		errno = EBADF;
+		goto out;
+	}
+
+	(*file_ptr) = (long)fd->fd_DefaultFile;
+
+	result = 0;
+
+ out:
+
+	return(result);
+}

library/include/assert.h

@@ -1,5 +1,5 @@
 /*
- * $Id: assert.h,v 1.1.1.1 2004-07-26 16:32:49 obarthel Exp $
+ * $Id: assert.h,v 1.2 2004-08-25 15:27:28 obarthel Exp $
  *
  * :ts=4
  *
@@ -36,6 +36,12 @@
 
 /****************************************************************************/
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/****************************************************************************/
+
 #ifndef assert
 
 /****************************************************************************/
@@ -67,4 +73,10 @@ extern void __assertion_failure(const char *file_name,int line_number,const char
 
 /****************************************************************************/
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+/****************************************************************************/
+
 #endif /* _ASSERT_H */

library/include/dos.h

@@ -1,5 +1,5 @@
 /*
- * $Id: dos.h,v 1.2 2004-08-07 09:15:33 obarthel Exp $
+ * $Id: dos.h,v 1.3 2004-08-25 15:27:28 obarthel Exp $
  *
  * :ts=4
  *
@@ -112,6 +112,18 @@ extern void __set_a4(unsigned long value);
 
 /****************************************************************************/
 
+/*
+ * Obtain the low level 'file' handle or socket ID bound to a file
+ * descriptor. This function returns 0 for success and non-zero
+ * otherwise (if, for example, the file descriptor value you
+ * provided is not valid; errno will be set to the appropriate
+ * error code, too). Put a pointer to the file handle variable you
+ * want to be filled in into the second parameter to this function.
+ */
+extern int __get_default_file(int file_descriptor,long * file_ptr);
+
+/****************************************************************************/
+
 /*
  * This will be set to TRUE if the current program was launched from
  * the internet superserver ('inetd') or an equivalent facility.

library/include/limits.h

@@ -1,5 +1,5 @@
 /*
- * $Id: limits.h,v 1.2 2004-08-07 09:15:33 obarthel Exp $
+ * $Id: limits.h,v 1.3 2004-09-20 17:16:07 obarthel Exp $
  *
  * :ts=4
  *
@@ -58,6 +58,12 @@
 
 /****************************************************************************/
 
+#define	LLONG_MIN	(-0x7fffffffffffffffLL-1)
+#define	LLONG_MAX	0x7fffffffffffffffLL
+#define	ULLONG_MAX	0xffffffffffffffffULL
+
+/****************************************************************************/
+
 #define PATH_MAX 1024
 
 /****************************************************************************/

library/include/math.h

@@ -1,5 +1,5 @@
 /*
- * $Id: math.h,v 1.3 2004-08-12 12:31:29 obarthel Exp $
+ * $Id: math.h,v 1.4 2004-08-16 09:33:13 obarthel Exp $
  *
  * :ts=4
  *
@@ -90,6 +90,7 @@ 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/include/stdarg.h

@@ -1,5 +1,5 @@
 /*
- * $Id: stdarg.h,v 1.1.1.1 2004-07-26 16:32:53 obarthel Exp $
+ * $Id: stdarg.h,v 1.2 2004-09-09 08:25:30 obarthel Exp $
  *
  * :ts=4
  *
@@ -57,12 +57,25 @@ typedef char * va_list;
 /****************************************************************************/
 
 #else
- #if defined(__GNUC__)
+
-  #undef _STDARG_H
+/****************************************************************************/
-  #include_next "stdarg.h"
+
- #else
+#if defined(__GNUC__)
-  #error "Unknown compiler"
+
- #endif /* __GNUC__ */
+/* Use the compiler supplied, machine specific <stdarg.h> file. */
+#undef _STDARG_H
+#include_next "stdarg.h"
+
+#include <sys/amigaos-va.h>
+
+#else
+
+#error "Unknown compiler"
+
+#endif /* __GNUC__ */
+
+/****************************************************************************/
+
 #endif /* __amigaos4__ */
 
 /****************************************************************************/

library/include/stdio.h

@@ -1,5 +1,5 @@
 /*
- * $Id: stdio.h,v 1.2 2004-08-07 09:15:33 obarthel Exp $
+ * $Id: stdio.h,v 1.3 2004-08-25 15:27:28 obarthel Exp $
  *
  * :ts=4
  *
@@ -62,7 +62,7 @@ extern "C" {
  * correspond to a real limitation for this 'C' runtime library and is
  * included solely for ISO 'C' (1994) compliance.
  */
-#define FOPEN_MAX 8
+#define FOPEN_MAX 64
 
 /****************************************************************************/
 

library/include/stdlib.h

@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib.h,v 1.2 2004-08-07 09:15:33 obarthel Exp $
+ * $Id: stdlib.h,v 1.3 2004-09-20 17:16:07 obarthel Exp $
  *
  * :ts=4
  *
@@ -151,6 +151,11 @@ extern long atol(const char *str);
 
 /****************************************************************************/
 
+extern long long strtoll(const char *str, char **ptr, int base);
+extern unsigned long long strtoull(const char *str, char **ptr, int base);
+
+/****************************************************************************/
+
 #if defined(__GNUC__)
  #if defined(alloca)
   #undef alloca

library/include/sys/time.h

@@ -1,5 +1,5 @@
 /*
- * $Id: time.h,v 1.2 2004-08-07 09:15:33 obarthel Exp $
+ * $Id: time.h,v 1.6 2004-09-10 07:39:20 obarthel Exp $
  *
  * :ts=4
  *
@@ -52,7 +52,7 @@ extern "C" {
    structure and try to get by with this definition. Sometimes it works,
    sometimes it doesn't. Not sure if there really is a good solution for
    this problem... */
-#ifndef DEVICES_TIMER_H
+#if !defined(__TIMEVAL_ALREADY_DEFINED) && !defined(__USE_CLIB2_TIMEVAL)
 
 /****************************************************************************/
 
@@ -73,11 +73,23 @@ extern "C" {
 /****************************************************************************/
 
 /* This will define the 'struct timeval' */
+#ifndef DEVICES_TIMER_H
 #include <devices/timer.h>
+#endif /* DEVICES_TIMER_H */
 
 /****************************************************************************/
 
-#else
+#endif /* INCLUDE_VERSION */
+
+/****************************************************************************/
+
+#endif /* !__TIMEVAL_ALREADY_DEFINED && !__USE_CLIB2_TIMEVAL */
+
+/****************************************************************************/
+
+/* If the timeval is still undefined or should be defined locally,
+   define our own now... */
+#if !defined(__TIMEVAL_ALREADY_DEFINED)
 
 /****************************************************************************/
 
@@ -94,11 +106,7 @@ struct timeval
 
 /****************************************************************************/
 
-#endif /* INCLUDE_VERSION */
+#endif /* !__TIMEVAL_ALREADY_DEFINED */
-
-/****************************************************************************/
-
-#endif /* DEVICES_TIMER_H */
 
 /****************************************************************************/
 

library/m.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	170
+#define REVISION	176
-#define DATE		"14.8.2004"
+#define DATE		"27.9.2004"
-#define VERS		"m.lib 1.170"
+#define VERS		"m.lib 1.176"
-#define VSTRING		"m.lib 1.170 (14.8.2004)\r\n"
+#define VSTRING		"m.lib 1.176 (27.9.2004)\r\n"
-#define VERSTAG		"\0$VER: m.lib 1.170 (14.8.2004)"
+#define VERSTAG		"\0$VER: m.lib 1.176 (27.9.2004)"

library/m.lib_rev.rev

@@ -1 +1 @@
-170
+176

library/m881.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	170
+#define REVISION	176
-#define DATE		"14.8.2004"
+#define DATE		"27.9.2004"
-#define VERS		"m881.lib 1.170"
+#define VERS		"m881.lib 1.176"
-#define VSTRING		"m881.lib 1.170 (14.8.2004)\r\n"
+#define VSTRING		"m881.lib 1.176 (27.9.2004)\r\n"
-#define VERSTAG		"\0$VER: m881.lib 1.170 (14.8.2004)"
+#define VERSTAG		"\0$VER: m881.lib 1.176 (27.9.2004)"

library/m881.lib_rev.rev

@@ -1 +1 @@
-170
+176

library/math_acos.c

@@ -1,5 +1,5 @@
 /*
- * $Id: math_acos.c,v 1.1.1.1 2004-07-26 16:30:37 obarthel Exp $
+ * $Id: math_acos.c,v 1.2 2004-08-21 18:57:40 obarthel Exp $
  *
  * :ts=4
  *
@@ -226,7 +226,7 @@ acos(double x)
 	}
 	else
 	{
-		result = HUGE_VAL;
+		result = 0;
 		errno = EDOM;
 	}
 

library/math_asin.c

@@ -1,5 +1,5 @@
 /*
- * $Id: math_asin.c,v 1.1.1.1 2004-07-26 16:30:38 obarthel Exp $
+ * $Id: math_asin.c,v 1.2 2004-08-21 18:57:40 obarthel Exp $
  *
  * :ts=4
  *
@@ -237,7 +237,7 @@ asin(double x)
 	}
 	else
 	{
-		result = HUGE_VAL;
+		result = 0;
 		errno = EDOM;
 	}
 

library/math_atan2.c

@@ -1,5 +1,5 @@
 /*
- * $Id: math_atan2.c,v 1.1.1.1 2004-07-26 16:30:39 obarthel Exp $
+ * $Id: math_atan2.c,v 1.3 2004-08-27 11:40:49 obarthel Exp $
  *
  * :ts=4
  *
@@ -63,7 +63,7 @@ extern double __atan(double x);
 /****************************************************************************/
 
 INLINE static const double
-__atan2(double x,double y)
+__atan2(double y,double x)
 {
 	const double pi = 3.14159265358979323846;
 	const double pi_over_2 = pi / 2.0;
@@ -107,7 +107,7 @@ __atan2(double x,double y)
 			}
 			else
 			{
-				result = HUGE_VAL;
+				result = 0;
 				errno = EDOM;
 			}
 		}
@@ -135,7 +135,7 @@ __atan(double x)
 }
 
 INLINE static const double
-__atan2(double x,double y)
+__atan2(double y,double x)
 {
 	double pi,pi_over_2;
 	double result;
@@ -186,7 +186,7 @@ __atan2(double x,double y)
 			}
 			else
 			{
-				result = HUGE_VAL;
+				result = 0;
 				errno = EDOM;
 			}
 		}
@@ -201,9 +201,6 @@ __atan2(double x,double y)
 
 #if defined(PPC_FLOATING_POINT_SUPPORT)
 
-
-
-
 static const double 
 tiny  = 1.0e-300,
 zero  = 0.0,
@@ -213,7 +210,7 @@ pi      = 3.1415926535897931160E+00, /* 0x400921FB, 0x54442D18 */
 pi_lo   = 1.2246467991473531772E-16; /* 0x3CA1A626, 0x33145C07 */
 
 INLINE static const double
-__atan2(double x,double y)
+__atan2(double y,double x)
 {
 	double z;
 	int k,m,hx,hy,ix,iy;
@@ -322,19 +319,11 @@ __atan2(double x,double y)
 /****************************************************************************/
 
 double
-atan2(double x,double y)
+atan2(double y,double x)
 {
 	double result;
 
-	if(x != 0.0 && y != 0.0)
+	result = __atan2(y,x);
-	{
-		result = __atan2(x,y);
-	}
-	else
-	{
-		result = HUGE_VAL;
-		errno = EDOM;
-	}
 
 	return(result);
 }

library/math_data.c

@@ -1,5 +1,5 @@
 /*
- * $Id: math_data.c,v 1.1.1.1 2004-07-26 16:30:40 obarthel Exp $
+ * $Id: math_data.c,v 1.2 2004-08-21 18:57:40 obarthel Exp $
  *
  * :ts=4
  *
@@ -48,3 +48,5 @@ struct Library * MathIeeeDoubTransBase;
 /****************************************************************************/
 
 double __huge_val;
+double __not_a_number;
+double __infinity;

library/math_exp.c

@@ -1,5 +1,5 @@
 /*
- * $Id: math_exp.c,v 1.1.1.1 2004-07-26 16:30:41 obarthel Exp $
+ * $Id: math_exp.c,v 1.2 2004-08-27 11:40:49 obarthel Exp $
  *
  * :ts=4
  *
@@ -194,7 +194,7 @@ __exp(double x)
 	    } 
 		else 
 		{
-			k  = invln2*x+halF[xsb];
+			k  = (int)(invln2*x+halF[xsb]);
 			t  = k;
 			hi = x - t*ln2HI[0];	/* t*ln2HI is exact here */
 			lo = t*ln2LO[0];

library/math_fabs.c

@@ -1,5 +1,5 @@
 /*
- * $Id: math_fabs.c,v 1.1.1.1 2004-07-26 16:30:42 obarthel Exp $
+ * $Id: math_fabs.c,v 1.2 2004-09-27 15:06:16 tfrieden Exp $
  *
  * :ts=4
  *
@@ -141,6 +141,17 @@ __fabs(double x)
 
 }
 
+#else
+
+INLINE static const double
+__fabs(double x)
+{
+	if (x > 0)
+		return x;
+	else
+		return -x;
+}
+
 #endif /* PPC_FLOATING_POINT_SUPPORT */
 
 /****************************************************************************/

library/math_fmod.c

@@ -1,5 +1,5 @@
 /*
- * $Id: math_fmod.c,v 1.1.1.1 2004-07-26 16:30:44 obarthel Exp $
+ * $Id: math_fmod.c,v 1.2 2004-08-21 18:57:40 obarthel Exp $
  *
  * :ts=4
  *
@@ -284,7 +284,7 @@ fmod(double x,double y)
 	}
 	else
 	{
-		result = HUGE_VAL;
+		result = x;
 		errno = EDOM;
 	}
 

library/math_headers.h

@@ -1,5 +1,5 @@
 /*
- * $Id: math_headers.h,v 1.2 2004-08-12 12:31:16 obarthel Exp $
+ * $Id: math_headers.h,v 1.4 2004-08-27 13:49:17 obarthel Exp $
  *
  * :ts=4
  *
@@ -148,6 +148,33 @@ do {												\
   (d) = sl_u.value;									\
 } while (0)
 
+/* A union which permits us to convert between a float and a 32 bit
+   int. */
+
+typedef union
+{
+  float value;
+  unsigned int word;
+} ieee_float_shape_type;
+
+/* Get a 32 bit int from a float.  */
+
+#define GET_FLOAT_WORD(i,d)		\
+do {							\
+  ieee_float_shape_type gf_u;	\
+  gf_u.value = (d);				\
+  (i) = gf_u.word;				\
+} while (0)
+
+/* Set a float from a 32 bit int.  */
+
+#define SET_FLOAT_WORD(d,i)		\
+do {							\
+  ieee_float_shape_type sf_u;	\
+  sf_u.word = (i);				\
+  (d) = sf_u.value;				\
+} while (0)
+
 extern double __kernel_cos(double x, double y);
 extern double __kernel_sin(double x, double y, int iy);
 extern int __rem_pio2(double x, double *y);
@@ -165,4 +192,9 @@ extern double __scalbn(double x, int n);
 
 /****************************************************************************/
 
+extern double __not_a_number;
+extern double __infinity;
+
+/****************************************************************************/
+
 #endif /* _MATH_HEADERS_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_init_exit.c

@@ -1,5 +1,5 @@
 /*
- * $Id: math_init_exit.c,v 1.2 2004-08-08 10:55:57 obarthel Exp $
+ * $Id: math_init_exit.c,v 1.3 2004-08-21 18:57:40 obarthel Exp $
  *
  * :ts=4
  *
@@ -130,9 +130,23 @@ __math_init(void)
 			0x7f7fffff
 		};
 
+		static const unsigned long not_a_number[1] =
+		{
+			/* Exponent = 255 and fraction != 0.0 */
+			0x7fffffff
+		};
+
+		static const unsigned long infinity[1] =
+		{
+			/* Exponent = 255 and fraction = 0.0 */
+			0x7f800000
+		};
+
 		assert( sizeof(largest_fp_value) == sizeof(__huge_val) );
 
 		memmove((void *)&__huge_val,largest_fp_value,sizeof(largest_fp_value));
+		memmove((void *)&__not_a_number,not_a_number,sizeof(not_a_number));
+		memmove((void *)&__infinity,infinity,sizeof(infinity));
 	}
 	else if (sizeof(__huge_val) == 8) /* double precision */
 	{
@@ -142,9 +156,23 @@ __math_init(void)
 			0x7fefffff,0xffffffff
 		};
 
+		static const unsigned long not_a_number[2] =
+		{
+			/* Exponent = 2047 and fraction != 0.0 */
+			0x7fffffff,0xffffffff
+		};
+
+		static const unsigned long infinity[2] =
+		{
+			/* Exponent = 2047 and fraction = 0.0 */
+			0x7ff00000,0x00000000
+		};
+
 		assert( sizeof(largest_fp_value) == sizeof(__huge_val) );
 
 		memmove((void *)&__huge_val,largest_fp_value,sizeof(largest_fp_value));
+		memmove((void *)&__not_a_number,not_a_number,sizeof(not_a_number));
+		memmove((void *)&__infinity,infinity,sizeof(infinity));
 	}
 #if defined(USE_LONG_DOUBLE)
 	else if (sizeof(__huge_val) == 12) /* extended precision */
@@ -155,9 +183,23 @@ __math_init(void)
 			0x7ffe0000,0xffffffff,0xffffffff
 		};
 
+		static const unsigned long not_a_number[3] =
+		{
+			/* Exponent = 32767 and fraction != 0.0 */
+			0x7fff0000,0xffffffff,0xffffffff
+		};
+
+		static const unsigned long infinity[3] =
+		{
+			/* Exponent = 32767 and fraction = 0.0 */
+			0x7fff0000,0x00000000,0x00000000
+		};
+
 		assert( sizeof(largest_fp_value) == sizeof(__huge_val) );
 
 		memmove((void *)&__huge_val,largest_fp_value,sizeof(largest_fp_value));
+		memmove((void *)&__not_a_number,not_a_number,sizeof(not_a_number));
+		memmove((void *)&__infinity,infinity,sizeof(infinity));
 	}
 #endif /* USE_LONG_DOUBLE */
 

library/math_kernel_tan.c

@@ -1,5 +1,5 @@
 /*
- * $Id: math_kernel_tan.c,v 1.1.1.1 2004-07-26 16:30:48 obarthel Exp $
+ * $Id: math_kernel_tan.c,v 1.2 2004-08-27 11:40:49 obarthel Exp $
  *
  * :ts=4
  *
@@ -82,7 +82,21 @@ double __kernel_tan(double x, double y, int iy)
 			unsigned int low;
 			GET_LOW_WORD(low,x);
 			if(((ix|low)|(iy+1))==0) return one/fabs(x);
-			else return (iy==1)? x: -one/x;
+			else {
+				if (iy == 1)
+					return x;
+				else {	/* compute -1 / (x+y) carefully */
+					double a, t;
+
+					z = w = x + y;
+					SET_LOW_WORD(z,0);
+					v = y - (z - x);
+					t = a = -one / w;
+					SET_LOW_WORD(t,0);
+					s = one + t * z;
+					return t + a * (s + t * v);
+				}
+			}
 		}
 	}
 	if(ix>=0x3FE59428) { 			/* |x|>=0.6744 */

library/math_log.c

@@ -1,5 +1,5 @@
 /*
- * $Id: math_log.c,v 1.1.1.1 2004-07-26 16:30:49 obarthel Exp $
+ * $Id: math_log.c,v 1.2 2004-09-27 15:06:19 tfrieden Exp $
  *
  * :ts=4
  *
@@ -135,7 +135,7 @@ __log(double x)
 
 /****************************************************************************/
 
-#if defined(PPC_FLOATING_POINT_SUPPORT)
+#if defined(__PPC__)
 
 static const double
 ln2_hi  =  6.93147180369123816490e-01,	/* 3fe62e42 fee00000 */

library/math_logb.c

@@ -1,5 +1,5 @@
 /*
- * $Id: math_logb.c,v 1.1 2004-08-12 12:31:16 obarthel Exp $
+ * $Id: math_logb.c,v 1.2 2004-08-14 11:11:01 obarthel Exp $
  *
  * :ts=4
  *
@@ -59,7 +59,7 @@ __logb(double x)
 {
 	double result;
 
-	result = log(x) / log(FLT_RADIX);
+	result = log(x) / log((double)FLT_RADIX);
 
 	return(result);
 }

library/math_modf.c

@@ -1,5 +1,5 @@
 /*
- * $Id: math_modf.c,v 1.1.1.1 2004-07-26 16:30:50 obarthel Exp $
+ * $Id: math_modf.c,v 1.2 2004-09-27 15:06:19 tfrieden Exp $
  *
  * :ts=4
  *
@@ -109,7 +109,7 @@ __modf(double x,double *nptr)
 
 /****************************************************************************/
 
-#if defined(PPC_FLOATING_POINT_SUPPORT)
+#if defined(__PPC__)
 
 INLINE static const double
 __modf(double x,double *nptr)

library/math_pow.c

@@ -1,5 +1,5 @@
 /*
- * $Id: math_pow.c,v 1.1.1.1 2004-07-26 16:30:52 obarthel Exp $
+ * $Id: math_pow.c,v 1.3 2004-09-27 15:06:19 tfrieden Exp $
  *
  * :ts=4
  *
@@ -171,7 +171,7 @@ __pow(double x,double y)
 
 /****************************************************************************/
 
-#if defined(PPC_FLOATING_POINT_SUPPORT)
+#if defined(__PPC__)
 
 /****************************************************************************/
 
@@ -286,11 +286,12 @@ __pow(double x,double y)
 	}
     
     /* (x<0)**(non-int) is NaN */
-    /* REDHAT LOCAL: This used to be
+	n = ((unsigned int)hx>>31)+1;
-	   if((((hx>>31)+1)|yisint)==0) return (x-x)/(x-x);
+	if((n|yisint)==0) return (x-x)/(x-x);
-       but ANSI C says a right shift of a signed negative quantity is
+
-       implementation defined.  */
+	s = one; /* s (sign of result -ve**odd) = -1 else = 1 */
-	if(((((unsigned int)hx>>31)-1)|yisint)==0) return (x-x)/(x-x);
+	if((n|(yisint-1))==0)
+		s = -one;/* (-ve)**(odd int) */
 
     /* |y| is huge */
 	if(iy>0x41e00000) { /* if |y| > 2**31 */
@@ -299,11 +300,11 @@ __pow(double x,double y)
 			if(ix>=0x3ff00000) return (hy>0)? huge*huge:tiny*tiny;
 	    }
 		/* over/underflow if x is not close to one */
-	    if(ix<0x3fefffff) return (hy<0)? huge*huge:tiny*tiny;
+	    if(ix<0x3fefffff) return (hy<0)? s*huge*huge:s*tiny*tiny;
-	    if(ix>0x3ff00000) return (hy>0)? huge*huge:tiny*tiny;
+	    if(ix>0x3ff00000) return (hy>0)? s*huge*huge:s*tiny*tiny;
 		/* now |1-x| is tiny <= 2**-20, suffice to compute 
 		   log(x) by x-x^2/2+x^3/3-x^4/4 */
-	    t = ax-1;		/* t has 20 trailing zeros */
+	    t = ax-one;		/* t has 20 trailing zeros */
 	    w = (t*t)*(0.5-t*(0.3333333333333333333333-t*0.25));
 	    u = ivln2_h*t;	/* ivln2_h has 21 sig. bits */
 	    v = t*ivln2_l-w*ivln2;
@@ -311,7 +312,7 @@ __pow(double x,double y)
 	    SET_LOW_WORD(t1,0);
 	    t2 = v-(t1-u);
 	} else {
-	    double s2,s_h,s_l,t_h,t_l;
+	    double ss,s2,s_h,s_l,t_h,t_l;
 	    n = 0;
 		/* take care subnormal number */
 	    if(ix<0x00100000)
@@ -325,11 +326,11 @@ __pow(double x,double y)
 	    else {k=0;n+=1;ix -= 0x00100000;}
 	    SET_HIGH_WORD(ax,ix);
 
-		/* compute s = s_h+s_l = (x-1)/(x+1) or (x-1.5)/(x+1.5) */
+		/* compute ss = s_h+s_l = (x-1)/(x+1) or (x-1.5)/(x+1.5) */
 	    u = ax-bp[k];		/* bp[0]=1.0, bp[1]=1.5 */
 	    v = one/(ax+bp[k]);
-	    s = u*v;
+	    ss = u*v;
-	    s_h = s;
+	    s_h = ss;
 	    SET_LOW_WORD(s_h,0);
 		/* t_h=ax+bp[k] High */
 	    t_h = zero;
@@ -337,33 +338,29 @@ __pow(double x,double y)
 	    t_l = ax - (t_h-bp[k]);
 	    s_l = v*((u-s_h*t_h)-s_h*t_l);
 		/* compute log(ax) */
-	    s2 = s*s;
+	    s2 = ss*ss;
 	    r = s2*s2*(L1+s2*(L2+s2*(L3+s2*(L4+s2*(L5+s2*L6)))));
-	    r += s_l*(s_h+s);
+	    r += s_l*(s_h+ss);
 	    s2  = s_h*s_h;
 	    t_h = 3.0+s2+r;
 	    SET_LOW_WORD(t_h,0);
 	    t_l = r-((t_h-3.0)-s2);
-		/* u+v = s*(1+...) */
+		/* u+v = ss*(1+...) */
 	    u = s_h*t_h;
-	    v = s_l*t_h+t_l*s;
+	    v = s_l*t_h+t_l*ss;
-		/* 2/(3log2)*(s+...) */
+		/* 2/(3log2)*(ss+...) */
 	    p_h = u+v;
 	    SET_LOW_WORD(p_h,0);
 	    p_l = v-(p_h-u);
 	    z_h = cp_h*p_h;		/* cp_h+cp_l = 2/(3*log2) */
 	    z_l = cp_l*p_h+p_l*cp+dp_l[k];
-		/* log2(ax) = (s+..)*2/(3*log2) = n + dp_h + z_h + z_l */
+		/* log2(ax) = (ss+..)*2/(3*log2) = n + dp_h + z_h + z_l */
 	    t = (double)n;
 	    t1 = (((z_h+z_l)+dp_h[k])+t);
 	    SET_LOW_WORD(t1,0);
 	    t2 = z_l-(((t1-t)-dp_h[k])-z_h);
 	}
 
-	s = one; /* s (sign of result -ve**odd) = -1 else = 1 */
-	if(((((unsigned int)hx>>31)-1)|(yisint-1))==0)
-	    s = -one;/* (-ve)**(odd int) */
-
     /* split up y into y1+y2 and compute (y1+y2)*(t1+t2) */
 	y1  = y;
 	SET_LOW_WORD(y1,0);

library/math_rint.c

@@ -1,5 +1,5 @@
 /*
- * $Id: math_rint.c,v 1.2 2004-08-07 09:15:32 obarthel Exp $
+ * $Id: math_rint.c,v 1.3 2004-08-27 13:49:17 obarthel Exp $
  *
  * :ts=4
  *
@@ -54,6 +54,10 @@
 
 /****************************************************************************/
 
+#if defined(IEEE_FLOATING_POINT_SUPPORT) || defined(M68881_FLOATING_POINT_SUPPORT)
+
+/****************************************************************************/
+
 double
 rint(double x)
 {
@@ -62,5 +66,71 @@ rint(double x)
 
 /****************************************************************************/
 
-#endif /* FLOATING_POINT_SUPPORT */
+#endif /* IEEE_FLOATING_POINT_SUPPORT || M68881_FLOATING_POINT_SUPPORT */
 
+/****************************************************************************/
+
+#if defined(PPC_FLOATING_POINT_SUPPORT)
+
+/****************************************************************************/
+
+static const double
+TWO52[2]={
+  4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */
+ -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */
+};
+
+double
+rint(double x)
+{
+	int i0,j0,sx;
+	unsigned i,i1;
+	double w,t;
+	GET_HIGH_WORD(i0,x);
+	sx = (i0>>31)&1;
+	GET_LOW_WORD(i1,x);
+	j0 = ((i0>>20)&0x7ff)-0x3ff;
+	if(j0<20) {
+	    if(j0<0) { 	
+		if(((i0&0x7fffffff)|i1)==0) return x;
+		i1 |= (i0&0x0fffff);
+		i0 &= 0xfffe0000;
+		i0 |= ((i1|-i1)>>12)&0x80000;
+		SET_HIGH_WORD(x,i0);
+	        w = TWO52[sx]+x;
+	        t =  w-TWO52[sx];
+	        GET_HIGH_WORD(i0,t);
+	        SET_HIGH_WORD(t,(i0&0x7fffffff)|(sx<<31));
+	        return t;
+	    } else {
+		i = (0x000fffff)>>j0;
+		if(((i0&i)|i1)==0) return x; /* x is integral */
+		i>>=1;
+		if(((i0&i)|i1)!=0) {
+		    if(j0==19) i1 = 0x40000000; else
+		    i0 = (i0&(~i))|((0x20000)>>j0);
+		}
+	    }
+	} else if (j0>51) {
+	    if(j0==0x400) return x+x;	/* inf or NaN */
+	    else return x;		/* x is integral */
+	} else {
+	    i = ((unsigned)(0xffffffff))>>(j0-20);
+	    if((i1&i)==0) return x;	/* x is integral */
+	    i>>=1;
+	    if((i1&i)!=0) i1 = (i1&(~i))|((0x40000000)>>(j0-20));
+	}
+	
+	SET_HIGH_WORD(x,i0);
+	SET_LOW_WORD(x,i1);
+	w = TWO52[sx]+x;
+	return w-TWO52[sx];
+}
+
+/****************************************************************************/
+
+#endif /* PPC_FLOATING_POINT_SUPPORT */
+
+/****************************************************************************/
+
+#endif /* FLOATING_POINT_SUPPORT */

library/math_rintf.c

@@ -1,5 +1,5 @@
 /*
- * $Id: math_rintf.c,v 1.1 2004-08-07 09:15:32 obarthel Exp $
+ * $Id: math_rintf.c,v 1.2 2004-08-27 13:49:17 obarthel Exp $
  *
  * :ts=4
  *
@@ -54,6 +54,10 @@
 
 /****************************************************************************/
 
+#if defined(IEEE_FLOATING_POINT_SUPPORT) || defined(M68881_FLOATING_POINT_SUPPORT)
+
+/****************************************************************************/
+
 float
 rintf(float x)
 {
@@ -62,5 +66,64 @@ rintf(float x)
 
 /****************************************************************************/
 
-#endif /* FLOATING_POINT_SUPPORT */
+#endif /* IEEE_FLOATING_POINT_SUPPORT || M68881_FLOATING_POINT_SUPPORT */
 
+/****************************************************************************/
+
+#if defined(PPC_FLOATING_POINT_SUPPORT)
+
+/****************************************************************************/
+
+/* Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com. */
+
+/****************************************************************************/
+
+static const float
+TWO23[2]={
+  8.3886080000e+06, /* 0x4b000000 */
+ -8.3886080000e+06, /* 0xcb000000 */
+};
+
+float
+rintf(float x)
+{
+	int i0,j0,sx;
+	unsigned int i,i1;
+	float w,t;
+	GET_FLOAT_WORD(i0,x);
+	sx = (i0>>31)&1;
+	j0 = ((i0>>23)&0xff)-0x7f;
+	if(j0<23) {
+	    if(j0<0) {
+		if((i0&0x7fffffff)==0) return x;
+		i1 = (i0&0x07fffff);
+		i0 &= 0xfff00000;
+		i0 |= ((i1|-i1)>>9)&0x400000;
+		SET_FLOAT_WORD(x,i0);
+	        w = TWO23[sx]+x;
+	        t =  w-TWO23[sx];
+		GET_FLOAT_WORD(i0,t);
+		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
+	        return t;
+	    } else {
+		i = (0x007fffff)>>j0;
+		if((i0&i)==0) return x; /* x is integral */
+		i>>=1;
+		if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0);
+	    }
+	} else {
+	    if(j0==0x80) return x+x;	/* inf or NaN */
+	    else return x;		/* x is integral */
+	}
+	SET_FLOAT_WORD(x,i0);
+	w = TWO23[sx]+x;
+	return w-TWO23[sx];
+}
+
+/****************************************************************************/
+
+#endif /* PPC_FLOATING_POINT_SUPPORT */
+
+/****************************************************************************/
+
+#endif /* FLOATING_POINT_SUPPORT */

library/math_sqrt.c

@@ -1,5 +1,5 @@
 /*
- * $Id: math_sqrt.c,v 1.1.1.1 2004-07-26 16:30:53 obarthel Exp $
+ * $Id: math_sqrt.c,v 1.3 2004-09-27 15:06:19 tfrieden Exp $
  *
  * :ts=4
  *
@@ -135,7 +135,7 @@ __sqrt(double x)
 
 /****************************************************************************/
 
-#if defined(PPC_FLOATING_POINT_SUPPORT)
+#ifdef __PPC__
 
 static	const double	one	= 1.0, tiny=1.0e-300;
 
@@ -236,7 +236,7 @@ __sqrt(double x)
 	return z;
 }
 
-#endif /* PPC_FLOATING_POINT_SUPPORT */
+#endif
 
 /****************************************************************************/
 
@@ -251,7 +251,7 @@ sqrt(double x)
 	}
 	else
 	{
-		result = HUGE_VAL;
+		result = 0;
 		errno = EDOM;
 	}
 

library/net.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	170
+#define REVISION	176
-#define DATE		"14.8.2004"
+#define DATE		"27.9.2004"
-#define VERS		"net.lib 1.170"
+#define VERS		"net.lib 1.176"
-#define VSTRING		"net.lib 1.170 (14.8.2004)\r\n"
+#define VSTRING		"net.lib 1.176 (27.9.2004)\r\n"
-#define VERSTAG		"\0$VER: net.lib 1.170 (14.8.2004)"
+#define VERSTAG		"\0$VER: net.lib 1.176 (27.9.2004)"

library/net.lib_rev.rev

@@ -1 +1 @@
-170
+176

library/smakefile

@@ -1,5 +1,5 @@
 #
-# $Id: smakefile,v 1.5 2004-08-12 12:31:27 obarthel Exp $
+# $Id: smakefile,v 1.8 2004-09-20 17:16:06 obarthel Exp $
 #
 # :ts=8
 #
@@ -163,7 +163,8 @@ FCNTL_OBJ = \
 	fcntl_lseek.o \
 	fcntl_open.o \
 	fcntl_read.o \
-	fcntl_write.o
+	fcntl_write.o \
+	fcntl_get_default_file.o
 
 LIBGEN_OBJ = \
 	libgen_basename.o \
@@ -189,6 +190,7 @@ MATH_OBJ = \
 	math_floor.o \
 	math_fmod.o \
 	math_frexp.o \
+	math_hypot.o \
 	math_init_exit.o \
 	math_isinf.o \
 	math_isnan.o \
@@ -413,6 +415,8 @@ STDLIB_OBJ = \
 	stdlib_strtod.o \
 	stdlib_strtol.o \
 	stdlib_strtoul.o \
+	stdlib_strtoll.o \
+	stdlib_strtoull.o \
 	stdlib_swapstack.o \
 	stdlib_system.o \
 	stdlib_unsetenv.o \

library/stack.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	170
+#define REVISION	176
-#define DATE		"14.8.2004"
+#define DATE		"27.9.2004"
-#define VERS		"stack.lib 1.170"
+#define VERS		"stack.lib 1.176"
-#define VSTRING		"stack.lib 1.170 (14.8.2004)\r\n"
+#define VSTRING		"stack.lib 1.176 (27.9.2004)\r\n"
-#define VERSTAG		"\0$VER: stack.lib 1.170 (14.8.2004)"
+#define VERSTAG		"\0$VER: stack.lib 1.176 (27.9.2004)"

library/stack.lib_rev.rev

@@ -1 +1 @@
-170
+176

library/stdio_puts.c

@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_puts.c,v 1.1.1.1 2004-07-26 16:31:40 obarthel Exp $
+ * $Id: stdio_puts.c,v 1.2 2004-09-10 07:39:19 obarthel Exp $
  *
  * :ts=4
  *
@@ -94,7 +94,7 @@ puts(const char *s)
 
  out:
 
-	/* Note: if buffering is disabled for this stdout, then we still
+	/* Note: if buffering is disabled for this stream, then we still
 	   may have buffered data around, queued to be printed right now.
 	   This is intended to improve performance as it takes more effort
 	   to write a single character to a file than to write a bunch. */

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.5 2004-09-10 07:39:19 obarthel Exp $
  *
  * :ts=4
  *
@@ -262,7 +262,6 @@ vfprintf(FILE * stream,const char * format, va_list arg)
 					if(arg == NULL)
 					{
 						errno = EFAULT;
-						result = EOF;
 						goto out;
 					}
 				}
@@ -344,7 +343,6 @@ vfprintf(FILE * stream,const char * format, va_list arg)
 					if(arg == NULL)
 					{
 						errno = EFAULT;
-						result = EOF;
 						goto out;
 					}
 				}
@@ -566,7 +564,6 @@ vfprintf(FILE * stream,const char * format, va_list arg)
 				if(arg == NULL)
 				{
 					errno = EFAULT;
-					result = EOF;
 					goto out;
 				}
 			}
@@ -623,7 +620,6 @@ vfprintf(FILE * stream,const char * format, va_list arg)
 				if(arg == NULL)
 				{
 					errno = EFAULT;
-					result = EOF;
 					goto out;
 				}
 			}
@@ -635,6 +631,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 +642,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 = ' ';
@@ -1012,7 +1009,6 @@ vfprintf(FILE * stream,const char * format, va_list arg)
 				if(arg == NULL)
 				{
 					errno = EFAULT;
-					result = EOF;
 					goto out;
 				}
 			}
@@ -1167,7 +1163,6 @@ vfprintf(FILE * stream,const char * format, va_list arg)
 				if(arg == NULL)
 				{
 					errno = EFAULT;
-					result = EOF;
 					goto out;
 				}
 			}
@@ -1223,7 +1218,6 @@ vfprintf(FILE * stream,const char * format, va_list arg)
 				if(arg == NULL)
 				{
 					errno = EFAULT;
-					result = EOF;
 					goto out;
 				}
 			}
@@ -1242,7 +1236,6 @@ vfprintf(FILE * stream,const char * format, va_list arg)
 					if(short_ptr == NULL)
 					{
 						errno = EFAULT;
-						result = EOF;
 						goto out;
 					}
 				}
@@ -1267,7 +1260,6 @@ vfprintf(FILE * stream,const char * format, va_list arg)
 							if(int_ptr == NULL)
 							{
 								errno = EFAULT;
-								result = EOF;
 								goto out;
 							}
 						}
@@ -1288,7 +1280,6 @@ vfprintf(FILE * stream,const char * format, va_list arg)
 							if(int_ptr == NULL)
 							{
 								errno = EFAULT;
-								result = EOF;
 								goto out;
 							}
 						}
@@ -1310,7 +1301,6 @@ vfprintf(FILE * stream,const char * format, va_list arg)
 						if(int_ptr == NULL)
 						{
 							errno = EFAULT;
-							result = EOF;
 							goto out;
 						}
 					}
@@ -1523,7 +1513,7 @@ vfprintf(FILE * stream,const char * format, va_list arg)
 	   may have buffered data around, queued to be printed right now.
 	   This is intended to improve performance as it takes more effort
 	   to write a single character to a file than to write a bunch. */
-	if(result > 0 && (iob->iob_Flags & IOBF_BUFFER_MODE) == IOBF_BUFFER_MODE_NONE)
+	if(result != EOF && (iob->iob_Flags & IOBF_BUFFER_MODE) == IOBF_BUFFER_MODE_NONE)
 	{
 		if(__iob_write_buffer_is_valid(iob) && __flush_iob_write_buffer(iob) < 0)
 			result = EOF;

library/stdlib_main.c

@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_main.c,v 1.1.1.1 2004-07-26 16:31:58 obarthel Exp $
+ * $Id: stdlib_main.c,v 1.2 2004-09-18 09:03:30 obarthel Exp $
  *
  * :ts=4
  *
@@ -64,7 +64,10 @@ extern int main(int arg_c,char ** arg_v);
 
 /****************************************************************************/
 
-#if 0
+/* The SAS/C profiling hooks can be used to track call chains. Neat
+   trick, but not always necessary. Don't enable this unless you know
+   what you're doing... */
+#if defined(__USE_SAS_PROFILING_FOR_MONITORING)
 
 /****************************************************************************/
 
@@ -100,7 +103,7 @@ _EPILOG(REG(a0,char * id))
 
 /****************************************************************************/
 
-#endif
+#endif /* __USE_SAS_PROFILING_FOR_MONITORING */
 
 /****************************************************************************/
 
@@ -164,14 +167,25 @@ call_main(void)
 	/* Go through the constructor list */
 	_init();
 
-	//show_profile_names = TRUE;
+	/* If the SAS/C profiling code is set up for printing function
+	   call chains, switch it on now. */
+	#if defined(__USE_SAS_PROFILING_FOR_MONITORING)
+	{
+		show_profile_names = TRUE;
+	}
+	#endif /* __USE_SAS_PROFILING_FOR_MONITORING */
 
 	/* After all these preparations, get this show on the road... */
 	exit(main((int)__argc,(char **)__argv));
 
  out:
 
-	//show_profile_names = FALSE;
+	/* Switch off function name printing, if it was enabled. */
+	#if defined(__USE_SAS_PROFILING_FOR_MONITORING)
+	{
+		show_profile_names = FALSE;
+	}
+	#endif /* __USE_SAS_PROFILING_FOR_MONITORING */
 
 	/* If we end up here with the __stack_overflow variable
 	 * set then the stack overflow handler dropped into
@@ -398,8 +412,9 @@ _main(void)
 			stack_size = (__stack_size + 15UL) & ~15UL;
 
 			/* We allocate a little more memory so that we can align
-			   the stack to a 128 bit boundary. */
+			   the stack to a 128 bit boundary. The extra 20 bytes are
-			stk = AllocVec(sizeof(*stk) + 15 + stack_size,MEMF_PUBLIC|MEMF_ANY);
+			   to mimic the Task stack setup in dos.library/CreateProc. */
+			stk = AllocVec(sizeof(*stk) + 15 + 20 + stack_size,MEMF_PUBLIC|MEMF_ANY);
 			if(stk == NULL)
 				goto out;
 
@@ -410,9 +425,12 @@ _main(void)
 			lower = (((ULONG)(stk+1)) + 15UL) & ~15UL;
 			upper = lower + stack_size;
 
+			/* Fill in the lower and upper bounds, then take care of
+			   the stack pointer itself. This layout mimics the process
+			   creation code in dos.library. */
 			stk->stk_Lower		= (APTR)lower;
-			stk->stk_Upper		= upper;
+			stk->stk_Upper		= upper - 4;
-			stk->stk_Pointer	= (APTR)upper;
+			stk->stk_Pointer	= (APTR)(upper - 20);
 
 			/* If necessary, set up for stack size usage measurement. */
 			__stack_usage_init(stk);

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/stdlib_setjmp.c

@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_setjmp.c,v 1.1.1.1 2004-07-26 16:32:05 obarthel Exp $
+ * $Id: stdlib_setjmp.c,v 1.2 2004-09-27 15:07:20 tfrieden Exp $
  *
  * :ts=4
  *
@@ -283,6 +283,8 @@ l1:	moveml	a0@(4:W),d1-d7				| restore all data registers       \n\
 
 /****************************************************************************/
 
+#ifdef PPC_FLOATING_POINT_SUPPORT
+
 __asm("							\n\
 								\n\
 	.text						\n\
@@ -358,6 +360,48 @@ longjmp:						\n\
 	blr							\n\
 								\n\
 ");
+#else
+__asm("							\n\
+								\n\
+	.text						\n\
+	.align 2					\n\
+								\n\
+	.globl setjmp				\n\
+								\n\
+setjmp:							\n\
+								\n\
+	mflr	r10					\n\
+	mfcr	r11					\n\
+	mr		r12, r1				\n\
+	stmw	r10, 0(r3)			\n\
+	li		r3, 0				\n\
+	blr							\n\
+								\n\
+");
+
+__asm("							\n\
+	.text						\n\
+	.align 2					\n\
+								\n\
+	.globl longjmp				\n\
+								\n\
+longjmp:						\n\
+								\n\
+	lmw		r10,0(r3)			\n\
+	mtlr	r10					\n\
+	mtcr	r11					\n\
+	mr		r1,r12				\n\
+	cmpwi	r4, 0				\n\
+	bne		1f					\n\
+	li		r3,1				\n\
+	blr							\n\
+1:								\n\
+	mr		r3, r4				\n\
+	blr							\n\
+								\n\
+");
+
+#endif /* defined PPC_FLOATING_POINT_SUPPORT */
 
 #endif /* defined STACK_EXTENSION */
 

library/stdlib_strtoll.c

@@ -0,0 +1,204 @@
+/*
+ * $Id: stdlib_strtoll.c,v 1.1 2004-09-20 17:16:06 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.
+ */
+
+#ifndef _STDLIB_NULL_POINTER_CHECK_H
+#include "stdlib_null_pointer_check.h"
+#endif /* _STDLIB_NULL_POINTER_CHECK_H */
+
+/****************************************************************************/
+
+#ifndef _STDLIB_HEADERS_H
+#include "stdlib_headers.h"
+#endif /* _STDLIB_HEADERS_H */
+
+/****************************************************************************/
+
+#if defined(USE_64_BIT_INTS)
+
+/****************************************************************************/
+
+long long
+strtoll(const char *str, char **ptr, int base)
+{
+	BOOL is_negative;
+	long long result = 0;
+	long long new_sum;
+	long long sum;
+	char c;
+
+	ENTER();
+
+	SHOWSTRING(str);
+	SHOWPOINTER(ptr);
+	SHOWVALUE(base);
+
+	assert(str != NULL && base >= 0);
+
+	#if defined(CHECK_FOR_NULL_POINTERS)
+	{
+		if(str == NULL)
+		{
+			SHOWMSG("invalid str parameter");
+
+			errno = EFAULT;
+			goto out;
+		}
+	}
+	#endif /* CHECK_FOR_NULL_POINTERS */
+
+	if(base < 0)
+	{
+		SHOWMSG("invalid base parameter");
+
+		errno = ERANGE;
+		goto out;
+	}
+
+	/* Skip all leading blanks. */
+	while((c = (*str)) != '\0')
+	{
+		if(NOT isspace(c))
+			break;
+
+		str++;
+	}
+
+	/* The first character may be a sign. */
+	if(c == '-')
+	{
+		/* It's a negative number. */
+		is_negative = TRUE;
+
+		str++;
+	}
+	else
+	{
+		/* It's not going to be negative. */
+		is_negative = FALSE;
+
+		/* But there may be a sign we will choose to
+		 * ignore.
+		 */
+		if(c == '+')
+			str++;
+	}
+
+	c = (*str);
+
+	/* There may be a leading '0x' to indicate that what
+	 * follows is a hexadecimal number.
+	 */
+	if(base == 0 || base == 16)
+	{
+		if((c == '0') && (str[1] == 'x' || str[1] == 'X'))
+		{
+			base = 16;
+
+			str += 2;
+
+			c = (*str);
+		}
+	}
+
+	/* If we still don't know what base to use and the
+	 * next letter to follow is a zero then this is
+	 * probably a number in octal notation.
+	 */
+	if(base == 0)
+	{
+		if(c == '0')
+			base = 8;
+		else
+			base = 10;
+	}
+
+	sum = 0;
+
+	if(1 <= base && base <= 36)
+	{
+		while(c != '\0')
+		{
+			if('0' <= c && c <= '9')
+				c -= '0';
+			else if ('a' <= c)
+				c -= 'a' - 10;
+			else if ('A' <= c)
+				c -= 'A' - 10;
+			else
+				break;
+
+			/* Ignore invalid numbers. */
+			if(c >= base)
+				break;
+
+			new_sum = base * sum + c;
+			if(new_sum < sum) /* overflow? */
+			{
+				errno = ERANGE;
+
+				if(is_negative)
+					result = LONG_MIN;
+				else
+					result = LONG_MAX;
+
+				goto out;
+			}
+
+			sum = new_sum;
+
+			str++;
+
+			c = (*str);
+		}
+	}
+
+	if(is_negative)
+		result = (-sum);
+	else
+		result = sum;
+
+ out:
+
+	/* If desired, remember where we stopped reading the
+	 * number from the buffer.
+	 */
+	if(ptr != NULL)
+		(*ptr) = (char *)str;
+
+	RETURN(result);
+	return(result);
+}
+
+/****************************************************************************/
+
+#endif /* USE_64_BIT_INTS */

library/stdlib_strtoull.c

@@ -0,0 +1,201 @@
+/*
+ * $Id: stdlib_strtoull.c,v 1.1 2004-09-20 17:16:06 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.
+ */
+
+#ifndef _STDLIB_NULL_POINTER_CHECK_H
+#include "stdlib_null_pointer_check.h"
+#endif /* _STDLIB_NULL_POINTER_CHECK_H */
+
+/****************************************************************************/
+
+#ifndef _STDLIB_HEADERS_H
+#include "stdlib_headers.h"
+#endif /* _STDLIB_HEADERS_H */
+
+/****************************************************************************/
+
+#if defined(USE_64_BIT_INTS)
+
+/****************************************************************************/
+
+unsigned long long
+strtoull(const char *str, char **ptr, int base)
+{
+	BOOL is_negative;
+	unsigned long long result = 0;
+	unsigned long long new_sum;
+	unsigned long long sum;
+	char c;
+
+	ENTER();
+
+	SHOWSTRING(str);
+	SHOWPOINTER(ptr);
+	SHOWVALUE(base);
+
+	assert(str != NULL && base >= 0);
+
+	#if defined(CHECK_FOR_NULL_POINTERS)
+	{
+		if(str == NULL)
+		{
+			SHOWMSG("invalid str parameter");
+
+			errno = EFAULT;
+			goto out;
+		}
+	}
+	#endif /* CHECK_FOR_NULL_POINTERS */
+
+	if(base < 0)
+	{
+		SHOWMSG("invalid base parameter");
+
+		errno = ERANGE;
+		goto out;
+	}
+
+	/* Skip all leading blanks. */
+	while((c = (*str)) != '\0')
+	{
+		if(NOT isspace(c))
+			break;
+
+		str++;
+	}
+
+	/* The first character may be a sign. */
+	if(c == '-')
+	{
+		/* It's a negative number. */
+		is_negative = TRUE;
+
+		str++;
+	}
+	else
+	{
+		/* It's not going to be negative. */
+		is_negative = FALSE;
+
+		/* But there may be a sign we will choose to
+		 * ignore.
+		 */
+		if(c == '+')
+			str++;
+	}
+
+	c = (*str);
+
+	/* There may be a leading '0x' to indicate that what
+	 * follows is a hexadecimal number.
+	 */
+	if(base == 0 || base == 16)
+	{
+		if((c == '0') && (str[1] == 'x' || str[1] == 'X'))
+		{
+			base = 16;
+
+			str += 2;
+
+			c = (*str);
+		}
+	}
+
+	/* If we still don't know what base to use and the
+	 * next letter to follow is a zero then this is
+	 * probably a number in octal notation.
+	 */
+	if(base == 0)
+	{
+		if(c == '0')
+			base = 8;
+		else
+			base = 10;
+	}
+
+	sum = 0;
+
+	if(1 <= base && base <= 36)
+	{
+		while(c != '\0')
+		{
+			if('0' <= c && c <= '9')
+				c -= '0';
+			else if ('a' <= c)
+				c -= 'a' - 10;
+			else if ('A' <= c)
+				c -= 'A' - 10;
+			else
+				break;
+
+			/* Ignore invalid numbers. */
+			if(c >= base)
+				break;
+
+			new_sum = base * sum + c;
+			if(new_sum < sum) /* overflow? */
+			{
+				errno = ERANGE;
+
+				result = ULONG_MAX;
+
+				goto out;
+			}
+
+			sum = new_sum;
+
+			str++;
+
+			c = (*str);
+		}
+	}
+
+	if(is_negative)
+		result = (-sum);
+	else
+		result = sum;
+
+ out:
+
+	/* If desired, remember where we stopped reading the
+	 * number from the buffer.
+	 */
+	if(ptr != NULL)
+		(*ptr) = (char *)str;
+
+	RETURN(result);
+	return(result);
+}
+
+/****************************************************************************/
+
+#endif /* USE_64_BIT_INTS */

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	170
+#define REVISION	176
-#define DATE		"14.8.2004"
+#define DATE		"27.9.2004"
-#define VERS		"unix.lib 1.170"
+#define VERS		"unix.lib 1.176"
-#define VSTRING		"unix.lib 1.170 (14.8.2004)\r\n"
+#define VSTRING		"unix.lib 1.176 (27.9.2004)\r\n"
-#define VERSTAG		"\0$VER: unix.lib 1.170 (14.8.2004)"
+#define VERSTAG		"\0$VER: unix.lib 1.176 (27.9.2004)"

library/unix.lib_rev.rev

@@ -1 +1 @@
-170
+176

library/usergroup_headers.h

@@ -1,5 +1,5 @@
 /*
- * $Id: usergroup_headers.h,v 1.1.1.1 2004-07-26 16:32:38 obarthel Exp $
+ * $Id: usergroup_headers.h,v 1.2 2004-09-16 08:45:03 obarthel Exp $
  *
  * :ts=4
  *
@@ -519,14 +519,18 @@ extern int __root_egid;
 
 #define __umask(mask) ({ \
   ULONG _umask_mask = (mask); \
-  { \
+  ULONG _umask__re = \
+  ({ \
   register struct Library * const __umask__bn __asm("a6") = (struct Library *) (__UserGroupBase);\
+  register ULONG __umask__re __asm("d0"); \
   register ULONG __umask_mask __asm("d0") = (_umask_mask); \
   __asm volatile ("jsr a6@(-192:W)" \
-  : \
+  : "=r"(__umask__re) \
   : "r"(__umask__bn), "r"(__umask_mask) \
-  : "d0", "d1", "a0", "a1", "fp0", "fp1", "cc", "memory"); \
+  : "d1", "a0", "a1", "fp0", "fp1", "cc", "memory"); \
-  } \
+  __umask__re; \
+  }); \
+  _umask__re; \
 })
 
 #define __getumask() ({ \
@@ -718,7 +722,7 @@ VOID __endgrent(VOID);
 UBYTE *__crypt(UBYTE *key,UBYTE *set);
 UBYTE *__ug_GetSalt(struct passwd *user,UBYTE *buf,ULONG size);
 UBYTE *__getpass(UBYTE *prompt);
-VOID __umask(ULONG mask);
+UWORD __umask(ULONG mask);
 UWORD __getumask(VOID);
 LONG __setsid(VOID);
 LONG __getpgrp(VOID);