Re-verify ez80 build. Fixes to other ZiLOG architectures broke ez80 again.

2019-06-03 19:04:24 -06:00 · 2019-06-03 19:04:24 -06:00 · 59f3180179
commit 59f3180179
parent 622c272ea3
6 changed files with 141 additions and 118 deletions
--- a/arch/z80/include/irq.h
+++ b/arch/z80/include/irq.h
@ -48,4 +48,3 @@
 #include <arch/chip/irq.h>

 #endif /* __ARCH_Z80_INCLUDE_IRQ_H */
-
--- a/arch/z80/src/Makefile.zdsiil
+++ b/arch/z80/src/Makefile.zdsiil
@ -40,8 +40,8 @@

 SCHEDSRCDIR = $(TOPDIR)$(DELIM)sched
 ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
-ARCHCHIPDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)chip
-ARCHCMDDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)common
+ARCHCHIPDIR = $(ARCHSRCDIR)$(DELIM)chip
+ARCHCMDDIR = $(ARCHSRCDIR)$(DELIM)common

 WSCHEDSRCDIR = ${shell cygpath -w $(SCHEDSRCDIR)}
 WARCHCHIPDIR = ${shell cygpath -w $(ARCHCHIPDIR)}
--- a/arch/z80/src/common/up_doirq.c
+++ b/arch/z80/src/common/up_doirq.c
@ -54,22 +54,6 @@

 #include "group/group.h"

-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
 * Public Functions
 ****************************************************************************/
--- a/arch/z80/src/ez80/ez80_initialstate.c
+++ b/arch/z80/src/ez80/ez80_initialstate.c
@ -47,18 +47,6 @@
 #include "up_internal.h"
 #include "up_arch.h"

-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
 * Public Functions
 ****************************************************************************/
--- a/configs/ez80f910200zco/README.txt
+++ b/configs/ez80f910200zco/README.txt
@ -86,6 +86,14 @@ Version 5.3.0
     CSRCS += lib_dayofweek.c lib_asctime.c lib_asctimer.c lib_ctime.c
     CSRCS += lib_ctimer.c

+  And this:
+
+     stdlib\lib_strtof.c
+     stdlib\lib_strtof.c     (76,36) :       WARNING (32) Division by zero encountered
+     stdlib\lib_strtof.c     (102,36) :      WARNING (32) Division by zero encountered
+
+   Which can be worked around by removing it from the build
+
  The consequence is, of course, that these interfaces will not be available
  to applications.

--- a/include/nuttx/lib/float.h
+++ b/include/nuttx/lib/float.h
@ -59,18 +59,24 @@

 /* Number of base-FLT_RADIX digits in the floating-point significand, p. */

-#define FLT_MANT_DIG 24
-
-#ifdef CONFIG_HAVE_DOUBLE
-#  define DBL_MANT_DIG 53
-#else
-#  define DBL_MANT_DIG FLT_MANT_DIG
+#ifndef FLT_MANT_DIG  /* May be defined in a toolchain header */
+#  define FLT_MANT_DIG 24
 #endif

-#ifdef CONFIG_HAVE_LONG_DOUBLE
-#  define LDBL_MANT_DIG DBL_MANT_DIG /* FIX ME */
-#else
-#  define LDBL_MANT_DIG DBL_MANT_DIG
+#ifndef DBL_MANT_DIG  /* May be defined in a toolchain header */
+#  ifdef CONFIG_HAVE_DOUBLE
+#    define DBL_MANT_DIG 53
+#  else
+#    define DBL_MANT_DIG FLT_MANT_DIG
+#  endif
+#endif
+
+#ifndef LDBL_MANT_DIG  /* May be defined in a toolchain header */
+#  ifdef CONFIG_HAVE_LONG_DOUBLE
+#    define LDBL_MANT_DIG DBL_MANT_DIG /* FIX ME */
+#  else
+#    define LDBL_MANT_DIG DBL_MANT_DIG
+#  endif
 #endif

 /* Number of decimal digits, n, such that any floating-point number in the
@ -86,150 +92,188 @@
 * b digits and back again without change to the q decimal digits.
 */

