From 162d024a53e1e31e00ff0b6f47dd4590edebc551 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Sun, 9 Aug 2020 16:51:01 +0200 Subject: Heavy restructuring of libc, kernel and apps --- lib/Makefile | 24 ++++++++++ lib/conv.c | 144 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/inc/arg.h | 11 +++++ lib/inc/assert.h | 11 +++++ lib/inc/conv.h | 15 ++++++ lib/inc/def.h | 28 +++++++++++ lib/inc/math.h | 10 ++++ lib/inc/mem.h | 18 +++++++ lib/inc/print.h | 13 +++++ lib/inc/str.h | 17 +++++++ lib/math.c | 15 ++++++ lib/mem.c | 33 +++++++++++++ lib/print.c | 96 +++++++++++++++++++++++++++++++++++++ lib/str.c | 98 +++++++++++++++++++++++++++++++++++++ 14 files changed, 533 insertions(+) create mode 100644 lib/Makefile create mode 100644 lib/conv.c create mode 100644 lib/inc/arg.h create mode 100644 lib/inc/assert.h create mode 100644 lib/inc/conv.h create mode 100644 lib/inc/def.h create mode 100644 lib/inc/math.h create mode 100644 lib/inc/mem.h create mode 100644 lib/inc/print.h create mode 100644 lib/inc/str.h create mode 100644 lib/math.c create mode 100644 lib/mem.c create mode 100644 lib/print.c create mode 100644 lib/str.c (limited to 'lib') diff --git a/lib/Makefile b/lib/Makefile new file mode 100644 index 0000000..ad430d6 --- /dev/null +++ b/lib/Makefile @@ -0,0 +1,24 @@ +# MIT License, Copyright (c) 2020 Marvin Borner + +COBJS = str.o \ + mem.o \ + math.o \ + conv.o \ + print.o +CC = ../cross/opt/bin/i686-elf-gcc +LD = ../cross/opt/bin/i686-elf-ld +OC = ../cross/opt/bin/i686-elf-ar + +# Flags to make the binary smaller TODO: Remove after indirect pointer support! +CSFLAGS = -mpreferred-stack-boundary=2 -fno-asynchronous-unwind-tables -Os + +CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Iinc/ + +all: compile + +%.o: %.c + @$(CC) -c $(CFLAGS) $< -o $@ + +compile: $(COBJS) + @mkdir -p ../build/ + @$(AR) qc ../build/libc.a $(COBJS) diff --git a/lib/conv.c b/lib/conv.c new file mode 100644 index 0000000..3bde4ec --- /dev/null +++ b/lib/conv.c @@ -0,0 +1,144 @@ +// MIT License, Copyright (c) 2020 Marvin Borner + +#include +#include +#include +#include + +static const char HTOA_TABLE[] = "0123456789ABCDEF"; +static const char ITOA_TABLE[] = "0123456789"; + +int atoi(char *str) +{ + u32 s_str = strlen(str); + if (!s_str) + return 0; + + u8 negative = 0; + if (str[0] == '-') + negative = 1; + + u32 i = 0; + if (negative) + i++; + + int ret = 0; + for (; i < s_str; i++) { + ret += (str[i] - '0') * pow(10, (int)((s_str - i) - 1)); + } + + if (negative) + ret *= -1; + return ret; +} + +char *htoa(u32 n) +{ + char *ret = (char *)malloc(10); + + int i = 0; + while (n) { + ret[i++] = HTOA_TABLE[n & 0xF]; + n >>= 4; + } + + if (!i) { + ret[0] = '0'; + i++; + } + + for (; i <= 9; i++) + ret[i] = 0; + + char *aux = strdup(ret); + free(ret); + ret = aux; + + strinv(ret); + return ret; +} + +int htoi(char *str) +{ + u32 s_str = strlen(str); + + u32 i = 0; + int ret = 0; + for (; i < s_str; i++) { + char c = str[i]; + int aux = 0; + if (c >= '0' && c <= '9') + aux = c - '0'; + else if (c >= 'A' && c <= 'F') + aux = (c - 'A') + 10; + + ret += aux * pow(16, (int)((s_str - i) - 1)); + } + + return ret; +} + +char *itoa(int n) +{ + if (!n) { + char *ret = (char *)malloc(2); + ret[0] = '0'; + ret[1] = 0; + return ret; + } + u8 negative = (u8)(n < 0); + if (negative) + n *= -1; + + int sz; + for (sz = 0; n % pow(10, sz) != n; sz++) { + } + + char *ret = (char *)malloc((u32)(sz + 1)); + + for (int i = 0; i < sz; i++) { + int digit = (n % pow(10, i + 1)) / pow(10, i); + ret[i] = ITOA_TABLE[digit]; + } + ret[sz] = 0; + + if (negative) { + char *aux = (char *)malloc((u32)(sz + 2)); + strcpy(aux, ret); + aux[sz] = '-'; + aux[sz + 1] = 0; + free(ret); + ret = aux; + } + + strinv(ret); + return ret; +} + +char *conv_base(int value, char *result, int base, int is_signed) +{ + if (base < 2 || base > 36) { + *result = '\0'; + return result; + } + + char *ptr = result, *ptr1 = result, tmp_char; + int tmp_value; + + do { + tmp_value = value; + value /= base; + *ptr++ = "zyxwvutsrqponmlkjihgfedcba9876543210123456789abcdefghijklmnopqrstuvwxyz" + [35 + (tmp_value - value * base)]; + } while (value); + + if (is_signed && tmp_value < 0) + *ptr++ = '-'; + *ptr-- = '\0'; + while (ptr1 < ptr) { + tmp_char = *ptr; + *ptr-- = *ptr1; + *ptr1++ = tmp_char; + } + return result; +} diff --git a/lib/inc/arg.h b/lib/inc/arg.h new file mode 100644 index 0000000..73e592d --- /dev/null +++ b/lib/inc/arg.h @@ -0,0 +1,11 @@ +// MIT License, Copyright (c) 2020 Marvin Borner + +#ifndef ARG_H +#define ARG_H + +typedef __builtin_va_list va_list; +#define va_start __builtin_va_start +#define va_end __builtin_va_end +#define va_arg __builtin_va_arg + +#endif diff --git a/lib/inc/assert.h b/lib/inc/assert.h new file mode 100644 index 0000000..2cb095b --- /dev/null +++ b/lib/inc/assert.h @@ -0,0 +1,11 @@ +// MIT License, Copyright (c) 2020 Marvin Borner + +#ifndef ASSERT_H +#define ASSERT_H + +#include + +#define assert(exp) \ + (exp) ? 0 : printf("%s:%d: %s: Assertion '%s' failed\n", __FILE__, __LINE__, __func__, #exp) + +#endif diff --git a/lib/inc/conv.h b/lib/inc/conv.h new file mode 100644 index 0000000..d878deb --- /dev/null +++ b/lib/inc/conv.h @@ -0,0 +1,15 @@ +// MIT License, Copyright (c) 2020 Marvin Borner + +#ifndef CONV_H +#define CONV_H + +#include + +int atoi(char *str); +char *htoa(u32 n); +int htoi(char *str); +char *itoa(int n); + +char *conv_base(int value, char *result, int base, int is_signed); + +#endif diff --git a/lib/inc/def.h b/lib/inc/def.h new file mode 100644 index 0000000..42939a0 --- /dev/null +++ b/lib/inc/def.h @@ -0,0 +1,28 @@ +// MIT License, Copyright (c) 2020 Marvin Borner + +#ifndef DEF_H +#define DEF_H + +/** + * Types + */ + +typedef signed char s8; +typedef unsigned char u8; + +typedef signed short s16; +typedef unsigned short u16; + +typedef signed long s32; +typedef unsigned long u32; + +typedef signed long long s64; +typedef unsigned long long u64; + +/** + * Macros + */ + +#define NULL ((void *)0) + +#endif diff --git a/lib/inc/math.h b/lib/inc/math.h new file mode 100644 index 0000000..268e3e7 --- /dev/null +++ b/lib/inc/math.h @@ -0,0 +1,10 @@ +// MIT License, Copyright (c) 2020 Marvin Borner + +#ifndef MATH_H +#define MATH_H + +#include + +int pow(int base, int exp); + +#endif diff --git a/lib/inc/mem.h b/lib/inc/mem.h new file mode 100644 index 0000000..e700e42 --- /dev/null +++ b/lib/inc/mem.h @@ -0,0 +1,18 @@ +// MIT License, Copyright (c) 2020 Marvin Borner + +#ifndef MEM_H +#define MEM_H + +#include + +u32 HEAP; +u32 HEAP_START; + +#define malloc(n) ((void *)((HEAP += n) - n)) // TODO: Implement real/better malloc/free +#define free(x) + +void *memcpy(void *dst, const void *src, u32 n); +void *memset(void *dst, int c, u32 n); +int memcmp(const void *s1, const void *s2, u32 n); + +#endif diff --git a/lib/inc/print.h b/lib/inc/print.h new file mode 100644 index 0000000..925a5bd --- /dev/null +++ b/lib/inc/print.h @@ -0,0 +1,13 @@ +// MIT License, Copyright (c) 2020 Marvin Borner +// I may (re)move this in the future // TODO + +#ifndef PRINT_H +#define PRINT_H + +#include "arg.h" + +int printf(const char *format, ...); +int vprintf(const char *format, va_list ap); +int vsprintf(char *str, const char *format, va_list ap); + +#endif diff --git a/lib/inc/str.h b/lib/inc/str.h new file mode 100644 index 0000000..65774e7 --- /dev/null +++ b/lib/inc/str.h @@ -0,0 +1,17 @@ +// MIT License, Copyright (c) 2020 Marvin Borner + +#ifndef STR_H +#define STR_H + +#include + +u32 strlen(const char *s); +char *strcpy(char *dst, const char *src); +char *strchr(const char *s, int c); +char *strcat(char *dst, const char *src); +int strcmp(const char *s1, const char *s2); +int strncmp(const char *s1, const char *s2, u32 n); +char *strinv(char *s); +char *strdup(const char *s); + +#endif diff --git a/lib/math.c b/lib/math.c new file mode 100644 index 0000000..9cd9cea --- /dev/null +++ b/lib/math.c @@ -0,0 +1,15 @@ +// MIT License, Copyright (c) 2020 Marvin Borner + +int pow(int base, int exp) +{ + if (exp < 0) + return 0; + + if (!exp) + return 1; + + int ret = base; + for (int i = 1; i < exp; i++) + ret *= base; + return ret; +} diff --git a/lib/mem.c b/lib/mem.c new file mode 100644 index 0000000..00b9735 --- /dev/null +++ b/lib/mem.c @@ -0,0 +1,33 @@ +// MIT License, Copyright (c) 2020 Marvin Borner + +#include + +void *memcpy(void *dst, const void *src, u32 n) +{ + const char *sp = (const char *)src; + char *dp = (char *)dst; + for (; n != 0; n--) + *dp++ = *sp++; + return dst; +} + +void *memset(void *dst, char val, u32 n) +{ + char *temp = (char *)dst; + for (; n != 0; n--) + *temp++ = val; + return dst; +} + +int memcmp(const void *s1, const void *s2, u32 n) +{ + const u8 *a = (const u8 *)s1; + const u8 *b = (const u8 *)s2; + for (u32 i = 0; i < n; i++) { + if (a[i] < b[i]) + return -1; + else if (b[i] < a[i]) + return 1; + } + return 0; +} diff --git a/lib/print.c b/lib/print.c new file mode 100644 index 0000000..738e42f --- /dev/null +++ b/lib/print.c @@ -0,0 +1,96 @@ +#include +#include +#include +#include +/* #include */ +#include + +static void append(char *dest, char *src, int index) +{ + for (u32 i = index; i < strlen(src) + index; i++) + dest[i] = src[i - index]; + dest[index + strlen(src)] = 0; +} + +int vsprintf(char *str, const char *format, va_list ap) +{ + u8 ready_to_format = 0; + + int i = 0; + char buf = 0; + char format_buffer[20] = "\0"; + + for (; *format; format++) { + if (ready_to_format) { + ready_to_format = 0; + + if (*format == '%') { + str[i] = '%'; + continue; + } + + buf = *format; + + // TODO: Improve this repetitive code + if (buf == 's') { + char *string = va_arg(ap, char *); + append(str, string, i); + i = strlen(str); + } else if (buf == 'x') { + conv_base(va_arg(ap, u32), format_buffer, 16, 0); + append(str, format_buffer, i); + i = strlen(str); + } else if (buf == 'd' || buf == 'i') { + conv_base(va_arg(ap, s32), format_buffer, 10, 1); + append(str, format_buffer, i); + i = strlen(str); + } else if (buf == 'u') { + conv_base(va_arg(ap, u32), format_buffer, 10, 0); + append(str, format_buffer, i); + i = strlen(str); + } else if (buf == 'o') { + conv_base(va_arg(ap, u32), format_buffer, 8, 0); + append(str, format_buffer, i); + i = strlen(str); + } else if (buf == 'b') { + conv_base(va_arg(ap, u32), format_buffer, 2, 0); + append(str, format_buffer, i); + i = strlen(str); + } else if (buf == 'c') { + str[i] = (char)va_arg(ap, int); + i++; + } + } else { + if (*format == '%') + ready_to_format = 1; + else { + str[i] = *format; + i++; + } + } + + format_buffer[0] = '\0'; + } + + return strlen(str); +} + +int vprintf(const char *format, va_list ap) +{ + char buf[1024]; + memset(buf, 0, 1024); + int len = vsprintf(buf, format, ap); + /* serial_print(buf); // TODO: Remove temporary serial print */ + return len; +} + +// TODO: Fix printf for *very* large strings (serial works) +int printf(const char *format, ...) +{ + va_list ap; + va_start(ap, format); + int len = vprintf(format, ap); + va_end(ap); + + return len; +} diff --git a/lib/str.c b/lib/str.c new file mode 100644 index 0000000..d1ee325 --- /dev/null +++ b/lib/str.c @@ -0,0 +1,98 @@ +// MIT License, Copyright (c) 2020 Marvin Borner + +#include +#include + +u32 strlen(const char *s) +{ + const char *ss = s; + while (*ss) + ss++; + return ss - s; +} + +char *strcpy(char *dst, const char *src) +{ + char *q = dst; + const char *p = src; + char ch; + + do { + *q++ = ch = *p++; + } while (ch); + + return dst; +} + +int strcmp(const char *s1, const char *s2) +{ + const u8 *c1 = (const u8 *)s1; + const u8 *c2 = (const u8 *)s2; + u8 ch; + int d = 0; + + while (1) { + d = (int)(ch = *c1++) - (int)*c2++; + if (d || !ch) + break; + } + + return d; +} + +int strncmp(const char *s1, const char *s2, u32 n) +{ + const u8 *c1 = (const u8 *)s1; + const u8 *c2 = (const u8 *)s2; + u8 ch; + int d = 0; + + while (n--) { + d = (int)(ch = *c1++) - (int)*c2++; + if (d || !ch) + break; + } + + return d; +} + +char *strchr(const char *s, int c) +{ + while (*s != (char)c) { + if (!*s) + return NULL; + s++; + } + + return (char *)s; +} + +char *strcat(char *dst, const char *src) +{ + strcpy(strchr(dst, '\0'), src); + return dst; +} + +char *strinv(char *s) +{ + u32 s_str = strlen(s); + + int iterations = (int)s_str / 2; + for (int i = 0; i < iterations; i++) { + char aux = s[i]; + s[i] = s[(s_str - i) - 1]; + s[(s_str - i) - 1] = aux; + } + return s; +} + +char *strdup(const char *s) +{ + int l = strlen(s) + 1; + char *d = malloc(l); + + if (d) + memcpy(d, s, l); + + return d; +} -- cgit v1.2.3