mirror of
https://github.com/esp8266/Arduino.git
synced 2025-04-19 23:22:16 +03:00
* Move to PROGMEM aware libc, allow PSTR in printf() A Newlib (libc) patch is in progress to move the _P functions from inside Arduino into first-class citizens in libc. This Arduino patch cleans up code that's been migrated there. Binaries for the new libs are included because it seems they're part of the Arduino git tree, and should be replaced with @igrr built ones when/if the Newlib changes are accepted. Notable changes/additions for Arduino: Allow for use of PROGMEM based format and parameter strings in all *printf functions. No need for copying PSTR()s into RAM before printing them out (transparently saves heap space when using _P functions) and makes it easier to print out constant strings for applications. Add "%S" (capital-S) format that I've been told, but cannot verify, is used in Arduino to specify a PROGMEM string parameter in printfs, as an alias for "%s" since plain "%s" can now handle PROGMEM. Optimized the memcpy_P, strnlen_P, and strncpy_P functions to use 32-bit direct reads whenver possible (source and dest alignment mediated), but there is still room for improvement in others. Finally, move several constant arrays from RODATA into PROGMEM and update their accessors. Among these are the ctype array, ~260 bytes, mprec* arrays, ~300 bytes, and strings/daycounts in the time formatting functions, ~200 bytes. All told, sketches will see from 300 to 800 additional RAM heap free on startup (depending on their use of these routines). * Fix merge error in #ifdef/#endif * Fix host test using the newlib generic pgmspace.h Host tests now use the sys/pgmspace.h for compiles instead of the ESP8266-specific version. * Update with rebuilt libraries using latest newlib * Include binaries built directly from @igrr repo Rebuild the binaries using a git clone of https://github.com/igrr/newlib-xtensa Build commands for posterity: ```` rm -rf ./xtensa-lx106-elf/ ./configure --prefix=<DIR>/esp8266/tools/sdk/libc --with-newlib \ --enable-multilib --disable-newlib-io-c99-formats \ --disable-newlib-supplied-syscalls \ --enable-newlib-nano-formatted-io --enable-newlib-reent-small \ --enable-target-optspace \ --program-transform-name="s&^&xtensa-lx106-elf-&" \ --disable-option-checking --with-target-subdir=xtensa-lx106-elf \ --target=xtensa-lx106-elf rm -f etc/config.cache CROSS_CFLAGS="-fno-omit-frame-pointer -DSIGNAL_PROVIDED -DABORT_PROVIDED"\ " -DMALLOC_PROVIDED" \ PATH=<DIR>/esp8266/tools/xtensa-lx106-elf/bin/:$PATH \ make all install ```` * Fix merge define conflict in c_types.h * Fix strlen_P misaligned source error Include fix from newlib-xtensa/fix-strlen branch cleaning up misaligned access on a non-aligned source string. * Fix strlen_P and strcpy_P edge cases Ran the included test suite on ESP8266 tstring.c with the following defines: #define MAX_1 50 #define memcmp memcmp_P #define memcpy memcpy_P #define memmem memmem_P #define memchr memchr_P #define strcat strcat_P #define strncat strncat_P #define strcpy strcpy_P #define strlen strlen_P #define strnlen strnlen_P #define strcmp strcmp_P #define strncmp strncmp_P Uncovered edge case and return value problems in the optimized versions of the strnlen_P and strncpy_P functions. Corrected. * Fix memcpy_P return value memcpy-1.c test suite showed error in return value of memcpy_P. Correct it. * Fix strnlen_P/strlen_P off-by-4 error Random crashes, often on String constructors using a PSTR, would occur due to the accelerated strnlen_P going past the end of the string. Would make debug builds fail, too (ESP.getVersionString() failure). Fix to fall through to normal copy on a word that's got a 0 byte anywhere in it. * Add device tests for libc functional verification Add test suite used to debug libc optimized _P functions to the device tests. * Rebuild from igrr's repo (same source as prior) Rebuild .a from igrr's repo at 347260af117b4177389e69fd4d04169b11d87a97 * WIP - add exceptions * Fix exception to have 0-terminator * Move some exception constants to TEXT from RODATA * Remove throw stubs * Move more exception stuff to ROM * Enable exceptions in platform.io * Remove atexit, is duplicated in rebuilt lib Need to look at the quick-toolchain options, there seems to be a definition for atexit defined there (libgcc?) that needs to be excised. For now, remove our local do-nothing copy. * Update libgcc to remove soft-fp functions The esp-quick-toolchain generated libgcc.a needed to have the soft-FP routines that are in ROM removed from it. Remove them in the new esp-quick-toolchain and update. * Fix merge typos in Makefile * Add unhandled exception handler to postmortem * Return our atexit() handler * Latest stdc++, minimize exception emercengy area * Remove atexit from newlib atexit was defined in newlib strongly, but we also define a noop atexit in core. Since we never exit, use the core's noop and delete the atexit from libc.a Updated in esp-quick-toolchain as well. * Move __FUNCTION__ static strings to PROGMEM __FUNCTION__ is unlikely to be a timing sensitive variable, so move it to PROGMEM and not RODATA (RAM) using linker magic. asserts() now should take no RAM for any strings. * Clean up linker file, update to latest stdc++ * Update to latest stdc++ which doesn't call strerror * Update to GCC5.1 exception emergency allocator Using GCC 5.1's emergency memory allocator for exceptions, much less space is required in programs which do not use exceptions and when space is allocated it is managed more efficiently. * Initial try with new compiler toolchain * Include newlib built from esp-quick-toolchain * Update JSON with all new esp-quick-toolchain builds * Use 64bit Windows compiler on 64bit Windows * Dump std::exception.what() when possible When doing the panic on unhandled exceptions, try and grab the .what() pointer and dump it as part of the termination info. Makes it easy to see mem errors (std::bad_alloc) or std::runtime_error strings. * Use scripted install from esp-quick-toolchain Makes sure proper libraries and includes are present by using a scripted installation from esp-quick-install instead of a manual one. * Update eqk to remove atexit, fix packaging diff
195 lines
5.3 KiB
C
195 lines
5.3 KiB
C
/* A minor test-program for memmove.
|
|
Copyright (C) 2005 Axis Communications.
|
|
All rights reserved.
|
|
|
|
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. Neither the name of Axis Communications 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 AXIS COMMUNICATIONS AND ITS 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 AXIS
|
|
COMMUNICATIONS OR ITS 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. */
|
|
|
|
/* Test moves of 0..MAX bytes; overlapping-src-higher,
|
|
overlapping-src-lower and non-overlapping. The overlap varies with
|
|
1..N where N is the size moved. This means an order of MAX**2
|
|
iterations. The size of an octet may seem appropriate for MAX and
|
|
makes an upper limit for simple testing. For the CRIS simulator,
|
|
making this 256 added 90s to the test-run (2GHz P4) while 64 (4s) was
|
|
enough to spot the bugs that had crept in, hence the number chosen. */
|
|
#define MAX 64
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#define memcmp memcmp_P
|
|
#define memcpy memcpy_P
|
|
#define memmem memmem_P
|
|
#define memchr memchr_P
|
|
#define strcat strcat_P
|
|
#define strncat strncat_P
|
|
#define strcpy strcpy_P
|
|
#define strncpy strncpy_P
|
|
#define strlen strlen_P
|
|
#define strnlen strnlen_P
|
|
#define strcmp strcmp_P
|
|
#define strncmp strncmp_P
|
|
|
|
#define TOO_MANY_ERRORS 11
|
|
int errors = 0;
|
|
|
|
#define DEBUGP \
|
|
if (errors == TOO_MANY_ERRORS) \
|
|
printf ("Further errors omitted\n"); \
|
|
else if (errors < TOO_MANY_ERRORS) \
|
|
printf
|
|
|
|
/* A safe target-independent memmove. */
|
|
|
|
void
|
|
mymemmove (unsigned char *dest, unsigned char *src, size_t n)
|
|
{
|
|
if ((src <= dest && src + n <= dest)
|
|
|| src >= dest)
|
|
while (n-- > 0)
|
|
*dest++ = *src++;
|
|
else
|
|
{
|
|
dest += n;
|
|
src += n;
|
|
while (n-- > 0)
|
|
*--dest = *--src;
|
|
}
|
|
}
|
|
|
|
/* It's either the noinline attribute or forcing the test framework to
|
|
pass -fno-builtin-memmove. */
|
|
void
|
|
xmemmove (unsigned char *dest, unsigned char *src, size_t n)
|
|
__attribute__ ((__noinline__));
|
|
|
|
void
|
|
xmemmove (unsigned char *dest, unsigned char *src, size_t n)
|
|
{
|
|
void *retp;
|
|
retp = memmove (dest, src, n);
|
|
|
|
if (retp != dest)
|
|
{
|
|
errors++;
|
|
DEBUGP ("memmove of n bytes returned %p instead of dest=%p\n",
|
|
retp, dest);
|
|
}
|
|
}
|
|
|
|
|
|
/* Fill the array with something we can associate with a position, but
|
|
not exactly the same as the position index. */
|
|
|
|
void
|
|
fill (unsigned char dest[MAX*3])
|
|
{
|
|
size_t i;
|
|
for (i = 0; i < MAX*3; i++)
|
|
dest[i] = (10 + i) % MAX;
|
|
}
|
|
|
|
void memmove_main(void)
|
|
{
|
|
size_t i;
|
|
int errors = 0;
|
|
|
|
/* Leave some room before and after the area tested, so we can detect
|
|
overwrites of up to N bytes, N being the amount tested. If you
|
|
want to test using valgrind, make these malloced instead. */
|
|
unsigned char from_test[MAX*3];
|
|
unsigned char to_test[MAX*3];
|
|
unsigned char from_known[MAX*3];
|
|
unsigned char to_known[MAX*3];
|
|
|
|
/* Non-overlap. */
|
|
for (i = 0; i < MAX; i++)
|
|
{
|
|
/* Do the memmove first before setting the known array, so we know
|
|
it didn't change any of the known array. */
|
|
fill (from_test);
|
|
fill (to_test);
|
|
xmemmove (to_test + MAX, 1 + from_test + MAX, i);
|
|
|
|
fill (from_known);
|
|
fill (to_known);
|
|
mymemmove (to_known + MAX, 1 + from_known + MAX, i);
|
|
|
|
if (memcmp (to_known, to_test, sizeof (to_known)) != 0)
|
|
{
|
|
errors++;
|
|
DEBUGP ("memmove failed non-overlap test for %d bytes\n", i);
|
|
}
|
|
}
|
|
|
|
/* Overlap-from-before. */
|
|
for (i = 0; i < MAX; i++)
|
|
{
|
|
size_t j;
|
|
for (j = 0; j < i; j++)
|
|
{
|
|
fill (to_test);
|
|
xmemmove (to_test + MAX * 2 - i, to_test + MAX * 2 - i - j, i);
|
|
|
|
fill (to_known);
|
|
mymemmove (to_known + MAX * 2 - i, to_known + MAX * 2 - i - j, i);
|
|
|
|
if (memcmp (to_known, to_test, sizeof (to_known)) != 0)
|
|
{
|
|
errors++;
|
|
DEBUGP ("memmove failed for %d bytes,"
|
|
" with src %d bytes before dest\n",
|
|
i, j);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Overlap-from-after. */
|
|
for (i = 0; i < MAX; i++)
|
|
{
|
|
size_t j;
|
|
for (j = 0; j < i; j++)
|
|
{
|
|
fill (to_test);
|
|
xmemmove (to_test + MAX, to_test + MAX + j, i);
|
|
|
|
fill (to_known);
|
|
mymemmove (to_known + MAX, to_known + MAX + j, i);
|
|
|
|
if (memcmp (to_known, to_test, sizeof (to_known)) != 0)
|
|
{
|
|
errors++;
|
|
DEBUGP ("memmove failed when moving %d bytes,"
|
|
" with src %d bytes after dest\n",
|
|
i, j);
|
|
}
|
|
}
|
|
}
|
|
|
|
if (errors != 0)
|
|
abort ();
|
|
printf("ok\n");
|
|
}
|