-#define FLT_DIG 6
-
-#ifdef CONFIG_HAVE_DOUBLE
-#  define DBL_DIG 15  /* 10 */
-#else
-#  define DBL_DIG FLT_DIG
+#ifndef FLT_DIG  /* May be defined in a toolchain header */
+#  define FLT_DIG 6
 #endif

-#ifdef CONFIG_HAVE_LONG_DOUBLE
-#  define LDBL_DIG DBL_DIG  /* FIX ME */
-#else
-#  define LDBL_DIG DBL_DIG
+#ifndef DBL_DIG  /* May be defined in a toolchain header */
+#  ifdef CONFIG_HAVE_DOUBLE
+#    define DBL_DIG 15  /* 10 */
+#  else
+#    define DBL_DIG FLT_DIG
+#  endif
+#endif
+
+#ifndef LDBL_DIG  /* May be defined in a toolchain header */
+# ifdef CONFIG_HAVE_LONG_DOUBLE
+#    define LDBL_DIG DBL_DIG  /* FIX ME */
+#  else
+#    define LDBL_DIG DBL_DIG
+#  endif
 #endif

 /* Minimum negative integer such that FLT_RADIX raised to that power minus
 * 1 is a normalized floating-point number, emin.
 */

-#define FLT_MIN_EXP (-125)
-
-#ifdef CONFIG_HAVE_DOUBLE
-#  define DBL_MIN_EXP (-1021)
-#else
-#  define DBL_MIN_EXP FLT_MIN_EXP
+#ifndef FLT_MIN_EXP  /* May be defined in a toolchain header */
+#  define FLT_MIN_EXP (-125)
 #endif

-#ifdef CONFIG_HAVE_LONG_DOUBLE
-#  define LDBL_MIN_EXP DBL_MIN_EXP /* FIX ME */
-#else
-#  define LDBL_MIN_EXP DBL_MIN_EXP
+#ifndef DBL_MIN_EXP  /* May be defined in a toolchain header */
+#  ifdef CONFIG_HAVE_DOUBLE
+#    define DBL_MIN_EXP (-1021)
+#  else
+#    define DBL_MIN_EXP FLT_MIN_EXP
+#  endif
 #endif

-/* inimum negative integer such that 10 raised to that power is in the range
+#ifndef LDBL_MIN_EXP  /* May be defined in a toolchain header */
+#  ifdef CONFIG_HAVE_LONG_DOUBLE
+#    define LDBL_MIN_EXP DBL_MIN_EXP /* FIX ME */
+#  else
+#    define LDBL_MIN_EXP DBL_MIN_EXP
+#  endif
+#endif
+
+/* Minimum negative integer such that 10 raised to that power is in the range
 * of normalized floating-point numbers.
 */

-#define FLT_MIN_10_EXP (-37)
-
-#ifdef CONFIG_HAVE_DOUBLE
-#  define DBL_MIN_10_EXP (-307)  /* -37 */
-#else
-#  define DBL_MIN_10_EXP FLT_MIN_10_EXP
+#ifndef FLT_MIN_10_EXP  /* May be defined in a toolchain header */
+#  define FLT_MIN_10_EXP (-37)
 #endif

