add function for strtof
This commit is contained in:
parent
674b480198
commit
120594079a
1
LICENSE
1
LICENSE
@ -5891,6 +5891,7 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||
libs/libc/math/scalbnf.c
|
||||
libs/libc/math/scalbn.c
|
||||
libs/libc/math/scalbnl.c
|
||||
libs/libc/stdlib/lib_strtof.c
|
||||
======================
|
||||
|
||||
Copyright © 2005-2020 Rich Felker, et al.
|
||||
|
@ -24,8 +24,8 @@ CSRCS += lib_abs.c lib_abort.c lib_atof.c lib_atoi.c lib_getprogname.c
|
||||
CSRCS += lib_atol.c lib_atoll.c lib_div.c lib_ldiv.c lib_lldiv.c lib_exit.c
|
||||
CSRCS += lib_itoa.c lib_labs.c lib_llabs.c lib_realpath.c lib_bsearch.c
|
||||
CSRCS += lib_rand.c lib_rand48.c lib_qsort.c lib_srand.c lib_strtol.c
|
||||
CSRCS += lib_strtoll.c lib_strtoul.c lib_strtoull.c lib_strtod.c lib_strtof.c
|
||||
CSRCS += lib_strtold.c lib_checkbase.c lib_mktemp.c lib_mkstemp.c lib_mkdtemp.c
|
||||
CSRCS += lib_strtoll.c lib_strtoul.c lib_strtoull.c lib_strtold.c
|
||||
CSRCS += lib_checkbase.c lib_mktemp.c lib_mkstemp.c lib_mkdtemp.c
|
||||
CSRCS += lib_aligned_alloc.c lib_posix_memalign.c lib_valloc.c lib_mblen.c
|
||||
CSRCS += lib_mbtowc.c lib_wctomb.c lib_mbstowcs.c lib_wcstombs.c
|
||||
CSRCS += lib_atexit.c lib_cxa_atexit.c lib_onexit.c
|
||||
|
@ -1,343 +0,0 @@
|
||||
/****************************************************************************
|
||||
* libs/libc/stdlib/lib_strtod.c
|
||||
* Convert string to double
|
||||
*
|
||||
* Copyright (C) 2002 Michael Ringgaard. All rights reserved.
|
||||
* Copyright (C) 2006-2007 H. Peter Anvin.
|
||||
*
|
||||
* 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 project 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 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.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Included Files
|
||||
****************************************************************************/
|
||||
|
||||
#include <nuttx/config.h>
|
||||
#include <nuttx/compiler.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include <stdbool.h>
|
||||
|
||||
#ifdef CONFIG_HAVE_DOUBLE
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-processor definitions
|
||||
****************************************************************************/
|
||||
|
||||
/* These are predefined with GCC, but could be issues for other compilers. If
|
||||
* not defined, an arbitrary big number is put in for now. These should be
|
||||
* added to nuttx/compiler for your compiler.
|
||||
*/
|
||||
|
||||
#if !defined(__DBL_MIN_EXP__) || !defined(__DBL_MAX_EXP__)
|
||||
# ifdef CONFIG_CPP_HAVE_WARNING
|
||||
# warning "Size of exponent is unknown"
|
||||
# endif
|
||||
# undef __DBL_MIN_EXP__
|
||||
# define __DBL_MIN_EXP__ (-1021)
|
||||
# undef __DBL_MAX_EXP__
|
||||
# define __DBL_MAX_EXP__ (1024)
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Private Functions
|
||||
****************************************************************************/
|
||||
|
||||
static inline int is_real(double x)
|
||||
{
|
||||
/* NOTE: Windows MSVC restrictions, MSVC doesn't allow division through a
|
||||
* zero literal, but allows it through non-const variable set to zero
|
||||
*/
|
||||
|
||||
const double divzero = 0.0;
|
||||
const double infinite = 1.0 / divzero;
|
||||
return (x < infinite) && (x >= -infinite);
|
||||
}
|
||||
|
||||
static bool chtod(char c, double base, FAR double *number)
|
||||
{
|
||||
/* This function is to determine if c is keyword
|
||||
* Then set number + base
|
||||
*/
|
||||
|
||||
double tmp = base;
|
||||
|
||||
if (isdigit(c))
|
||||
{
|
||||
tmp = c - '0';
|
||||
}
|
||||
else if (c >= 'a' && c <= 'f')
|
||||
{
|
||||
tmp = c - 'a' + 10;
|
||||
}
|
||||
else if (c >= 'A' && c <= 'F')
|
||||
{
|
||||
tmp = c - 'A' + 10;
|
||||
}
|
||||
|
||||
if (tmp >= base)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
*number = *number * base + tmp;
|
||||
return true;
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Name: strtod
|
||||
*
|
||||
* Description:
|
||||
* Convert a string to a double value
|
||||
*
|
||||
* NOTE: This implementation is limited as compared to POSIX:
|
||||
* - Hexadecimal input is not supported
|
||||
* - INF, INFINITY, NAN, and NAN(...) are not supported
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
double strtod(FAR const char *str, FAR char **endptr)
|
||||
{
|
||||
double number;
|
||||
int exponent;
|
||||
int negative;
|
||||
FAR char *p = (FAR char *) str;
|
||||
double p10;
|
||||
int n;
|
||||
int num_digits;
|
||||
int num_decimals;
|
||||
|
||||
/* NOTE: Windows MSVC restrictions, MSVC doesn't allow division through a
|
||||
* zero literal, but allows it through non-const variable set to zero
|
||||
*/
|
||||
|
||||
const double divzero = 0.0;
|
||||
const double infinite = 1.0 / divzero;
|
||||
|
||||
/* Skip leading whitespace */
|
||||
|
||||
while (isspace(*p))
|
||||
{
|
||||
p++;
|
||||
}
|
||||
|
||||
/* Handle optional sign */
|
||||
|
||||
negative = 0;
|
||||
switch (*p)
|
||||
{
|
||||
case '-':
|
||||
negative = 1; /* Fall through to increment position */
|
||||
|
||||
/* FALLTHROUGH */
|
||||
|
||||
case '+':
|
||||
p++;
|
||||
|
||||
/* FALLTHROUGH */
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
p10 = 10.;
|
||||
number = 0.;
|
||||
exponent = 0;
|
||||
num_digits = 0;
|
||||
num_decimals = 0;
|
||||
|
||||
/* Process optional 0x prefix */
|
||||
|
||||
if (*p == '0' && tolower(*(p + 1)) == 'x')
|
||||
{
|
||||
p += 2;
|
||||
p10 = 16.;
|
||||
}
|
||||
|
||||
/* Process string of digits */
|
||||
|
||||
while (chtod(*p, p10, &number))
|
||||
{
|
||||
p++;
|
||||
num_digits++;
|
||||
}
|
||||
|
||||
/* Process decimal part */
|
||||
|
||||
if (*p == '.')
|
||||
{
|
||||
p++;
|
||||
|
||||
while (chtod(*p, p10, &number))
|
||||
{
|
||||
p++;
|
||||
num_digits++;
|
||||
num_decimals++;
|
||||
}
|
||||
|
||||
exponent -= num_decimals;
|
||||
}
|
||||
|
||||
if (num_digits == 0)
|
||||
{
|
||||
set_errno(ERANGE);
|
||||
number = 0.0;
|
||||
p = (FAR char *)str;
|
||||
goto errout;
|
||||
}
|
||||
|
||||
/* Correct for sign */
|
||||
|
||||
if (negative)
|
||||
{
|
||||
number = -number;
|
||||
}
|
||||
|
||||
/* Process an exponent string */
|
||||
|
||||
if ((p10 == 10. && (*p == 'e' || *p == 'E'))
|
||||
|| (p10 == 16. && (*p == 'p' || *p == 'P')))
|
||||
{
|
||||
/* if the Hexadecimal system */
|
||||
|
||||
if (p10 == 16.)
|
||||
{
|
||||
exponent *= 4;
|
||||
p10 = 2.0;
|
||||
}
|
||||
|
||||
/* Handle optional sign */
|
||||
|
||||
negative = 0;
|
||||
switch (*++p)
|
||||
{
|
||||
case '-':
|
||||
negative = 1; /* Fall through to increment pos */
|
||||
|
||||
/* FALLTHROUGH */
|
||||
|
||||
case '+':
|
||||
p++;
|
||||
|
||||
/* FALLTHROUGH */
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
/* Process string of digits */
|
||||
|
||||
if (!isdigit(*p))
|
||||
{
|
||||
set_errno(ERANGE);
|
||||
number = 0.0;
|
||||
p = (FAR char *)str;
|
||||
goto errout;
|
||||
}
|
||||
|
||||
n = 0;
|
||||
while (isdigit(*p))
|
||||
{
|
||||
n = n * 10 + (*p - '0');
|
||||
p++;
|
||||
}
|
||||
|
||||
if (negative)
|
||||
{
|
||||
exponent -= n;
|
||||
}
|
||||
else
|
||||
{
|
||||
exponent += n;
|
||||
}
|
||||
}
|
||||
|
||||
if (exponent < __DBL_MIN_EXP__ ||
|
||||
exponent > __DBL_MAX_EXP__)
|
||||
{
|
||||
set_errno(ERANGE);
|
||||
if (exponent < __DBL_MIN_EXP__)
|
||||
{
|
||||
number = divzero;
|
||||
}
|
||||
else
|
||||
{
|
||||
number = infinite;
|
||||
}
|
||||
|
||||
goto errout;
|
||||
}
|
||||
|
||||
/* Scale the result */
|
||||
|
||||
n = exponent;
|
||||
if (n < 0)
|
||||
{
|
||||
n = -n;
|
||||
}
|
||||
|
||||
while (n)
|
||||
{
|
||||
if (n & 1)
|
||||
{
|
||||
if (exponent < 0)
|
||||
{
|
||||
number /= p10;
|
||||
}
|
||||
else
|
||||
{
|
||||
number *= p10;
|
||||
}
|
||||
}
|
||||
|
||||
n >>= 1;
|
||||
p10 *= p10;
|
||||
}
|
||||
|
||||
if (!is_real(number))
|
||||
{
|
||||
set_errno(ERANGE);
|
||||
}
|
||||
|
||||
errout:
|
||||
if (endptr)
|
||||
{
|
||||
*endptr = p;
|
||||
}
|
||||
|
||||
return number;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_HAVE_DOUBLE */
|
@ -1,343 +0,0 @@
|
||||
/****************************************************************************
|
||||
* libs/libc/stdlib/lib_strtof.c
|
||||
* Convert string to float
|
||||
*
|
||||
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
|
||||
*
|
||||
* A pretty straight forward conversion fo strtod():
|
||||
*
|
||||
* Copyright (C) 2002 Michael Ringgaard. All rights reserved.
|
||||
* Copyright (C) 2006-2007 H. Peter Anvin.
|
||||
*
|
||||
* 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 project 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 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.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Included Files
|
||||
****************************************************************************/
|
||||
|
||||
#include <nuttx/config.h>
|
||||
#include <nuttx/compiler.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include <stdbool.h>
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-processor definitions
|
||||
****************************************************************************/
|
||||
|
||||
/* These are predefined with GCC, but could be issues for other compilers. If
|
||||
* not defined, an arbitrary big number is put in for now. These should be
|
||||
* added to nuttx/compiler for your compiler.
|
||||
*/
|
||||
|
||||
#if !defined(__FLT_MIN_EXP__) || !defined(__FLT_MAX_EXP__)
|
||||
# ifdef CONFIG_CPP_HAVE_WARNING
|
||||
# warning "Size of exponent is unknown"
|
||||
# endif
|
||||
# undef __FLT_MIN_EXP__
|
||||
# define __FLT_MIN_EXP__ (-125)
|
||||
# undef __FLT_MAX_EXP__
|
||||
# define __FLT_MAX_EXP__ (128)
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Private Functions
|
||||
****************************************************************************/
|
||||
|
||||
static inline int is_real(float x)
|
||||
{
|
||||
/* NOTE: Windows MSVC restrictions, MSVC doesn't allow division through a
|
||||
* zero literal, but allows it through non-const variable set to zero
|
||||
*/
|
||||
|
||||
float divzero = 0.0F;
|
||||
const float infinite = 1.0F / divzero;
|
||||
return (x < infinite) && (x >= -infinite);
|
||||
}
|
||||
|
||||
static bool chtof(char c, float base, FAR float *number)
|
||||
{
|
||||
/* This function is to determine if c is keyword
|
||||
* Then set number + base
|
||||
*/
|
||||
|
||||
float tmp = base;
|
||||
|
||||
if (isdigit(c))
|
||||
{
|
||||
tmp = c - '0';
|
||||
}
|
||||
else if (c >= 'a' && c <= 'f')
|
||||
{
|
||||
tmp = c - 'a' + 10;
|
||||
}
|
||||
else if (c >= 'A' && c <= 'F')
|
||||
{
|
||||
tmp = c - 'A' + 10;
|
||||
}
|
||||
|
||||
if (tmp >= base)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
*number = *number * base + tmp;
|
||||
return true;
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Name: strtof
|
||||
*
|
||||
* Description:
|
||||
* Convert a string to a float value
|
||||
*
|
||||
* NOTE: This implementation is limited as compared to POSIX:
|
||||
* - Hexadecimal input is not supported
|
||||
* - INF, INFINITY, NAN, and NAN(...) are not supported
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
float strtof(FAR const char *str, FAR char **endptr)
|
||||
{
|
||||
float number;
|
||||
int exponent;
|
||||
int negative;
|
||||
FAR char *p = (FAR char *) str;
|
||||
float p10;
|
||||
int n;
|
||||
int num_digits;
|
||||
int num_decimals;
|
||||
|
||||
/* NOTE: Windows MSVC restrictions, MSVC doesn't allow division through a
|
||||
* zero literal, but allows it through non-const variable set to zero
|
||||
*/
|
||||
|
||||
float divzero = 0.0F;
|
||||
const float infinite = 1.0F / divzero;
|
||||
|
||||
/* Skip leading whitespace */
|
||||
|
||||
while (isspace(*p))
|
||||
{
|
||||
p++;
|
||||
}
|
||||
|
||||
/* Handle optional sign */
|
||||
|
||||
negative = 0;
|
||||
switch (*p)
|
||||
{
|
||||
case '-':
|
||||
negative = 1; /* Fall through to increment position */
|
||||
|
||||
/* FALLTHROUGH */
|
||||
|
||||
case '+':
|
||||
p++;
|
||||
|
||||
/* FALLTHROUGH */
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
p10 = 10.0f;
|
||||
number = 0.0F;
|
||||
exponent = 0;
|
||||
num_digits = 0;
|
||||
num_decimals = 0;
|
||||
|
||||
/* Process optional 0x prefix */
|
||||
|
||||
if (*p == '0' && tolower(*(p + 1)) == 'x')
|
||||
{
|
||||
p += 2;
|
||||
p10 = 16.0f;
|
||||
}
|
||||
|
||||
/* Process string of digits */
|
||||
|
||||
while (chtof(*p, p10, &number))
|
||||
{
|
||||
p++;
|
||||
num_digits++;
|
||||
}
|
||||
|
||||
/* Process decimal part */
|
||||
|
||||
if (*p == '.')
|
||||
{
|
||||
p++;
|
||||
|
||||
while (chtof(*p, p10, &number))
|
||||
{
|
||||
p++;
|
||||
num_digits++;
|
||||
num_decimals++;
|
||||
}
|
||||
|
||||
exponent -= num_decimals;
|
||||
}
|
||||
|
||||
if (num_digits == 0)
|
||||
{
|
||||
set_errno(ERANGE);
|
||||
number = 0.0F;
|
||||
p = (FAR char *)str;
|
||||
goto errout;
|
||||
}
|
||||
|
||||
/* Correct for sign */
|
||||
|
||||
if (negative)
|
||||
{
|
||||
number = -number;
|
||||
}
|
||||
|
||||
/* Process an exponent string */
|
||||
|
||||
if ((p10 == 10.0f && (*p == 'e' || *p == 'E'))
|
||||
|| (p10 == 16.0f && (*p == 'p' || *p == 'P')))
|
||||
{
|
||||
/* if the Hexadecimal system */
|
||||
|
||||
if (p10 == 16.0f)
|
||||
{
|
||||
exponent *= 4;
|
||||
p10 = 2.0f;
|
||||
}
|
||||
|
||||
/* Handle optional sign */
|
||||
|
||||
negative = 0;
|
||||
switch (*++p)
|
||||
{
|
||||
case '-':
|
||||
negative = 1; /* Fall through to increment pos */
|
||||
|
||||
/* FALLTHROUGH */
|
||||
|
||||
case '+':
|
||||
p++;
|
||||
|
||||
/* FALLTHROUGH */
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
/* Process string of digits */
|
||||
|
||||
if (!isdigit(*p))
|
||||
{
|
||||
set_errno(ERANGE);
|
||||
number = 0.0F;
|
||||
p = (FAR char *)str;
|
||||
goto errout;
|
||||
}
|
||||
|
||||
n = 0;
|
||||
while (isdigit(*p))
|
||||
{
|
||||
n = n * 10 + (*p - '0');
|
||||
p++;
|
||||
}
|
||||
|
||||
if (negative)
|
||||
{
|
||||
exponent -= n;
|
||||
}
|
||||
else
|
||||
{
|
||||
exponent += n;
|
||||
}
|
||||
}
|
||||
|
||||
if (exponent < __FLT_MIN_EXP__ ||
|
||||
exponent > __FLT_MAX_EXP__)
|
||||
{
|
||||
set_errno(ERANGE);
|
||||
if (exponent < __FLT_MIN_EXP__)
|
||||
{
|
||||
number = divzero;
|
||||
}
|
||||
else
|
||||
{
|
||||
number = infinite;
|
||||
}
|
||||
|
||||
goto errout;
|
||||
}
|
||||
|
||||
/* Scale the result */
|
||||
|
||||
n = exponent;
|
||||
if (n < 0)
|
||||
{
|
||||
n = -n;
|
||||
}
|
||||
|
||||
while (n)
|
||||
{
|
||||
if (n & 1)
|
||||
{
|
||||
if (exponent < 0)
|
||||
{
|
||||
number /= p10;
|
||||
}
|
||||
else
|
||||
{
|
||||
number *= p10;
|
||||
}
|
||||
}
|
||||
|
||||
n >>= 1;
|
||||
p10 *= p10;
|
||||
}
|
||||
|
||||
if (!is_real(number))
|
||||
{
|
||||
set_errno(ERANGE);
|
||||
}
|
||||
|
||||
errout:
|
||||
if (endptr)
|
||||
{
|
||||
*endptr = p;
|
||||
}
|
||||
|
||||
return number;
|
||||
}
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user