[PATCH 1/4] Importing strtoimax inttypes method from FreeBSD.

[PATCH 1/4] Importing strtoimax inttypes method from FreeBSD.

[Aditya Upadhyay]

---
 newlib/libc/include/inttypes.h |  12 +++
 newlib/libc/stdlib/Makefile.am |   1 +
 newlib/libc/stdlib/strtoimax.c | 167 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 180 insertions(+)
 create mode 100644 newlib/libc/stdlib/strtoimax.c

diff --git a/newlib/libc/include/inttypes.h b/newlib/libc/include/inttypes.h
index 25c6e99..44a1dcd 100644
--- a/newlib/libc/include/inttypes.h
+++ b/newlib/libc/include/inttypes.h
@@ -16,10 +16,15 @@
 #include <newlib.h>
 #include <sys/config.h>
 #include <sys/_intsup.h>
+#include "_ansi.h"
 #include <stdint.h>
 #define __need_wchar_t
 #include <stddef.h>
 
+#if __BSD_VISIBLE
+#include <xlocale.h>
+#endif
+
 #define __STRINGIFY(a) #a
 
 /* 8-bit types */
@@ -309,6 +314,8 @@ typedef struct {
   intmax_t	rem;
 } imaxdiv_t;
 
+struct _reent;
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -316,10 +323,15 @@ extern "C" {
 extern intmax_t  imaxabs(intmax_t j);
 extern imaxdiv_t imaxdiv(intmax_t numer, intmax_t denomer);
 extern intmax_t  strtoimax(const char *__restrict, char **__restrict, int);
+extern intmax_t  _strtoimax_r(struct _reent *, const char *__restrict, char **__restrict, int);
 extern uintmax_t strtoumax(const char *__restrict, char **__restrict, int);
 extern intmax_t  wcstoimax(const wchar_t *__restrict, wchar_t **__restrict, int);
 extern uintmax_t wcstoumax(const wchar_t *__restrict, wchar_t **__restrict, int);
 
+#if __BSD_VISIBLE
+extern intmax_t  strtoimax_l(const char *__restrict, char **_restrict, int, locale_t);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/newlib/libc/stdlib/Makefile.am b/newlib/libc/stdlib/Makefile.am
index 7aaa7fd..64a9d43 100644
--- a/newlib/libc/stdlib/Makefile.am
+++ b/newlib/libc/stdlib/Makefile.am
@@ -59,6 +59,7 @@ GENERAL_SOURCES = \
 	sb_charsets.c	\
 	strtod.c	\
 	strtodg.c	\
+	strtoimax.c	\
 	strtol.c	\
 	strtorx.c	\
 	strtoul.c	\
diff --git a/newlib/libc/stdlib/strtoimax.c b/newlib/libc/stdlib/strtoimax.c
new file mode 100644
index 0000000..198ced9
--- /dev/null
+++ b/newlib/libc/stdlib/strtoimax.c
@@ -0,0 +1,167 @@
+/*-
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Copyright (c) 2011 The FreeBSD Foundation
+ * All rights reserved.
+ * Portions of this software were developed by David Chisnall
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * 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.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "from @(#)strtol.c	8.1 (Berkeley) 6/4/93";
+#endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: head/lib/libc/stdlib/strtoimax.c 251672 2013-06-13 00:19:30Z emaste $");
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <stdint.h>
+#include <reent.h>
+#include "../locale/setlocale.h"
+
+/*
+ * Convert a string to an intmax_t integer.
+ *
+ * Assumes that the upper and lower case
+ * alphabets and digits are each contiguous.
+ */
+
+/*
+ *Reentrant version of strtoimax.
+ */
+static intmax_t
+_strtoimax_l(struct _reent *rptr, const char * __restrict nptr,
+	     char ** __restrict endptr, int base, locale_t loc)
+{
+	const char *s = (const unsigned char *)nptr;
+	uintmax_t acc;
+	char c;
+	uintmax_t cutoff;
+	int neg = 0, any, cutlim;
+	
+	/*
+	 * Skip white space and pick up leading +/- sign if any.
+	 * If base is 0, allow 0x for hex and 0 for octal, else
+	 * assume decimal; if base is already 16, allow 0x.
+	 */
+	do {
+		c = *s++;
+	} while (isspace_l(c, loc));
+	if (c == '-') {
+		neg = 1;
+		c = *s++;
+	} else {
+		neg = 0;
+		if (c == '+')
+			c = *s++;
+	}
+	if ((base == 0 || base == 16) &&
+	    c == '0' && (*s == 'x' || *s == 'X')) {
+		c = s[1];
+		s += 2;
+		base = 16;
+	}
+	if (base == 0)
+		base = c == '0' ? 8 : 10;
+	
+	/*
+	 * Compute the cutoff value between legal numbers and illegal
+	 * numbers.  That is the largest legal value, divided by the
+	 * base.  An input number that is greater than this value, if
+	 * followed by a legal input character, is too big.  One that
+	 * is equal to this value may be valid or not; the limit
+	 * between valid and invalid numbers is then based on the last
+	 * digit.  For instance, if the range for intmax_t is
+	 * [-9223372036854775808..9223372036854775807] and the input base
+	 * is 10, cutoff will be set to 922337203685477580 and cutlim to
+	 * either 7 (neg==0) or 8 (neg==1), meaning that if we have
+	 * accumulated a value > 922337203685477580, or equal but the
+	 * next digit is > 7 (or 8), the number is too big, and we will
+	 * return a range error.
+	 *
+	 * Set 'any' if any `digits' consumed; make it negative to indicate
+	 * overflow.
+	 */
+	cutoff = neg ? -(uintmax_t)INTMAX_MIN : INTMAX_MAX;
+	cutlim = cutoff % base;
+	cutoff /= base;
+	for ( ; ; c = *s++) {
+		if (c >= '0' && c <= '9')
+			c -= '0';
+		else if (c >= 'A' && c <= 'Z')
+			c -= 'A' - 10;
+		else if (c >= 'a' && c <= 'z')
+			c -= 'a' - 10;
+		else
+			break;
+		if (c >= base)
+			break;
+		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
+			any = -1;
+		else {
+			any = 1;
+			acc *= base;
+			acc += c;
+		}
+	}
+	if (any < 0) {
+		acc = neg ? INTMAX_MIN : INTMAX_MAX;
+		rptr->_errno = ERANGE;
+	} else if (!any) {
+noconv:
+		rptr->_errno = EINVAL;
+	} else if (neg)
+		acc = -acc;
+	if (endptr != NULL)
+		*endptr = (char *)(any ? s - 1 : nptr);
+	return (acc);
+}
+intmax_t
+_strtoimax_r(struct _reent *rptr, const char *__restrict nptr, 
+	     char **__restrict endptr, int base)
+{
+	return _strtoimax_l(rptr, nptr, endptr, base, __get_current_locale());
+}
+
+#ifndef _REENT_ONLY
+ 
+intmax_t
+strtoimax_l(const char * __restrict nptr, char ** __restrict endptr, int base,
+	    locale_t loc)
+{
+	return _strtoimax_l(_REENT, nptr, endptr, base, loc);
+}
+intmax_t
+strtoimax(const char* __restrict nptr, char** __restrict endptr, int base)
+{
+	return _strtoimax_l(_REENT, nptr, endptr, base, __get_current_locale());
+}
+
+#endif		
-- 
2.7.4

Re: [PATCH 1/4] Importing strtoimax inttypes method from FreeBSD.

[Corinna Vinschen]

[-- Attachment #1: Type: text/plain, Size: 508 bytes --]

On Aug  2 08:49, Aditya Upadhyay wrote:
> ---
>  newlib/libc/include/inttypes.h |  12 +++
>  newlib/libc/stdlib/Makefile.am |   1 +
>  newlib/libc/stdlib/strtoimax.c | 167 +++++++++++++++++++++++++++++++++++++++++

All 4 patches applied.

I made a few minor formatting changes in terms of whitespaces and
missing empty lines between functions.  Please compare what I commited
with your local patch to see the differences.


Thanks,
Corinna

-- 
Corinna Vinschen
Cygwin Maintainer
Red Hat

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 1/4] Importing strtoimax inttypes method from FreeBSD.

[Gedare Bloom]

On Wed, Aug 2, 2017 at 7:04 AM, Corinna Vinschen <vinschen@redhat.com> wrote:
> On Aug  2 08:49, Aditya Upadhyay wrote:
>> ---
>>  newlib/libc/include/inttypes.h |  12 +++
>>  newlib/libc/stdlib/Makefile.am |   1 +
>>  newlib/libc/stdlib/strtoimax.c | 167 +++++++++++++++++++++++++++++++++++++++++
>
> All 4 patches applied.
>
> I made a few minor formatting changes in terms of whitespaces and
> missing empty lines between functions.  Please compare what I commited
> with your local patch to see the differences.
>
Thanks. There were no empty lines between functions in the original
BSD source. However, since the original source was not submitted
separately from the modification to make it useful, this is hard to
see. Best to leave it as you have pushed it I suppose.

Aditya, if there are more patches in the future please first provide a
commit with the unmodified BSD file, and then a second commit to
modify the file and to add it to the build system. I neglected to
follow-up on this procedure with you, but it is a good way to ensure
tight synchronization with upstream sources.

-Gedare

>
> Thanks,
> Corinna
>
> --
> Corinna Vinschen
> Cygwin Maintainer
> Red Hat

Re: [PATCH 1/4] Importing strtoimax inttypes method from FreeBSD.

[Aditya Upadhyay]

Yes, I will commit the thrid party unmodified code first, then i will
commit the modified code.


On Wed, Aug 2, 2017 at 7:25 PM, Gedare Bloom <gedare@rtems.org> wrote:
> On Wed, Aug 2, 2017 at 7:04 AM, Corinna Vinschen <vinschen@redhat.com> wrote:
>> On Aug  2 08:49, Aditya Upadhyay wrote:
>>> ---
>>>  newlib/libc/include/inttypes.h |  12 +++
>>>  newlib/libc/stdlib/Makefile.am |   1 +
>>>  newlib/libc/stdlib/strtoimax.c | 167 +++++++++++++++++++++++++++++++++++++++++
>>
>> All 4 patches applied.
>>
>> I made a few minor formatting changes in terms of whitespaces and
>> missing empty lines between functions.  Please compare what I commited
>> with your local patch to see the differences.
>>
> Thanks. There were no empty lines between functions in the original
> BSD source. However, since the original source was not submitted
> separately from the modification to make it useful, this is hard to
> see. Best to leave it as you have pushed it I suppose.
>
> Aditya, if there are more patches in the future please first provide a
> commit with the unmodified BSD file, and then a second commit to
> modify the file and to add it to the build system. I neglected to
> follow-up on this procedure with you, but it is a good way to ensure
> tight synchronization with upstream sources.
>
> -Gedare
>
>>
>> Thanks,
>> Corinna
>>
>> --
>> Corinna Vinschen
>> Cygwin Maintainer
>> Red Hat

Re: [PATCH 1/4] Importing strtoimax inttypes method from FreeBSD.

[Sebastian Huber]

On 02/08/17 13:04, Corinna Vinschen wrote:

> On Aug  2 08:49, Aditya Upadhyay wrote:
>> ---
>>   newlib/libc/include/inttypes.h |  12 +++
>>   newlib/libc/stdlib/Makefile.am |   1 +
>>   newlib/libc/stdlib/strtoimax.c | 167 +++++++++++++++++++++++++++++++++++++++++
> All 4 patches applied.
>
> I made a few minor formatting changes in terms of whitespaces and
> missing empty lines between functions.  Please compare what I commited
> with your local patch to see the differences.

The files are not built currently. We have to regenerate the 
Makefile.in. I had problems with that using automake 1.12.2:

configure.in:251: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call 
detected in body
../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from...
../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from...
../libtool.m4:1080: _LT_SYS_MODULE_PATH_AIX is expanded from...
../libtool.m4:4213: _LT_LINKER_SHLIBS is expanded from...
../libtool.m4:5341: _LT_LANG_C_CONFIG is expanded from...
../libtool.m4:141: _LT_SETUP is expanded from...
../libtool.m4:67: LT_INIT is expanded from...
../libtool.m4:106: AM_PROG_LIBTOOL is expanded from...
configure.in:251: the top level
configure.in:251: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call 
detected in body
../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from...
../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from...
../libtool.m4:4213: _LT_LINKER_SHLIBS is expanded from...
../libtool.m4:5341: _LT_LANG_C_CONFIG is expanded from...
../libtool.m4:141: _LT_SETUP is expanded from...
../libtool.m4:67: LT_INIT is expanded from...
../libtool.m4:106: AM_PROG_LIBTOOL is expanded from...
configure.in:251: the top level
configure.in:241: error: version mismatch.  This is Automake 1.12.2,
configure.in:241: but the definition used by this AM_INIT_AUTOMAKE
configure.in:241: comes from Automake 1.11.6.  You should recreate
configure.in:241: aclocal.m4 with aclocal and run automake again.

I don't know how to regenerate libc/stdio/Makefile.in using automake 1.12.2.

-- 
Sebastian Huber, embedded brains GmbH

Address : Dornierstr. 4, D-82178 Puchheim, Germany
Phone   : +49 89 189 47 41-16
Fax     : +49 89 189 47 41-09
E-Mail  : sebastian.huber@embedded-brains.de
PGP     : Public key available on request.

Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.

Re: [PATCH 1/4] Importing strtoimax inttypes method from FreeBSD.

[Aditya Upadhyay]

Hello,

I had manually updated the Makefile.in for these method. I am trying
to configure automake-1.12 version. I will let you know.

Regards,
Aditya Upadhyay

On Fri, Aug 11, 2017 at 12:02 PM, Sebastian Huber
<sebastian.huber@embedded-brains.de> wrote:
> On 02/08/17 13:04, Corinna Vinschen wrote:
>
>> On Aug  2 08:49, Aditya Upadhyay wrote:
>>>
>>> ---
>>>   newlib/libc/include/inttypes.h |  12 +++
>>>   newlib/libc/stdlib/Makefile.am |   1 +
>>>   newlib/libc/stdlib/strtoimax.c | 167
>>> +++++++++++++++++++++++++++++++++++++++++
>>
>> All 4 patches applied.
>>
>> I made a few minor formatting changes in terms of whitespaces and
>> missing empty lines between functions.  Please compare what I commited
>> with your local patch to see the differences.
>
>
> The files are not built currently. We have to regenerate the Makefile.in. I
> had problems with that using automake 1.12.2:
>
> configure.in:251: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected
> in body
> ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
> ../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from...
> ../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from...
> ../libtool.m4:1080: _LT_SYS_MODULE_PATH_AIX is expanded from...
> ../libtool.m4:4213: _LT_LINKER_SHLIBS is expanded from...
> ../libtool.m4:5341: _LT_LANG_C_CONFIG is expanded from...
> ../libtool.m4:141: _LT_SETUP is expanded from...
> ../libtool.m4:67: LT_INIT is expanded from...
> ../libtool.m4:106: AM_PROG_LIBTOOL is expanded from...
> configure.in:251: the top level
> configure.in:251: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected
> in body
> ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
> ../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from...
> ../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from...
> ../libtool.m4:4213: _LT_LINKER_SHLIBS is expanded from...
> ../libtool.m4:5341: _LT_LANG_C_CONFIG is expanded from...
> ../libtool.m4:141: _LT_SETUP is expanded from...
> ../libtool.m4:67: LT_INIT is expanded from...
> ../libtool.m4:106: AM_PROG_LIBTOOL is expanded from...
> configure.in:251: the top level
> configure.in:241: error: version mismatch.  This is Automake 1.12.2,
> configure.in:241: but the definition used by this AM_INIT_AUTOMAKE
> configure.in:241: comes from Automake 1.11.6.  You should recreate
> configure.in:241: aclocal.m4 with aclocal and run automake again.
>
> I don't know how to regenerate libc/stdio/Makefile.in using automake 1.12.2.
>
> --
> Sebastian Huber, embedded brains GmbH
>
> Address : Dornierstr. 4, D-82178 Puchheim, Germany
> Phone   : +49 89 189 47 41-16
> Fax     : +49 89 189 47 41-09
> E-Mail  : sebastian.huber@embedded-brains.de
> PGP     : Public key available on request.
>
> Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.
>

Re: [PATCH 1/4] Importing strtoimax inttypes method from FreeBSD.

[Corinna Vinschen]

[-- Attachment #1: Type: text/plain, Size: 2930 bytes --]

On Aug 11 08:32, Sebastian Huber wrote:
> On 02/08/17 13:04, Corinna Vinschen wrote:
> 
> > On Aug  2 08:49, Aditya Upadhyay wrote:
> > > ---
> > >   newlib/libc/include/inttypes.h |  12 +++
> > >   newlib/libc/stdlib/Makefile.am |   1 +
> > >   newlib/libc/stdlib/strtoimax.c | 167 +++++++++++++++++++++++++++++++++++++++++
> > All 4 patches applied.
> > 
> > I made a few minor formatting changes in terms of whitespaces and
> > missing empty lines between functions.  Please compare what I commited
> > with your local patch to see the differences.
> 
> The files are not built currently. We have to regenerate the Makefile.in. I
> had problems with that using automake 1.12.2:
> 
> configure.in:251: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected
> in body
> ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
> ../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from...
> ../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from...
> ../libtool.m4:1080: _LT_SYS_MODULE_PATH_AIX is expanded from...
> ../libtool.m4:4213: _LT_LINKER_SHLIBS is expanded from...
> ../libtool.m4:5341: _LT_LANG_C_CONFIG is expanded from...
> ../libtool.m4:141: _LT_SETUP is expanded from...
> ../libtool.m4:67: LT_INIT is expanded from...
> ../libtool.m4:106: AM_PROG_LIBTOOL is expanded from...
> configure.in:251: the top level
> configure.in:251: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected
> in body
> ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
> ../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from...
> ../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from...
> ../libtool.m4:4213: _LT_LINKER_SHLIBS is expanded from...
> ../libtool.m4:5341: _LT_LANG_C_CONFIG is expanded from...
> ../libtool.m4:141: _LT_SETUP is expanded from...
> ../libtool.m4:67: LT_INIT is expanded from...
> ../libtool.m4:106: AM_PROG_LIBTOOL is expanded from...
> configure.in:251: the top level
> configure.in:241: error: version mismatch.  This is Automake 1.12.2,
> configure.in:241: but the definition used by this AM_INIT_AUTOMAKE
> configure.in:241: comes from Automake 1.11.6.  You should recreate
> configure.in:241: aclocal.m4 with aclocal and run automake again.

I just regenerated stdlib/Makefile.in (and screwed up the log message).

> I don't know how to regenerate libc/stdio/Makefile.in using automake 1.12.2.

I'm always a bit fuzzy about this as well.  Basically I cd into
either newlib/libc or newlib/libm, whatever needs a regen, then

  aclocal-1.12.2 -I. -I..
  autoconf-2.69
  automake-1.12.2 --cygnus --no-force

This regenerates a lot of files unnecessarily, but they can be easily
reset to the current state (git checkout --) and I only keep the
Makefile.in which actually needed the regen.


Corinna

-- 
Corinna Vinschen
Cygwin Maintainer
Red Hat

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]