-#ifdef CONFIG_HAVE_LONG_DOUBLE
-#  define LDBL_MIN_10_EXP DBL_MIN_10_EXP  /* FIX ME */
-#else
-#  define LDBL_MIN_10_EXP DBL_MIN_10_EXP
+#ifndef DBL_MIN_10_EXP  /* May be defined in a toolchain header */
+#  ifdef CONFIG_HAVE_DOUBLE
+#    define DBL_MIN_10_EXP (-307)  /* -37 */
+#  else
+#    define DBL_MIN_10_EXP FLT_MIN_10_EXP
+#  endif
+#endif
+
+#ifndef LDBL_MIN_10_EXP  /* May be defined in a toolchain header */
+#  ifdef CONFIG_HAVE_LONG_DOUBLE
+#    define LDBL_MIN_10_EXP DBL_MIN_10_EXP  /* FIX ME */
+#  else
+#    define LDBL_MIN_10_EXP DBL_MIN_10_EXP
+#  endif
 #endif

 /* Maximum integer such that FLT_RADIX raised to that power minus 1 is a
 * representable finite floating-point number, emax.
 */

-#ifndef FLT_MAX_EXP         /* May be defined in system header */
+#ifndef FLT_MAX_EXP  /* May be defined in a toolchain header */
 #  define FLT_MAX_EXP 128
 #endif

-#ifdef CONFIG_HAVE_DOUBLE
-#  define DBL_MAX_EXP 1024
-#else
-#  define DBL_MAX_EXP FLT_MAX_EXP
+#ifndef DBL_MAX_EXP  /* May be defined in a toolchain header */
+#  ifdef CONFIG_HAVE_DOUBLE
+#    define DBL_MAX_EXP 1024
+#  else
+#    define DBL_MAX_EXP FLT_MAX_EXP
+#  endif
 #endif

-#ifdef CONFIG_HAVE_LONG_DOUBLE
-#  define LDBL_MAX_EXP DBL_MAX_EXP /* FIX ME */
-#else
-#  define LDBL_MAX_EXP DBL_MAX_EXP
+#ifndef LDBL_MAX_EXP  /* May be defined in a toolchain header */
+#  ifdef CONFIG_HAVE_LONG_DOUBLE
+#    define LDBL_MAX_EXP DBL_MAX_EXP /* FIX ME */
+#  else
+#    define LDBL_MAX_EXP DBL_MAX_EXP
+#  endif
 #endif

 /* Maximum integer such that 10 raised to that power is in the range of
 * representable finite floating-point numbers.
 */

-#ifndef FLT_MAX_10_EXP       /* May be defined in system header */
+#ifndef FLT_MAX_10_EXP       /* May be defined in toolchain header */
 #  define FLT_MAX_10_EXP 38  /* 37 */
 #endif

-#ifdef CONFIG_HAVE_DOUBLE
-#  define DBL_MAX_10_EXP 308  /* 37 */
-#else
-#  define DBL_MAX_10_EXP FLT_MAX_10_EXP
+#ifndef DBL_MAX_10_EXP          /* May be defined in toolchain header */
+#  ifdef CONFIG_HAVE_DOUBLE
+#    define DBL_MAX_10_EXP 308  /* 37 */
+#  else
+#    define DBL_MAX_10_EXP FLT_MAX_10_EXP
+#  endif
 #endif

-#ifdef CONFIG_HAVE_LONG_DOUBLE
-#  define LDBL_MAX_10_EXP DBL_MAX_10_EXP  /* FIX ME */
-#else
-#  define LDBL_MAX_10_EXP DBL_MAX_10_EXP
+#ifndef LDBL_MAX_10_EXP      /* May be defined in toolchain header */
+#  ifdef CONFIG_HAVE_LONG_DOUBLE
+#    define LDBL_MAX_10_EXP DBL_MAX_10_EXP  /* FIX ME */
+#  else
+#    define LDBL_MAX_10_EXP DBL_MAX_10_EXP
+#  endif
 #endif

 /* Maximum representable finite floating-point number. */

-#ifndef FLT_MAX_EXP                /* May be defined in system header */
+#ifndef FLT_MAX                    /* May be defined in toolchain header */
 #  define FLT_MAX 3.40282347e+38F  /* 1E+37 */
 #endif

