Add memchr from freeBSD (to enable printf!)

This commit is contained in:
Francesco Conti 2024-05-19 23:35:28 +02:00
parent 7b50643266
commit a8486d33a2
2 changed files with 58 additions and 1 deletions

57
lib/libc/minimal/memchr.c Normal file
View file

@ -0,0 +1,57 @@
/*-
* SPDX-License-Identifier: MIT
*
* Copyright (c) 2005-2014 Rich Felker, et al.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
/*
* This is a lightly patched version of FreeBSD's memchr.
* https://cgit.freebsd.org/src/tree/lib/libc/string/memchr.c?h=releng/13.1
*/
#include <stdint.h>
#include <string.h>
#define SS (sizeof(size_t))
#define ALIGN (sizeof(size_t) - 1)
#define ONES ((size_t)-1 / 255)
#define HIGHS (ONES * (255 / 2 + 1))
#define HASZERO(x) (((x)-ONES) & ~(x)&HIGHS)
void * memchr(const void *src, int c, size_t n) {
const unsigned char *s = src;
c = (unsigned char)c;
for (; ((uintptr_t)s & ALIGN) && n && *s != c; s++, n--)
;
if (n && *s != c) {
typedef size_t __attribute__((__may_alias__)) word;
const word *w;
size_t k = ONES * c;
for (w = (const void *)s; n >= SS && !HASZERO(*w ^ k);
w++, n -= SS)
;
s = (const void *)w;
}
for (; n && *s != c; s++, n--)
;
return n ? (void *)s : 0;
}

View file

@ -3,7 +3,7 @@ PULP_ASM_SRCS += kernel/crt0.S
endif
ifeq '$(CONFIG_LIBC_MINIMAL)' '1'
PULP_SRCS += lib/libc/minimal/io.c lib/libc/minimal/fprintf.c lib/libc/minimal/prf.c lib/libc/minimal/sprintf.c
PULP_SRCS += lib/libc/minimal/io.c lib/libc/minimal/fprintf.c lib/libc/minimal/prf.c lib/libc/minimal/sprintf.c lib/libc/minimal/memchr.c
endif
PULP_SRCS += kernel/init.c kernel/kernel.c kernel/alloc.c kernel/alloc_pool.c kernel/irq.c kernel/soc_event.c kernel/bench.c drivers/uart.c