diff --git a/arch/x86_64/console.c b/arch/x86_64/console.c new file mode 100644 index 0000000..fa00d36 --- /dev/null +++ b/arch/x86_64/console.c @@ -0,0 +1,105 @@ +#include +#include +#include +#include + +#define VGA_PORT_CMD 0x3D4 +#define VGA_PORT_DATA 0x3D5 + +#define VGA_CHAR(ch, attrib) ((uint16_t)(ch) | ((uint16_t)(attrib) << 8)) +#define DEFAULT_ATTRIB 0x07 + +static uint16_t *g_console_fb = (uint16_t *)0xb8000; +static const unsigned int k_console_width = 80; +static const unsigned int k_console_height = 25; +static unsigned int g_console_cursor_xpos = 0; +static unsigned int g_console_cursor_ypos = 0; + +static void init_vga_cursor(void) +{ + unsigned int start = 0, end = 15; + outportb(VGA_PORT_CMD, 0x0A); + outportb(VGA_PORT_DATA, (inportb(VGA_PORT_DATA) & 0xC0) | start); + + outportb(VGA_PORT_CMD, 0x0B); + outportb(VGA_PORT_DATA, (inportb(VGA_PORT_DATA) & 0xE0) | end); +} + +static void move_vga_cursor(unsigned int x, unsigned int y) +{ + unsigned int offset = y * k_console_width + x; + + outportb(VGA_PORT_CMD, 0x0F); + outportb(VGA_PORT_DATA, (uint8_t)(offset & 0xFF)); + + outportb(VGA_PORT_CMD, 0x0E); + outportb(VGA_PORT_DATA, (uint8_t)((offset >> 8) & 0xFF)); +} + +void ml_console_init(void) +{ + g_console_cursor_xpos = 0; + g_console_cursor_ypos = 5; + + init_vga_cursor(); + move_vga_cursor(g_console_cursor_xpos, g_console_cursor_ypos); +} + +static void scroll_display() +{ + uint16_t *src = g_console_fb + k_console_width; + uint16_t *dst = g_console_fb; + size_t n = k_console_width * (k_console_height - 1) * 2; + + memmove(dst, src, n); + + dst = g_console_fb + ((k_console_height - 1) * k_console_width); + + for (int i = 0; i < k_console_width; i++) { + dst[i] = VGA_CHAR(0, DEFAULT_ATTRIB); + } +} + +static void handle_ctrl(int c) +{ + switch (c) { + case '\n': + g_console_cursor_xpos = 0; + g_console_cursor_ypos++; + + if (g_console_cursor_ypos >= k_console_height) { + scroll_display(); + g_console_cursor_ypos = k_console_height - 1; + } + break; + default: + break; + } + + move_vga_cursor(g_console_cursor_xpos, g_console_cursor_ypos); +} + +void ml_console_putchar(int c) +{ + if (iscntrl(c)) { + handle_ctrl(c); + return; + } + + g_console_fb[(g_console_cursor_ypos * k_console_width) + g_console_cursor_xpos] = VGA_CHAR(c, DEFAULT_ATTRIB); + + g_console_cursor_xpos++; + + if (g_console_cursor_xpos >= k_console_width) { + g_console_cursor_xpos = 0; + g_console_cursor_ypos++; + } + + if (g_console_cursor_ypos >= k_console_height) { + scroll_display(); + g_console_cursor_ypos = k_console_height - 1; + g_console_cursor_xpos = 0; + } + + move_vga_cursor(g_console_cursor_xpos, g_console_cursor_ypos); +} diff --git a/arch/x86_64/include/socks/machine/console.h b/arch/x86_64/include/socks/machine/console.h new file mode 100644 index 0000000..a4100a5 --- /dev/null +++ b/arch/x86_64/include/socks/machine/console.h @@ -0,0 +1,7 @@ +#ifndef SOCKS_X86_64_CONSOLE_H_ +#define SOCKS_X86_64_CONSOLE_H_ + +extern void ml_console_init(void); +extern void ml_console_putchar(int c); + +#endif diff --git a/arch/x86_64/include/socks/machine/cpu.h b/arch/x86_64/include/socks/machine/cpu.h new file mode 100644 index 0000000..fbfbbfc --- /dev/null +++ b/arch/x86_64/include/socks/machine/cpu.h @@ -0,0 +1,11 @@ +#ifndef SOCKS_X86_64_CPU_H_ +#define SOCKS_X86_64_CPU_H_ + +typedef struct ml_cpu_block { + +} ml_cpu_block; + +extern int ml_cpu_block_init(ml_cpu_block *p); +extern int ml_cpu_block_use(ml_cpu_block *p); + +#endif diff --git a/arch/x86_64/include/socks/machine/init.h b/arch/x86_64/include/socks/machine/init.h new file mode 100644 index 0000000..cbdf5de --- /dev/null +++ b/arch/x86_64/include/socks/machine/init.h @@ -0,0 +1,8 @@ +#ifndef SOCKS_X86_64_INIT_H_ +#define SOCKS_X86_64_INIT_H_ + +#include + +extern int machine_init(uintptr_t arg); + +#endif diff --git a/arch/x86_64/include/socks/machine/ports.h b/arch/x86_64/include/socks/machine/ports.h new file mode 100644 index 0000000..2b75797 --- /dev/null +++ b/arch/x86_64/include/socks/machine/ports.h @@ -0,0 +1,17 @@ +#ifndef SOCKS_X86_64_PORTS_H_ +#define SOCKS_X86_64_PORTS_H_ + +#include + +#define PF_IOPORT_COUNT (65536) + +extern uint8_t inportb(uint16_t port); +extern uint16_t inportw(uint16_t port); +extern uint32_t inportl(uint16_t port); +extern void outportb(uint16_t port, uint8_t data); +extern void outportw(uint16_t port, uint16_t data); +extern void outportl(uint16_t port, uint32_t data); +extern void outportsw(uint16_t port, void *data, uint32_t size); +extern void inportsw(uint16_t port, unsigned char *data, unsigned long size); + +#endif diff --git a/arch/x86_64/ports.c b/arch/x86_64/ports.c new file mode 100644 index 0000000..f0c3526 --- /dev/null +++ b/arch/x86_64/ports.c @@ -0,0 +1,39 @@ +#include + +uint8_t inportb(uint16_t port) { + uint8_t data; + asm volatile("inb %1, %0" : "=a"(data) : "dN"(port)); + return data; +} + +void outportb(uint16_t port, uint8_t data) { + asm volatile("outb %1, %0" : : "dN"(port), "a"(data)); +} + +uint16_t inportw(uint16_t port) { + uint16_t data; + asm volatile("inw %1, %0" : "=a"(data) : "dN"(port)); + return data; +} + +void outportw(uint16_t port, uint16_t data) { + asm volatile("outw %1, %0" : : "dN"(port), "a"(data)); +} + +uint32_t inportl(uint16_t port) { + uint32_t data; + asm volatile("inl %%dx, %%eax" : "=a"(data) : "dN"(port)); + return data; +} + +void outportl(uint16_t port, uint32_t data) { + asm volatile("outl %%eax, %%dx" : : "dN"(port), "a"(data)); +} + +void outportsw(uint16_t port, void *data, uint32_t size) { + asm volatile("rep outsw" : "+S"(data), "+c"(size) : "d"(port)); +} + +void inportsw(uint16_t port, unsigned char *data, unsigned long size) { + asm volatile("rep insw" : "+D"(data), "+c"(size) : "d"(port) : "memory"); +} diff --git a/include/socks/compiler.h b/include/socks/compiler.h new file mode 100644 index 0000000..3848ce8 --- /dev/null +++ b/include/socks/compiler.h @@ -0,0 +1,8 @@ +#ifndef SOCKS_COMPILER_H_ +#define SOCKS_COMPILER_H_ + +#define __used __attribute__((used)) + +#define __section(name) __attribute__((section(name))) + +#endif diff --git a/include/socks/console.h b/include/socks/console.h new file mode 100644 index 0000000..2c3d54b --- /dev/null +++ b/include/socks/console.h @@ -0,0 +1,7 @@ +#ifndef SOCKS_CONSOLE_H_ +#define SOCKS_CONSOLE_H_ + +extern void console_init(void); +extern void console_putchar(int c); + +#endif diff --git a/include/socks/init.h b/include/socks/init.h new file mode 100644 index 0000000..d656321 --- /dev/null +++ b/include/socks/init.h @@ -0,0 +1,32 @@ +#ifndef SOCKS_INIT_H_ +#define SOCKS_INIT_H_ + +#include + +typedef int (*initcall_t)(void); + +#define __INITLEVEL_EARLY 0 +#define __INITLEVEL_CORE 1 +#define __INITLEVEL_POSTCORE 2 +#define __INITLEVEL_ARCH 3 +#define __INITLEVEL_SUBSYS 4 +#define __INITLEVEL_ROOTFS 5 +#define __INITLEVEL_DEVICE 6 +#define __INITLEVEL_LATE 7 + +#define __define_initcall(fn, id) \ + static initcall_t __initcall_##fn##id __used \ + __section(".initcall" #id ".init") = (fn) + +#define early_initcall(fn) __define_initcall(fn, __INITLEVEL_EARLY) +#define core_initcall(fn) __define_initcall(fn, __INITLEVEL_CORE) +#define postcore_initcall(fn) __define_initcall(fn, __INITLEVEL_POSTCORE) +#define arch_initcall(fn) __define_initcall(fn, __INITLEVEL_ARCH) +#define subsys_initcall(fn) __define_initcall(fn, __INITLEVEL_SUBSYS) +#define rootfs_initcall(fn) __define_initcall(fn, __INITLEVEL_ROOTFS) +#define device_initcall(fn) __define_initcall(fn, __INITLEVEL_DEVICE) +#define late_initcall(fn) __define_initcall(fn, __INITLEVEL_LATE) + +extern int do_initcalls(void); + +#endif diff --git a/init/init.c b/init/init.c new file mode 100644 index 0000000..ab1b266 --- /dev/null +++ b/init/init.c @@ -0,0 +1,5 @@ +#include + +int do_initcalls(void) +{ +} diff --git a/init/main.c b/init/main.c new file mode 100644 index 0000000..1ef73f2 --- /dev/null +++ b/init/main.c @@ -0,0 +1,14 @@ +#include +#include +#include +#include +#include + +void kernel_init(uintptr_t arg) +{ + console_init(); + + for (int i = 0; i < 20; i++) { + printf("Line %d\n", i); + } +} diff --git a/kernel/console.c b/kernel/console.c new file mode 100644 index 0000000..7f218ae --- /dev/null +++ b/kernel/console.c @@ -0,0 +1,12 @@ +#include +#include + +void console_init(void) +{ + ml_console_init(); +} + +void console_putchar(int c) +{ + ml_console_putchar(c); +} diff --git a/libc/ctype/ctype.c b/libc/ctype/ctype.c new file mode 100644 index 0000000..0b5d06e --- /dev/null +++ b/libc/ctype/ctype.c @@ -0,0 +1,94 @@ +/* + * asbestOS: The best operating system ever made. + * Copyright (C) 2017 Max Wash + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include +#include + +static unsigned int random_seed = 53455346; + +int isupper(int c) { return (c >= 65 && c <= 90); } + +int islower(int c) { return (c >= 97 && c <= 122); } + +int toupper(int c) { + if (!islower(c)) { + return c; + } + + return c - 32; +} + +int tolower(int c) { + if (!isupper(c)) { + return c; + } + + return c + 32; +} + +int isdigit(int c) { return (c >= 48 && c <= 57); } + +int isalpha(int c) { return (c >= 65 && c <= 90) || (c >= 97 && c <= 122); } + +int isalnum(int c) { return isalpha(c) | isdigit(c); } + +int iscntrl(int c) { return (c <= 31) || (c == 127); } + +int isprint(int c) { return (c >= 32 && c <= 126) || (c >= 128 && c <= 254); } + +int isgraph(int c) { return isprint(c) && c != 32; } + +int ispunct(int c) { return isgraph(c) && !isalnum(c); } + +int isspace(int c) { + return (c == ' ') || (c == '\t') || (c == '\n') || (c == '\v') || + (c == '\f') || (c == '\r'); +} + +int isxdigit(int c) { + return isdigit(c) || (c >= 65 && c <= 70) || (c >= 97 && c <= 102); +} + +bool fill_random(unsigned char *buffer, unsigned int size) { + if (!buffer || !size) { + return false; + } + + for (uint32_t i = 0; i < size; i++) { + uint32_t next = random_seed; + uint32_t result; + + next *= 1103515245; + next += 12345; + result = (uint32_t)(next / 65536) % 2048; + + next *= 1103515245; + next += 12345; + result <<= 10; + result ^= (uint32_t)(next / 65536) % 1024; + + next *= 1103515245; + next += 12345; + result <<= 10; + result ^= (uint32_t)(next / 65536) % 1024; + random_seed = next; + + buffer[i] = (uint8_t)(result % 256); + } + + return true; +} diff --git a/libc/include/socks/libc/ctype.h b/libc/include/socks/libc/ctype.h new file mode 100644 index 0000000..32fb2ed --- /dev/null +++ b/libc/include/socks/libc/ctype.h @@ -0,0 +1,27 @@ +#ifndef SOCKS_LIBC_TYPES_H_ +#define SOCKS_LIBC_TYPES_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +extern int isalnum(int c); +extern int isalpha(int c); +extern int iscntrl(int c); +extern int isdigit(int c); +extern int isgraph(int c); +extern int islower(int c); +extern int isprint(int c); +extern int ispunct(int c); +extern int isspace(int c); +extern int isupper(int c); +extern int isxdigit(int c); +extern int tolower(int c); +extern int toupper(int c); +extern int fill_random(unsigned char *buffer, unsigned int size); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/libc/include/socks/libc/stdio.h b/libc/include/socks/libc/stdio.h new file mode 100644 index 0000000..6d2a8e6 --- /dev/null +++ b/libc/include/socks/libc/stdio.h @@ -0,0 +1,32 @@ +#ifndef SOCKS_STDIO_H_ +#define SOCKS_STDIO_H_ + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#define printf printf_ +int printf_(const char *format, ...); + +#define sprintf sprintf_ +int sprintf_(char *buffer, const char *format, ...); + +#define snprintf snprintf_ +#define vsnprintf vsnprintf_ +int snprintf_(char *buffer, size_t count, const char *format, ...); +int vsnprintf_(char *buffer, size_t count, const char *format, va_list va); + +#define vprintf vprintf_ +int vprintf_(const char *format, va_list va); + +int fctprintf(void (*out)(char character, void *arg), void *arg, const char*format, ...); + + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/libc/include/socks/libc/string.h b/libc/include/socks/libc/string.h new file mode 100644 index 0000000..87c2c3f --- /dev/null +++ b/libc/include/socks/libc/string.h @@ -0,0 +1,36 @@ +#ifndef SOCKS_LIBC_STRING_H_ +#define SOCKS_LIBC_STRING_H_ + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern char *strcpy(char *output, const char *input); +extern char *strncpy(char *output, const char *input, unsigned int count); +extern char *strchrnul(const char *s, int c); +extern char *strchr(const char *s, int c); +extern size_t lfind(const char *str, const char accept); +extern size_t strspn(const char *s, const char *c); +extern size_t strcspn(const char *s, const char *c); +extern char *strpbrk(const char *s, const char *b); +extern size_t strlen(const char *str); +extern char *strrchr(const char *str, int c); +extern int strcmp(const char *s1, const char *s2); +extern int strncmp(const char *s1, const char *s2, unsigned int n); +extern void *memcpy(void *str1, const void *str2, size_t n); +extern int memcmp(const void *str1, const void *str2, size_t n); +extern void *memset(void *str, int c, size_t n); +extern void *memmove(void *dst, const void *src, size_t n); +extern char *strdup(const char *src); +extern char *strtok_r(char *str, const char *delim, char **saveptr); +extern char *strcat(char *dest, const char *src); +extern char *strncat(char *dest, const char *src, size_t num); +extern void *memchr(const void *ptr, int value, size_t num); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/libc/stdio/printf.c b/libc/stdio/printf.c new file mode 100644 index 0000000..566c9c1 --- /dev/null +++ b/libc/stdio/printf.c @@ -0,0 +1,916 @@ +/////////////////////////////////////////////////////////////////////////////// +// \author (c) Marco Paland (info@paland.com) +// 2014-2019, PALANDesign Hannover, Germany +// +// \license The MIT License (MIT) +// +// 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. +// +// \brief Tiny printf, sprintf and (v)snprintf implementation, optimized for speed on +// embedded systems with a very limited resources. These routines are thread +// safe and reentrant! +// Use this instead of the bloated standard/newlib printf cause these use +// malloc for printf (and may not be thread safe). +// +/////////////////////////////////////////////////////////////////////////////// + +#include +#include +#include +#include +#include + +#define PRINTF_DISABLE_SUPPORT_FLOAT + +// define this globally (e.g. gcc -DPRINTF_INCLUDE_CONFIG_H ...) to include the +// printf_config.h header file +// default: undefined +#ifdef PRINTF_INCLUDE_CONFIG_H +#include "printf_config.h" +#endif + + +// 'ntoa' conversion buffer size, this must be big enough to hold one converted +// numeric number including padded zeros (dynamically created on stack) +// default: 32 byte +#ifndef PRINTF_NTOA_BUFFER_SIZE +#define PRINTF_NTOA_BUFFER_SIZE 32U +#endif + +// 'ftoa' conversion buffer size, this must be big enough to hold one converted +// float number including padded zeros (dynamically created on stack) +// default: 32 byte +#ifndef PRINTF_FTOA_BUFFER_SIZE +#define PRINTF_FTOA_BUFFER_SIZE 32U +#endif + +// support for the floating point type (%f) +// default: activated +#ifndef PRINTF_DISABLE_SUPPORT_FLOAT +#define PRINTF_SUPPORT_FLOAT +#endif + +// support for exponential floating point notation (%e/%g) +// default: activated +#ifndef PRINTF_DISABLE_SUPPORT_EXPONENTIAL +#define PRINTF_SUPPORT_EXPONENTIAL +#endif + +// define the default floating point precision +// default: 6 digits +#ifndef PRINTF_DEFAULT_FLOAT_PRECISION +#define PRINTF_DEFAULT_FLOAT_PRECISION 6U +#endif + +// define the largest float suitable to print with %f +// default: 1e9 +#ifndef PRINTF_MAX_FLOAT +#define PRINTF_MAX_FLOAT 1e9 +#endif + +// support for the long long types (%llu or %p) +// default: activated +#ifndef PRINTF_DISABLE_SUPPORT_LONG_LONG +#define PRINTF_SUPPORT_LONG_LONG +#endif + +// support for the ptrdiff_t type (%t) +// ptrdiff_t is normally defined in as long or long long type +// default: activated +#ifndef PRINTF_DISABLE_SUPPORT_PTRDIFF_T +#define PRINTF_SUPPORT_PTRDIFF_T +#endif + +/////////////////////////////////////////////////////////////////////////////// + +// internal flag definitions +#define FLAGS_ZEROPAD (1U << 0U) +#define FLAGS_LEFT (1U << 1U) +#define FLAGS_PLUS (1U << 2U) +#define FLAGS_SPACE (1U << 3U) +#define FLAGS_HASH (1U << 4U) +#define FLAGS_UPPERCASE (1U << 5U) +#define FLAGS_CHAR (1U << 6U) +#define FLAGS_SHORT (1U << 7U) +#define FLAGS_LONG (1U << 8U) +#define FLAGS_LONG_LONG (1U << 9U) +#define FLAGS_PRECISION (1U << 10U) +#define FLAGS_ADAPT_EXP (1U << 11U) + + +// import float.h for DBL_MAX +#if defined(PRINTF_SUPPORT_FLOAT) +#include +#endif + + +// output function type +typedef void (*out_fct_type)(char character, void* buffer, size_t idx, size_t maxlen); + + +// wrapper (used as buffer) for output function type +typedef struct { + void (*fct)(char character, void* arg); + void* arg; +} out_fct_wrap_type; + + +// internal buffer output +static inline void _out_buffer(char character, void* buffer, size_t idx, size_t maxlen) +{ + if (idx < maxlen) { + ((char*)buffer)[idx] = character; + } +} + + +// internal null output +static inline void _out_null(char character, void* buffer, size_t idx, size_t maxlen) +{ + (void)character; (void)buffer; (void)idx; (void)maxlen; +} + + +// internal _putchar wrapper +static inline void _out_char(char character, void* buffer, size_t idx, size_t maxlen) +{ + (void)buffer; (void)idx; (void)maxlen; + if (character) { + console_putchar(character); + } +} + + +// internal output function wrapper +static inline void _out_fct(char character, void* buffer, size_t idx, size_t maxlen) +{ + (void)idx; (void)maxlen; + if (character) { + // buffer is the output fct pointer + ((out_fct_wrap_type*)buffer)->fct(character, ((out_fct_wrap_type*)buffer)->arg); + } +} + + +// internal secure strlen +// \return The length of the string (excluding the terminating 0) limited by 'maxsize' +static inline unsigned int _strnlen_s(const char* str, size_t maxsize) +{ + const char* s; + for (s = str; *s && maxsize--; ++s); + return (unsigned int)(s - str); +} + + +// internal test if char is a digit (0-9) +// \return true if char is a digit +static inline bool _is_digit(char ch) +{ + return (ch >= '0') && (ch <= '9'); +} + + +// internal ASCII string to unsigned int conversion +static unsigned int _atoi(const char** str) +{ + unsigned int i = 0U; + while (_is_digit(**str)) { + i = i * 10U + (unsigned int)(*((*str)++) - '0'); + } + return i; +} + + +// output the specified string in reverse, taking care of any zero-padding +static size_t _out_rev(out_fct_type out, char* buffer, size_t idx, size_t maxlen, const char* buf, size_t len, unsigned int width, unsigned int flags) +{ + const size_t start_idx = idx; + + // pad spaces up to given width + if (!(flags & FLAGS_LEFT) && !(flags & FLAGS_ZEROPAD)) { + for (size_t i = len; i < width; i++) { + out(' ', buffer, idx++, maxlen); + } + } + + // reverse string + while (len) { + out(buf[--len], buffer, idx++, maxlen); + } + + // append pad spaces up to given width + if (flags & FLAGS_LEFT) { + while (idx - start_idx < width) { + out(' ', buffer, idx++, maxlen); + } + } + + return idx; +} + + +// internal itoa format +static size_t _ntoa_format(out_fct_type out, char* buffer, size_t idx, size_t maxlen, char* buf, size_t len, bool negative, unsigned int base, unsigned int prec, unsigned int width, unsigned int flags) +{ + // pad leading zeros + if (!(flags & FLAGS_LEFT)) { + if (width && (flags & FLAGS_ZEROPAD) && (negative || (flags & (FLAGS_PLUS | FLAGS_SPACE)))) { + width--; + } + while ((len < prec) && (len < PRINTF_NTOA_BUFFER_SIZE)) { + buf[len++] = '0'; + } + while ((flags & FLAGS_ZEROPAD) && (len < width) && (len < PRINTF_NTOA_BUFFER_SIZE)) { + buf[len++] = '0'; + } + } + + // handle hash + if (flags & FLAGS_HASH) { + if (!(flags & FLAGS_PRECISION) && len && ((len == prec) || (len == width))) { + len--; + if (len && (base == 16U)) { + len--; + } + } + if ((base == 16U) && !(flags & FLAGS_UPPERCASE) && (len < PRINTF_NTOA_BUFFER_SIZE)) { + buf[len++] = 'x'; + } + else if ((base == 16U) && (flags & FLAGS_UPPERCASE) && (len < PRINTF_NTOA_BUFFER_SIZE)) { + buf[len++] = 'X'; + } + else if ((base == 2U) && (len < PRINTF_NTOA_BUFFER_SIZE)) { + buf[len++] = 'b'; + } + if (len < PRINTF_NTOA_BUFFER_SIZE) { + buf[len++] = '0'; + } + } + + if (len < PRINTF_NTOA_BUFFER_SIZE) { + if (negative) { + buf[len++] = '-'; + } + else if (flags & FLAGS_PLUS) { + buf[len++] = '+'; // ignore the space if the '+' exists + } + else if (flags & FLAGS_SPACE) { + buf[len++] = ' '; + } + } + + return _out_rev(out, buffer, idx, maxlen, buf, len, width, flags); +} + + +// internal itoa for 'long' type +static size_t _ntoa_long(out_fct_type out, char* buffer, size_t idx, size_t maxlen, unsigned long value, bool negative, unsigned long base, unsigned int prec, unsigned int width, unsigned int flags) +{ + char buf[PRINTF_NTOA_BUFFER_SIZE]; + size_t len = 0U; + + // no hash for 0 values + if (!value) { + flags &= ~FLAGS_HASH; + } + + // write if precision != 0 and value is != 0 + if (!(flags & FLAGS_PRECISION) || value) { + do { + const char digit = (char)(value % base); + buf[len++] = digit < 10 ? '0' + digit : (flags & FLAGS_UPPERCASE ? 'A' : 'a') + digit - 10; + value /= base; + } while (value && (len < PRINTF_NTOA_BUFFER_SIZE)); + } + + return _ntoa_format(out, buffer, idx, maxlen, buf, len, negative, (unsigned int)base, prec, width, flags); +} + + +// internal itoa for 'long long' type +#if defined(PRINTF_SUPPORT_LONG_LONG) +static size_t _ntoa_long_long(out_fct_type out, char* buffer, size_t idx, size_t maxlen, unsigned long long value, bool negative, unsigned long long base, unsigned int prec, unsigned int width, unsigned int flags) +{ + char buf[PRINTF_NTOA_BUFFER_SIZE]; + size_t len = 0U; + + // no hash for 0 values + if (!value) { + flags &= ~FLAGS_HASH; + } + + // write if precision != 0 and value is != 0 + if (!(flags & FLAGS_PRECISION) || value) { + do { + const char digit = (char)(value % base); + buf[len++] = digit < 10 ? '0' + digit : (flags & FLAGS_UPPERCASE ? 'A' : 'a') + digit - 10; + value /= base; + } while (value && (len < PRINTF_NTOA_BUFFER_SIZE)); + } + + return _ntoa_format(out, buffer, idx, maxlen, buf, len, negative, (unsigned int)base, prec, width, flags); +} +#endif // PRINTF_SUPPORT_LONG_LONG + + +#if defined(PRINTF_SUPPORT_FLOAT) + +#if defined(PRINTF_SUPPORT_EXPONENTIAL) +// forward declaration so that _ftoa can switch to exp notation for values > PRINTF_MAX_FLOAT +static size_t _etoa(out_fct_type out, char* buffer, size_t idx, size_t maxlen, double value, unsigned int prec, unsigned int width, unsigned int flags); +#endif + + +// internal ftoa for fixed decimal floating point +static size_t _ftoa(out_fct_type out, char* buffer, size_t idx, size_t maxlen, double value, unsigned int prec, unsigned int width, unsigned int flags) +{ + char buf[PRINTF_FTOA_BUFFER_SIZE]; + size_t len = 0U; + double diff = 0.0; + + // powers of 10 + static const double pow10[] = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000 }; + + // test for special values + if (value != value) + return _out_rev(out, buffer, idx, maxlen, "nan", 3, width, flags); + if (value < -DBL_MAX) + return _out_rev(out, buffer, idx, maxlen, "fni-", 4, width, flags); + if (value > DBL_MAX) + return _out_rev(out, buffer, idx, maxlen, (flags & FLAGS_PLUS) ? "fni+" : "fni", (flags & FLAGS_PLUS) ? 4U : 3U, width, flags); + + // test for very large values + // standard printf behavior is to print EVERY whole number digit -- which could be 100s of characters overflowing your buffers == bad + if ((value > PRINTF_MAX_FLOAT) || (value < -PRINTF_MAX_FLOAT)) { +#if defined(PRINTF_SUPPORT_EXPONENTIAL) + return _etoa(out, buffer, idx, maxlen, value, prec, width, flags); +#else + return 0U; +#endif + } + + // test for negative + bool negative = false; + if (value < 0) { + negative = true; + value = 0 - value; + } + + // set default precision, if not set explicitly + if (!(flags & FLAGS_PRECISION)) { + prec = PRINTF_DEFAULT_FLOAT_PRECISION; + } + // limit precision to 9, cause a prec >= 10 can lead to overflow errors + while ((len < PRINTF_FTOA_BUFFER_SIZE) && (prec > 9U)) { + buf[len++] = '0'; + prec--; + } + + int whole = (int)value; + double tmp = (value - whole) * pow10[prec]; + unsigned long frac = (unsigned long)tmp; + diff = tmp - frac; + + if (diff > 0.5) { + ++frac; + // handle rollover, e.g. case 0.99 with prec 1 is 1.0 + if (frac >= pow10[prec]) { + frac = 0; + ++whole; + } + } + else if (diff < 0.5) { + } + else if ((frac == 0U) || (frac & 1U)) { + // if halfway, round up if odd OR if last digit is 0 + ++frac; + } + + if (prec == 0U) { + diff = value - (double)whole; + if ((!(diff < 0.5) || (diff > 0.5)) && (whole & 1)) { + // exactly 0.5 and ODD, then round up + // 1.5 -> 2, but 2.5 -> 2 + ++whole; + } + } + else { + unsigned int count = prec; + // now do fractional part, as an unsigned number + while (len < PRINTF_FTOA_BUFFER_SIZE) { + --count; + buf[len++] = (char)(48U + (frac % 10U)); + if (!(frac /= 10U)) { + break; + } + } + // add extra 0s + while ((len < PRINTF_FTOA_BUFFER_SIZE) && (count-- > 0U)) { + buf[len++] = '0'; + } + if (len < PRINTF_FTOA_BUFFER_SIZE) { + // add decimal + buf[len++] = '.'; + } + } + + // do whole part, number is reversed + while (len < PRINTF_FTOA_BUFFER_SIZE) { + buf[len++] = (char)(48 + (whole % 10)); + if (!(whole /= 10)) { + break; + } + } + + // pad leading zeros + if (!(flags & FLAGS_LEFT) && (flags & FLAGS_ZEROPAD)) { + if (width && (negative || (flags & (FLAGS_PLUS | FLAGS_SPACE)))) { + width--; + } + while ((len < width) && (len < PRINTF_FTOA_BUFFER_SIZE)) { + buf[len++] = '0'; + } + } + + if (len < PRINTF_FTOA_BUFFER_SIZE) { + if (negative) { + buf[len++] = '-'; + } + else if (flags & FLAGS_PLUS) { + buf[len++] = '+'; // ignore the space if the '+' exists + } + else if (flags & FLAGS_SPACE) { + buf[len++] = ' '; + } + } + + return _out_rev(out, buffer, idx, maxlen, buf, len, width, flags); +} + + +#if defined(PRINTF_SUPPORT_EXPONENTIAL) +// internal ftoa variant for exponential floating-point type, contributed by Martijn Jasperse +static size_t _etoa(out_fct_type out, char* buffer, size_t idx, size_t maxlen, double value, unsigned int prec, unsigned int width, unsigned int flags) +{ + // check for NaN and special values + if ((value != value) || (value > DBL_MAX) || (value < -DBL_MAX)) { + return _ftoa(out, buffer, idx, maxlen, value, prec, width, flags); + } + + // determine the sign + const bool negative = value < 0; + if (negative) { + value = -value; + } + + // default precision + if (!(flags & FLAGS_PRECISION)) { + prec = PRINTF_DEFAULT_FLOAT_PRECISION; + } + + // determine the decimal exponent + // based on the algorithm by David Gay (https://www.ampl.com/netlib/fp/dtoa.c) + union { + uint64_t U; + double F; + } conv; + + conv.F = value; + int exp2 = (int)((conv.U >> 52U) & 0x07FFU) - 1023; // effectively log2 + conv.U = (conv.U & ((1ULL << 52U) - 1U)) | (1023ULL << 52U); // drop the exponent so conv.F is now in [1,2) + // now approximate log10 from the log2 integer part and an expansion of ln around 1.5 + int expval = (int)(0.1760912590558 + exp2 * 0.301029995663981 + (conv.F - 1.5) * 0.289529654602168); + // now we want to compute 10^expval but we want to be sure it won't overflow + exp2 = (int)(expval * 3.321928094887362 + 0.5); + const double z = expval * 2.302585092994046 - exp2 * 0.6931471805599453; + const double z2 = z * z; + conv.U = (uint64_t)(exp2 + 1023) << 52U; + // compute exp(z) using continued fractions, see https://en.wikipedia.org/wiki/Exponential_function#Continued_fractions_for_ex + conv.F *= 1 + 2 * z / (2 - z + (z2 / (6 + (z2 / (10 + z2 / 14))))); + // correct for rounding errors + if (value < conv.F) { + expval--; + conv.F /= 10; + } + + // the exponent format is "%+03d" and largest value is "307", so set aside 4-5 characters + unsigned int minwidth = ((expval < 100) && (expval > -100)) ? 4U : 5U; + + // in "%g" mode, "prec" is the number of *significant figures* not decimals + if (flags & FLAGS_ADAPT_EXP) { + // do we want to fall-back to "%f" mode? + if ((value >= 1e-4) && (value < 1e6)) { + if ((int)prec > expval) { + prec = (unsigned)((int)prec - expval - 1); + } + else { + prec = 0; + } + flags |= FLAGS_PRECISION; // make sure _ftoa respects precision + // no characters in exponent + minwidth = 0U; + expval = 0; + } + else { + // we use one sigfig for the whole part + if ((prec > 0) && (flags & FLAGS_PRECISION)) { + --prec; + } + } + } + + // will everything fit? + unsigned int fwidth = width; + if (width > minwidth) { + // we didn't fall-back so subtract the characters required for the exponent + fwidth -= minwidth; + } else { + // not enough characters, so go back to default sizing + fwidth = 0U; + } + if ((flags & FLAGS_LEFT) && minwidth) { + // if we're padding on the right, DON'T pad the floating part + fwidth = 0U; + } + + // rescale the float value + if (expval) { + value /= conv.F; + } + + // output the floating part + const size_t start_idx = idx; + idx = _ftoa(out, buffer, idx, maxlen, negative ? -value : value, prec, fwidth, flags & ~FLAGS_ADAPT_EXP); + + // output the exponent part + if (minwidth) { + // output the exponential symbol + out((flags & FLAGS_UPPERCASE) ? 'E' : 'e', buffer, idx++, maxlen); + // output the exponent value + idx = _ntoa_long(out, buffer, idx, maxlen, (expval < 0) ? -expval : expval, expval < 0, 10, 0, minwidth-1, FLAGS_ZEROPAD | FLAGS_PLUS); + // might need to right-pad spaces + if (flags & FLAGS_LEFT) { + while (idx - start_idx < width) out(' ', buffer, idx++, maxlen); + } + } + return idx; +} +#endif // PRINTF_SUPPORT_EXPONENTIAL +#endif // PRINTF_SUPPORT_FLOAT + + +// internal vsnprintf +static int _vsnprintf(out_fct_type out, char* buffer, const size_t maxlen, const char* format, va_list va) +{ + unsigned int flags, width, precision, n; + size_t idx = 0U; + + if (!buffer) { + // use null output function + out = _out_null; + } + + while (*format) + { + // format specifier? %[flags][width][.precision][length] + if (*format != '%') { + // no + out(*format, buffer, idx++, maxlen); + format++; + continue; + } + else { + // yes, evaluate it + format++; + } + + // evaluate flags + flags = 0U; + do { + switch (*format) { + case '0': flags |= FLAGS_ZEROPAD; format++; n = 1U; break; + case '-': flags |= FLAGS_LEFT; format++; n = 1U; break; + case '+': flags |= FLAGS_PLUS; format++; n = 1U; break; + case ' ': flags |= FLAGS_SPACE; format++; n = 1U; break; + case '#': flags |= FLAGS_HASH; format++; n = 1U; break; + default : n = 0U; break; + } + } while (n); + + // evaluate width field + width = 0U; + if (_is_digit(*format)) { + width = _atoi(&format); + } + else if (*format == '*') { + const int w = va_arg(va, int); + if (w < 0) { + flags |= FLAGS_LEFT; // reverse padding + width = (unsigned int)-w; + } + else { + width = (unsigned int)w; + } + format++; + } + + // evaluate precision field + precision = 0U; + if (*format == '.') { + flags |= FLAGS_PRECISION; + format++; + if (_is_digit(*format)) { + precision = _atoi(&format); + } + else if (*format == '*') { + const int prec = (int)va_arg(va, int); + precision = prec > 0 ? (unsigned int)prec : 0U; + format++; + } + } + + // evaluate length field + switch (*format) { + case 'l' : + flags |= FLAGS_LONG; + format++; + if (*format == 'l') { + flags |= FLAGS_LONG_LONG; + format++; + } + break; + case 'h' : + flags |= FLAGS_SHORT; + format++; + if (*format == 'h') { + flags |= FLAGS_CHAR; + format++; + } + break; +#if defined(PRINTF_SUPPORT_PTRDIFF_T) + case 't' : + flags |= (sizeof(ptrdiff_t) == sizeof(long) ? FLAGS_LONG : FLAGS_LONG_LONG); + format++; + break; +#endif + case 'j' : + flags |= (sizeof(intmax_t) == sizeof(long) ? FLAGS_LONG : FLAGS_LONG_LONG); + format++; + break; + case 'z' : + flags |= (sizeof(size_t) == sizeof(long) ? FLAGS_LONG : FLAGS_LONG_LONG); + format++; + break; + default : + break; + } + + // evaluate specifier + switch (*format) { + case 'd' : + case 'i' : + case 'u' : + case 'x' : + case 'X' : + case 'o' : + case 'b' : { + // set the base + unsigned int base; + if (*format == 'x' || *format == 'X') { + base = 16U; + } + else if (*format == 'o') { + base = 8U; + } + else if (*format == 'b') { + base = 2U; + } + else { + base = 10U; + flags &= ~FLAGS_HASH; // no hash for dec format + } + // uppercase + if (*format == 'X') { + flags |= FLAGS_UPPERCASE; + } + + // no plus or space flag for u, x, X, o, b + if ((*format != 'i') && (*format != 'd')) { + flags &= ~(FLAGS_PLUS | FLAGS_SPACE); + } + + // ignore '0' flag when precision is given + if (flags & FLAGS_PRECISION) { + flags &= ~FLAGS_ZEROPAD; + } + + // convert the integer + if ((*format == 'i') || (*format == 'd')) { + // signed + if (flags & FLAGS_LONG_LONG) { +#if defined(PRINTF_SUPPORT_LONG_LONG) + const long long value = va_arg(va, long long); + idx = _ntoa_long_long(out, buffer, idx, maxlen, (unsigned long long)(value > 0 ? value : 0 - value), value < 0, base, precision, width, flags); +#endif + } + else if (flags & FLAGS_LONG) { + const long value = va_arg(va, long); + idx = _ntoa_long(out, buffer, idx, maxlen, (unsigned long)(value > 0 ? value : 0 - value), value < 0, base, precision, width, flags); + } + else { + const int value = (flags & FLAGS_CHAR) ? (char)va_arg(va, int) : (flags & FLAGS_SHORT) ? (short int)va_arg(va, int) : va_arg(va, int); + idx = _ntoa_long(out, buffer, idx, maxlen, (unsigned int)(value > 0 ? value : 0 - value), value < 0, base, precision, width, flags); + } + } + else { + // unsigned + if (flags & FLAGS_LONG_LONG) { +#if defined(PRINTF_SUPPORT_LONG_LONG) + idx = _ntoa_long_long(out, buffer, idx, maxlen, va_arg(va, unsigned long long), false, base, precision, width, flags); +#endif + } + else if (flags & FLAGS_LONG) { + idx = _ntoa_long(out, buffer, idx, maxlen, va_arg(va, unsigned long), false, base, precision, width, flags); + } + else { + const unsigned int value = (flags & FLAGS_CHAR) ? (unsigned char)va_arg(va, unsigned int) : (flags & FLAGS_SHORT) ? (unsigned short int)va_arg(va, unsigned int) : va_arg(va, unsigned int); + idx = _ntoa_long(out, buffer, idx, maxlen, value, false, base, precision, width, flags); + } + } + format++; + break; + } +#if defined(PRINTF_SUPPORT_FLOAT) + case 'f' : + case 'F' : + if (*format == 'F') flags |= FLAGS_UPPERCASE; + idx = _ftoa(out, buffer, idx, maxlen, va_arg(va, double), precision, width, flags); + format++; + break; +#if defined(PRINTF_SUPPORT_EXPONENTIAL) + case 'e': + case 'E': + case 'g': + case 'G': + if ((*format == 'g')||(*format == 'G')) flags |= FLAGS_ADAPT_EXP; + if ((*format == 'E')||(*format == 'G')) flags |= FLAGS_UPPERCASE; + idx = _etoa(out, buffer, idx, maxlen, va_arg(va, double), precision, width, flags); + format++; + break; +#endif // PRINTF_SUPPORT_EXPONENTIAL +#endif // PRINTF_SUPPORT_FLOAT + case 'c' : { + unsigned int l = 1U; + // pre padding + if (!(flags & FLAGS_LEFT)) { + while (l++ < width) { + out(' ', buffer, idx++, maxlen); + } + } + // char output + out((char)va_arg(va, int), buffer, idx++, maxlen); + // post padding + if (flags & FLAGS_LEFT) { + while (l++ < width) { + out(' ', buffer, idx++, maxlen); + } + } + format++; + break; + } + + case 's' : { + const char* p = va_arg(va, char*); + unsigned int l = _strnlen_s(p, precision ? precision : (size_t)-1); + // pre padding + if (flags & FLAGS_PRECISION) { + l = (l < precision ? l : precision); + } + if (!(flags & FLAGS_LEFT)) { + while (l++ < width) { + out(' ', buffer, idx++, maxlen); + } + } + // string output + while ((*p != 0) && (!(flags & FLAGS_PRECISION) || precision--)) { + out(*(p++), buffer, idx++, maxlen); + } + // post padding + if (flags & FLAGS_LEFT) { + while (l++ < width) { + out(' ', buffer, idx++, maxlen); + } + } + format++; + break; + } + + case 'p' : { + width = sizeof(void*) * 2U; + flags |= FLAGS_ZEROPAD | FLAGS_UPPERCASE; +#if defined(PRINTF_SUPPORT_LONG_LONG) + const bool is_ll = sizeof(uintptr_t) == sizeof(long long); + if (is_ll) { + idx = _ntoa_long_long(out, buffer, idx, maxlen, (uintptr_t)va_arg(va, void*), false, 16U, precision, width, flags); + } + else { +#endif + idx = _ntoa_long(out, buffer, idx, maxlen, (unsigned long)((uintptr_t)va_arg(va, void*)), false, 16U, precision, width, flags); +#if defined(PRINTF_SUPPORT_LONG_LONG) + } +#endif + format++; + break; + } + + case '%' : + out('%', buffer, idx++, maxlen); + format++; + break; + + default : + out(*format, buffer, idx++, maxlen); + format++; + break; + } + } + + // termination + out((char)0, buffer, idx < maxlen ? idx : maxlen - 1U, maxlen); + + // return written chars without terminating \0 + return (int)idx; +} + + +/////////////////////////////////////////////////////////////////////////////// + +int printf_(const char* format, ...) +{ + va_list va; + va_start(va, format); + char buffer[1]; + const int ret = _vsnprintf(_out_char, buffer, (size_t)-1, format, va); + va_end(va); + return ret; +} + + +int sprintf_(char* buffer, const char* format, ...) +{ + va_list va; + va_start(va, format); + const int ret = _vsnprintf(_out_buffer, buffer, (size_t)-1, format, va); + va_end(va); + return ret; +} + + +int snprintf_(char* buffer, size_t count, const char* format, ...) +{ + va_list va; + va_start(va, format); + const int ret = _vsnprintf(_out_buffer, buffer, count, format, va); + va_end(va); + return ret; +} + + +int vprintf_(const char* format, va_list va) +{ + char buffer[1]; + return _vsnprintf(_out_char, buffer, (size_t)-1, format, va); +} + + +int vsnprintf_(char* buffer, size_t count, const char* format, va_list va) +{ + return _vsnprintf(_out_buffer, buffer, count, format, va); +} + + +int fctprintf(void (*out)(char character, void* arg), void* arg, const char* format, ...) +{ + va_list va; + va_start(va, format); + const out_fct_wrap_type out_fct_wrap = { out, arg }; + const int ret = _vsnprintf(_out_fct, (char*)(uintptr_t)&out_fct_wrap, (size_t)-1, format, va); + va_end(va); + return ret; +} diff --git a/libc/stdio/printf.h b/libc/stdio/printf.h new file mode 100644 index 0000000..6104ccf --- /dev/null +++ b/libc/stdio/printf.h @@ -0,0 +1,117 @@ +/////////////////////////////////////////////////////////////////////////////// +// \author (c) Marco Paland (info@paland.com) +// 2014-2019, PALANDesign Hannover, Germany +// +// \license The MIT License (MIT) +// +// 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. +// +// \brief Tiny printf, sprintf and snprintf implementation, optimized for speed on +// embedded systems with a very limited resources. +// Use this instead of bloated standard/newlib printf. +// These routines are thread safe and reentrant. +// +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _PRINTF_H_ +#define _PRINTF_H_ + +#include +#include + + +#ifdef __cplusplus +extern "C" { +#endif + + +/** + * Output a character to a custom device like UART, used by the printf() function + * This function is declared here only. You have to write your custom implementation somewhere + * \param character Character to output + */ +void _putchar(char character); + + +/** + * Tiny printf implementation + * You have to implement _putchar if you use printf() + * To avoid conflicts with the regular printf() API it is overridden by macro defines + * and internal underscore-appended functions like printf_() are used + * \param format A string that specifies the format of the output + * \return The number of characters that are written into the array, not counting the terminating null character + */ +#define printf printf_ +int printf_(const char* format, ...); + + +/** + * Tiny sprintf implementation + * Due to security reasons (buffer overflow) YOU SHOULD CONSIDER USING (V)SNPRINTF INSTEAD! + * \param buffer A pointer to the buffer where to store the formatted string. MUST be big enough to store the output! + * \param format A string that specifies the format of the output + * \return The number of characters that are WRITTEN into the buffer, not counting the terminating null character + */ +#define sprintf sprintf_ +int sprintf_(char* buffer, const char* format, ...); + + +/** + * Tiny snprintf/vsnprintf implementation + * \param buffer A pointer to the buffer where to store the formatted string + * \param count The maximum number of characters to store in the buffer, including a terminating null character + * \param format A string that specifies the format of the output + * \param va A value identifying a variable arguments list + * \return The number of characters that COULD have been written into the buffer, not counting the terminating + * null character. A value equal or larger than count indicates truncation. Only when the returned value + * is non-negative and less than count, the string has been completely written. + */ +#define snprintf snprintf_ +#define vsnprintf vsnprintf_ +int snprintf_(char* buffer, size_t count, const char* format, ...); +int vsnprintf_(char* buffer, size_t count, const char* format, va_list va); + + +/** + * Tiny vprintf implementation + * \param format A string that specifies the format of the output + * \param va A value identifying a variable arguments list + * \return The number of characters that are WRITTEN into the buffer, not counting the terminating null character + */ +#define vprintf vprintf_ +int vprintf_(const char* format, va_list va); + + +/** + * printf with output function + * You may use this as dynamic alternative to printf() with its fixed _putchar() output + * \param out An output function which takes one character and an argument pointer + * \param arg An argument pointer for user data passed to output function + * \param format A string that specifies the format of the output + * \return The number of characters that are sent to the output function, not counting the terminating null character + */ +int fctprintf(void (*out)(char character, void* arg), void* arg, const char* format, ...); + + +#ifdef __cplusplus +} +#endif + + +#endif // _PRINTF_H_ diff --git a/libc/string/memchr.c b/libc/string/memchr.c new file mode 100644 index 0000000..9b4d9f1 --- /dev/null +++ b/libc/string/memchr.c @@ -0,0 +1,14 @@ +#include + +const void *memchr(const void *ptr, int value, size_t num) { + const unsigned char *buf = ptr; + unsigned char val = value; + + for (size_t i = 0; i < num; i++) { + if (buf[i] == val) { + return (void *)(buf + i); + } + } + + return NULL; +} diff --git a/libc/string/memcmp.c b/libc/string/memcmp.c new file mode 100644 index 0000000..c810e4e --- /dev/null +++ b/libc/string/memcmp.c @@ -0,0 +1,8 @@ +#include + +int memcmp(const void *vl, const void *vr, size_t n) +{ + const unsigned char *l=vl, *r=vr; + for (; n && *l == *r; n--, l++, r++); + return n ? *l-*r : 0; +} diff --git a/libc/string/memcpy.c b/libc/string/memcpy.c new file mode 100644 index 0000000..64f74e4 --- /dev/null +++ b/libc/string/memcpy.c @@ -0,0 +1,106 @@ +/*- + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Chris Torek. + * + * 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. + * 4. 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. + */ +#include +#include + +typedef uintptr_t word; +#define wsize sizeof(word) +#define wmask (wsize - 1) + +void *memcpy(void *dst0, const void *src0, size_t length) { + char *dst = dst0; + const char *src = src0; + size_t t; + + if (length == 0 || dst == src) /* nothing to do */ + goto done; + + /* + * Macros: loop-t-times; and loop-t-times, t>0 + */ +#define TLOOP(s) \ + if (t) \ + TLOOP1(s) +#define TLOOP1(s) \ + do { \ + s; \ + } while (--t) + + if ((uintptr_t)dst < (uintptr_t)src) { + /* + * Copy forward. + */ + t = (uintptr_t)src; /* only need low bits */ + if ((t | (uintptr_t)dst) & wmask) { + /* + * Try to align operands. This cannot be done + * unless the low bits match. + */ + if ((t ^ (uintptr_t)dst) & wmask || length < wsize) + t = length; + else + t = wsize - (t & wmask); + length -= t; + TLOOP1(*dst++ = *src++); + } + /* + * Copy whole words, then mop up any trailing bytes. + */ + t = length / wsize; + TLOOP(*(word *)dst = *(word *)src; src += wsize; dst += wsize); + t = length & wmask; + TLOOP(*dst++ = *src++); + } else { + /* + * Copy backwards. Otherwise essentially the same. + * Alignment works as before, except that it takes + * (t&wmask) bytes to align, not wsize-(t&wmask). + */ + src += length; + dst += length; + t = (uintptr_t)src; + if ((t | (uintptr_t)dst) & wmask) { + if ((t ^ (uintptr_t)dst) & wmask || length <= wsize) + t = length; + else + t &= wmask; + length -= t; + TLOOP1(*--dst = *--src); + } + t = length / wsize; + TLOOP(src -= wsize; dst -= wsize; *(word *)dst = *(word *)src); + t = length & wmask; + TLOOP(*--dst = *--src); + } +done: + return (dst0); +} diff --git a/libc/string/memmove.c b/libc/string/memmove.c new file mode 100644 index 0000000..57be152 --- /dev/null +++ b/libc/string/memmove.c @@ -0,0 +1,24 @@ +#include +#include + +static void *memcpy_r(void *dest, const void *src, size_t sz) +{ + unsigned char *d = dest; + const unsigned char *s = src; + + for (size_t i = 0; i < sz; i++) { + size_t b = sz - i - 1; + d[b] = s[b]; + } + + return dest; +} + +void *memmove(void *dest, const void *src, size_t n) +{ + if (dest < src) { + return memcpy(dest, src, n); + } else { + return memcpy_r(dest, src, n); + } +} diff --git a/libc/string/memset.c b/libc/string/memset.c new file mode 100644 index 0000000..ea5d117 --- /dev/null +++ b/libc/string/memset.c @@ -0,0 +1,13 @@ +#include + +void *memset(void *str, int c, size_t n) +{ + unsigned char val = (unsigned char)c; + unsigned char *buf = str; + + for (size_t i = 0; i < n; i++) { + buf[i] = val; + } + + return str; +} diff --git a/libc/string/strcat.c b/libc/string/strcat.c new file mode 100644 index 0000000..6ee3c3c --- /dev/null +++ b/libc/string/strcat.c @@ -0,0 +1,22 @@ +#include + +char *strcat(char *dest, const char *src) { + size_t start = strlen(dest), i = 0; + for (i = 0; src[i] != '\0'; i++) { + dest[start + i] = src[i]; + } + + dest[start + i] = '\0'; + return dest; +} + +char *strncat(char *dest, const char *src, size_t num) { + size_t start = strlen(dest), i = 0; + for (i = 0; i < num; i++) { + dest[start + i] = src[i]; + } + + dest[start + i] = '\0'; + return dest; +} + diff --git a/libc/string/strcmp.c b/libc/string/strcmp.c new file mode 100644 index 0000000..42aea66 --- /dev/null +++ b/libc/string/strcmp.c @@ -0,0 +1,19 @@ +int strcmp(const char *s1, const char *s2) +{ + int i; + for (i = 0; s1[i] == s2[i]; i++) + if (s1[i] == '\0') + return 0; + + return s1[i] - s2[i]; +} + +int strncmp(const char *s1, const char *s2, unsigned int n) +{ + for (; n > 0; s1++, s2++, --n) + if (*s1 != *s2) + return ((*(unsigned char *)s1 < *(unsigned char *)s2) ? -1 : 1); + else if (*s1 == '\0') + return 0; + return 0; +} diff --git a/libc/string/strcpy.c b/libc/string/strcpy.c new file mode 100644 index 0000000..7a816de --- /dev/null +++ b/libc/string/strcpy.c @@ -0,0 +1,28 @@ +#include + +char *strcpy(char *output, const char *input) +{ + unsigned int i; + for (i = 0; input[i]; i++) { + output[i] = input[i]; + } + + output[i] = '\0'; + return output; +} + +char *strncpy(char *output, const char *input, unsigned int count) +{ + unsigned int size = count; + unsigned int i; + for (i = 0; i < size; i++) { + output[i] = input[i]; + + if (input[i] == 0) { + break; + } + } + + output[i] = '\0'; + return output; +} diff --git a/libc/string/strdup.c b/libc/string/strdup.c new file mode 100644 index 0000000..6ab5900 --- /dev/null +++ b/libc/string/strdup.c @@ -0,0 +1,6 @@ +#include + +char *strdup(const char *src) { + return NULL; +} + diff --git a/libc/string/strlen.c b/libc/string/strlen.c new file mode 100644 index 0000000..ee0685a --- /dev/null +++ b/libc/string/strlen.c @@ -0,0 +1,14 @@ +#include + +size_t strlen(const char *str) { + if (!str) { + return 0; + } + + size_t res = 0; + while (str[res]) { + res++; + } + + return res; +} diff --git a/libc/string/strrchr.c b/libc/string/strrchr.c new file mode 100644 index 0000000..9040bb8 --- /dev/null +++ b/libc/string/strrchr.c @@ -0,0 +1,13 @@ +#include + +char *strrchr(const char *str, int c) { + size_t len = strlen(str); + + for (int i = len - 1; i > 0; i--) { + if (str[i] == c) { + return (char *)&str[i]; + } + } + + return NULL; +} diff --git a/libc/string/strtok.c b/libc/string/strtok.c new file mode 100644 index 0000000..d42faf7 --- /dev/null +++ b/libc/string/strtok.c @@ -0,0 +1,144 @@ +#include +#include + +#define ALIGN (sizeof(size_t)) +#define ONES ((size_t)-1 / UCHAR_MAX) +#define HIGHS (ONES * (UCHAR_MAX / 2 + 1)) +#define HASZERO(X) (((X)-ONES) & ~(X)&HIGHS) +#define BITOP(A, B, OP) \ + ((A)[(size_t)(B) / (8 * sizeof *(A))] OP(size_t) 1 \ + << ((size_t)(B) % (8 * sizeof *(A)))) + +char *strchrnul(const char *s, int c) { + size_t *w; + size_t k; + + c = (unsigned char)c; + if (!c) { + return (char *)s + strlen(s); + } + + for (; (uintptr_t)s % ALIGN; s++) { + if (!*s || *(unsigned char *)s == c) { + return (char *)s; + } + } + + k = ONES * c; + for (w = (void *)s; !HASZERO(*w) && !HASZERO(*w ^ k); w++) + ; + for (s = (void *)w; *s && *(unsigned char *)s != c; s++) + ; + return (char *)s; +} + +char *strchr(const char *s, int c) { + char *r = strchrnul(s, c); + return *(unsigned char *)r == (unsigned char)c ? r : 0; +} + +size_t lfind(const char *str, const char accept) { + return (size_t)strchr(str, accept); +} + +size_t strspn(const char *s, const char *c) { + const char *a = s; + size_t byteset[32 / sizeof(size_t)] = {0}; + + if (!c[0]) { + return 0; + } + + if (!c[1]) { + for (; *s == *c; s++) { + return s - a; + } + } + + for (; *c && BITOP(byteset, *(unsigned char *)c, |=); c++) + ; + for (; *s && BITOP(byteset, *(unsigned char *)s, &); s++) + ; + return s - a; +} + +size_t strcspn(const char *s, const char *c) { + const char *a = s; + + if (c[0] && c[1]) { + size_t byteset[32 / sizeof(size_t)] = {0}; + for (; *c && BITOP(byteset, *(unsigned char *)c, |=); c++) + ; + for (; *s && !BITOP(byteset, *(unsigned char *)s, &); s++) + ; + return s - a; + } + + return strchrnul(s, *c) - a; +} + +char *strpbrk(const char *s, const char *b) { + s += strcspn(s, b); + return *s ? (char *)s : 0; +} + +char *strtok_r(char *str, const char *delim, char **sp) { + int i = 0; + int len = strlen(delim); + + /* Were we given any delimiters? */ + if (len == 0) { + return NULL; + } + + /* If we weren't given a string, and save pointer is NULL, return. */ + if (!str && !sp) { + return NULL; + } + + /* If we were given a string, initialise sp for subsequent calls. */ + if (str) { + *sp = str; + } + + /* Go to the start of the substring, skipping any delimiters. */ + char *p_start = *sp; + while (1) { + for (i = 0; i < len; i++) { + if (*p_start == delim[i]) { + p_start++; + break; + } + } + + if (i == len) { + *sp = p_start; + break; + } + } + + /* Are we at the end of the string? */ + if (**sp == '\0') { + *sp = NULL; + return *sp; + } + + /* Find the end of the substring, and + replace the delimiter with null */ + while (**sp != '\0') { + for (i = 0; i < len; i++) { + if (**sp == delim[i]) { + **sp = '\0'; + break; + } + } + + (*sp)++; + if (i < len) { + break; + } + } + + return p_start; +} +