-#ifdef CONFIG_HAVE_DOUBLE
-#  define DBL_MAX 1.7976931348623157e+308  /* 1E+37 */
-#else
-#  define DBL_MAX FLT_MAX
+#ifndef DBL_MAX                    /* May be defined in toolchain header */
+#  ifdef CONFIG_HAVE_DOUBLE
+#    define DBL_MAX 1.7976931348623157e+308  /* 1E+37 */
+#  else
+#    define DBL_MAX FLT_MAX
+#  endif
 #endif

-#ifdef CONFIG_HAVE_LONG_DOUBLE
-#  define LDBL_MAX DBL_MAX  /* FIX ME */
-#else
-#  define LDBL_MAX DBL_MAX
+#ifndef LDBL_MAX                   /* May be defined in toolchain header */
+#  ifdef CONFIG_HAVE_LONG_DOUBLE
+#    define LDBL_MAX DBL_MAX       /* FIX ME */
+#  else
+#    define LDBL_MAX DBL_MAX
+#  endif
 #endif

 /* The difference between 1 and the least value greater than 1 that is
 * representable in the given floating-point type, b1-p.
 */

-#ifndef FLT_EPSILON                   /* May be defined in system header */
-#  define FLT_EPSILON 1.1920929e-07F  /* 1E-5 */
+#ifndef FLT_EPSILON                  /* May be defined in toolchain header */
+#  define FLT_EPSILON 1.1920929e-07F /* 1E-5 */
 #endif

-#ifdef CONFIG_HAVE_DOUBLE
-#  define DBL_EPSILON 2.2204460492503131e-16  /* 1E-9 */
-#else
-#  define DBL_EPSILON FLT_EPSILON
+#ifndef DBL_EPSILON                  /* May be defined in toolchain header */
+#  ifdef CONFIG_HAVE_DOUBLE
+#    define DBL_EPSILON 2.2204460492503131e-16  /* 1E-9 */
+#  else
+#    define DBL_EPSILON FLT_EPSILON
+#  endif
 #endif

-#ifdef CONFIG_HAVE_LONG_DOUBLE
-#  define LDBL_EPSILON DBL_EPSILON /* FIX ME */
-#else
-#  define LDBL_EPSILON DBL_EPSILON
+#ifndef LDBL_EPSILON                 /* May be defined in toolchain header */
+#  ifdef CONFIG_HAVE_LONG_DOUBLE
+#    define LDBL_EPSILON DBL_EPSILON /* FIX ME */
+#  else
+#    define LDBL_EPSILON DBL_EPSILON
+#  endif
 #endif

 /* Minimum normalized positive floating-point number, bemin -1. */

-#ifndef FLT_EPSILON                /* May be defined in system header */
+#ifndef FLT_MIN                    /* May be defined in toolchain header */
 #  define FLT_MIN 1.17549435e-38F  /* 1E-37 */
 #endif

-#ifdef CONFIG_HAVE_DOUBLE
-#  define DBL_MIN 2.2250738585072014e-308  /* 1E-37 */
-#else
-#  define DBL_MIN FLT_MIN
+#ifndef DBL_MIN                    /* May be defined in toolchain header */
+#  ifdef CONFIG_HAVE_DOUBLE
+#    define DBL_MIN 2.2250738585072014e-308  /* 1E-37 */
+#  else
+#    define DBL_MIN FLT_MIN
+#  endif
 #endif

-#ifdef CONFIG_HAVE_LONG_DOUBLE
-#  define LDBL_MIN DBL_MIN /* FIX ME */
-#else
-#  define LDBL_MIN DBL_MIN
+#ifndef LDBL_MIN                    /* May be defined in toolchain header */
+#  ifdef CONFIG_HAVE_LONG_DOUBLE
+#    define LDBL_MIN DBL_MIN        /* FIX ME */
+#  else
+#    define LDBL_MIN DBL_MIN
+#  endif
 #endif

 #endif /* __INCLUDE_NUTTX_LIB_FLOAT_H */