From 56f77cf07113c9f744e5b4875db8b47f65e99a0e Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 11 Feb 2020 23:21:47 -0600 Subject: [PATCH] Revert "Initial commit - work done up through 11 Feb 2020" This reverts commit 2bc74019041cb55f47a900756677bb5beede1407. --- README | 0 arch/i386/make.config | 8 ---- include/math.h | 91 ----------------------------------- include/stdio.h | 14 ------ include/stdlib.h | 9 ---- include/string.h | 15 ------ include/sys/cdefs.h | 6 --- include/sys/types.h | 4 -- makefile | 92 ------------------------------------ stdio/printf.c | 107 ------------------------------------------ stdio/printf.libk.d | 6 --- stdio/putchar.c | 16 ------- stdio/putchar.libk.d | 3 -- stdio/puts.c | 5 -- stdio/puts.libk.d | 1 - stdlib/abort.c | 15 ------ stdlib/abort.libk.d | 2 - string/memcmp.c | 17 ------- string/memcmp.libk.d | 3 -- string/memcpy.c | 12 ----- string/memcpy.libk.d | 3 -- string/memmove.c | 20 -------- string/memmove.libk.d | 3 -- string/memset.c | 11 ----- string/memset.libk.d | 3 -- string/strlen.c | 9 ---- string/strlen.libk.d | 3 -- 27 files changed, 478 deletions(-) delete mode 100755 README delete mode 100755 arch/i386/make.config delete mode 100755 include/math.h delete mode 100755 include/stdio.h delete mode 100755 include/stdlib.h delete mode 100755 include/string.h delete mode 100755 include/sys/cdefs.h delete mode 100755 include/sys/types.h delete mode 100755 makefile delete mode 100755 stdio/printf.c delete mode 100755 stdio/printf.libk.d delete mode 100755 stdio/putchar.c delete mode 100755 stdio/putchar.libk.d delete mode 100755 stdio/puts.c delete mode 100755 stdio/puts.libk.d delete mode 100755 stdlib/abort.c delete mode 100755 stdlib/abort.libk.d delete mode 100755 string/memcmp.c delete mode 100755 string/memcmp.libk.d delete mode 100755 string/memcpy.c delete mode 100755 string/memcpy.libk.d delete mode 100755 string/memmove.c delete mode 100755 string/memmove.libk.d delete mode 100755 string/memset.c delete mode 100755 string/memset.libk.d delete mode 100755 string/strlen.c delete mode 100755 string/strlen.libk.d diff --git a/README b/README deleted file mode 100755 index e69de29..0000000 diff --git a/arch/i386/make.config b/arch/i386/make.config deleted file mode 100755 index fbb211a..0000000 --- a/arch/i386/make.config +++ /dev/null @@ -1,8 +0,0 @@ -ARCH_CFLAGS= -ARCH_CPPFLAGS= -KERNEL_ARCH_CFLAGS= -KERNEL_ARCH_CPPFLAGS= - -ARCH_FREEOBJS=\ - -ARCH_HOSTEDOBJS=\ \ No newline at end of file diff --git a/include/math.h b/include/math.h deleted file mode 100755 index 09cc947..0000000 --- a/include/math.h +++ /dev/null @@ -1,91 +0,0 @@ -#ifndef _MATH_H -#define _MATH_H - -#include - -#if FLT_EVAL_METHOD == 1 -typedef float_t double; -typedef double_t double; -#elseif FLT_EVAL_METHOD == 2 -typedef float_t long double; -typedef double_t long double; -#else -typedef float_t float; -typedef double_t double; -#endif - -#define M_E 2.718281828 -#define M_PI 3.14159265 -#define PI 3.14159265 - -double acos(double); -float acosf(float); -long double acosl(long double); - -double asin(double); -float asinf(float); -long double asinl(long double); - -double atan(double); -float atanf(float); -long double atanl(long double); - -double atan2(double); -float atan2f(float); -long double atan2l(long double); - -double cos(double); -float cosf(float); -long double cosl(long double); - -double sin(double); -float sinf(float); -long double sinl(long double); - -double tan(double); -float tanf(float); -long double tanl(long double); - -double acosh(double); -float acoshf(float); -long double acoshl(long double); - -double asinh(double); -float asinhf(float); -long double asinhl(long double); - -double atanh(double); -float atanhf(float); -long double atanhl(long double); - -double cosh(double); -float coshf(float); -long double coshl(long double); - -double sinh(double); -float sinhf(float); -long double sinhl(long double); - -double tanh(double); -float tanhf(float); -long double tanhl(long double); - -double exp(double); -float expf(float); -long double expl(double); - -double exp2(double); -float exp2f(float); -long double exp2l(double); - -double expm1(double); -float expm1f(float); -long double expm1l(double); - -double frexp(double, int *); -float frexpf(float, int *); -long double frexpl(double, int *); - - - -#endif diff --git a/include/stdio.h b/include/stdio.h deleted file mode 100755 index de88ad1..0000000 --- a/include/stdio.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef _STDIO_H -#define _STDIO_H - -#include - -#define EOF (-1) - -int printf(const char * __restrict, ...); - -int putchar(int); - -int puts(const char *); - -#endif diff --git a/include/stdlib.h b/include/stdlib.h deleted file mode 100755 index 7d3a05e..0000000 --- a/include/stdlib.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _STDLIB_H -#define _STDLIB_H - -#include - -__attribute__((__noreturn__)) -void abort(void); - -#endif diff --git a/include/string.h b/include/string.h deleted file mode 100755 index b991f1d..0000000 --- a/include/string.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef _STRING_H -#define _STRING_H - -#include - -#include - -int memcmp(const void *, const void *, size_t); -void * memcpy(void * __restrict, const void * __restrict, size_t); -void * memmove(void *, const void *, size_t); -void * memset(void *, int, size_t); - -size_t strlen(const char *); - -#endif diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h deleted file mode 100755 index 5ffdc33..0000000 --- a/include/sys/cdefs.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _SYS_CDEFS_H -#define _SYS_CDEFS_H - -#define __fenix_libc 1 - -#endif diff --git a/include/sys/types.h b/include/sys/types.h deleted file mode 100755 index 4995f79..0000000 --- a/include/sys/types.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef _SYS_TYPES_H -#define _SYS_TYPES_H - -#endif /* not _HEADER */ diff --git a/makefile b/makefile deleted file mode 100755 index f02224d..0000000 --- a/makefile +++ /dev/null @@ -1,92 +0,0 @@ -DEFAULT_HOST!=../default-host.sh -HOST?=DEFAULT_HOST -HOSTARCH!=../target-triplet-to-arch.sh $(HOST) - -CFLAGS?=-O2 -g -CPPFLAGS?= -LDFLAGS?= -LIBS?= - -DESTDIR?= -PREFIX?=/usr/local -EXEC_PREFIX?=$(PREFIX) -INCLUDEDIR?=$(PREFIX)/include -LIBDIR?=$(EXEC_PREFIX)/lib - -CFLAGS:=$(CFLAGS) -ffreestanding -Wall -Wextra -CPPFLAGS:=$(CPPFLAGS) -D__is_libc -Iinclude -LIBK_CFLAGS:=$(CFLAGS) -LIBK_CPPFLAGS:=$(CPPFLAGS) -D__is_libk - -ARCHDIR=arch/$(HOSTARCH) - -include $(ARCHDIR)/make.config - -CFLAGS:=$(CFLAGS) $(ARCH_CFLAGS) -CPPFLAGS:=$(CPPFLAGS) $(ARCH_CPPFLAGS) -LIBK_CFLAGS:=$(LIBK_CFLAGS) $(KERNEL_ARCH_CFLAGS) -LIBK_CPPFLAGS:=$(LIBK_CPPFLAGS) $(KERNEL_ARCH_CPPFLAGS) - -FREEOBJS=\ -$(ARCH_FREEOBJS) \ -stdio/printf.o \ -stdio/putchar.o \ -stdio/puts.o \ -stdlib/abort.o \ -string/memcmp.o \ -string/memcpy.o \ -string/memmove.o \ -string/memset.o \ -string/strlen.o \ - -HOSTEDOBJS=\ -$(ARCH_HOSTEDOBJS) \ - -OBJS=\ -$(FREEOBJS) \ -$(HOSTEDOBJS) \ - -LIBK_OBJS=$(FREEOBJS:.o=.libk.o) - -BINARIES=libk.a #Add libc.a later - -.PHONY: all clean install install-headers install-libs -.SUFFIXES: .o .libk.o .c .S - -all: $(BINARIES) - -libc.a: $(OBJS) - $(AR) rcs $@ $(OBJS) - -libk.a: $(LIBK_OBJS) - $(AR) rcs $@ $(LIBK_OBJS) - -.c.o: - $(CC) -MD -c $< -o $@ -std=c99 $(CFLAGS) $(CPPFLAGS) - -.c.S: - $(CC) -MD -c $< -o $@ $(CFLAGS) $(CPPFLAGS) - -.c.libk.o: - $(CC) -MD -c $< -o $@ -std=c99 $(LIBK_CFLAGS) $(LIBK_CPPFLAGS) - -.S.libk.o: - $(CC) -MD -c $< -o $@ $(LIBK_CFLAGS) $(LIBK_CPPFLAGS) - -clean: - rm -f $(BINARIES) *.a - rm -f $(OBJS) $(LIBK_OBJS) *.o */*.o */*/*.o - rm -f $(OBJS:.o=.d) $(LIBK_OBJS:.o=.d) *.d */*.d */*/*.d - -install: install-headers install-libs - -install-headers: - mkdir -p $(DESTDIR)$(INCLUDEDIR) - cp -R include/. $(DESTDIR)$(INCLUDEDIR)/. - -install-libs: $(BINARIES) - mkdir -p $(DESTDIR)$(INCLUDEDIR) - cp $(BINARIES) $(DESTDIR)$(LIBDIR) - --include $(OBJS:.o=.d) --include $(LIBK_OBJS:.o=.d) diff --git a/stdio/printf.c b/stdio/printf.c deleted file mode 100755 index b9b31b2..0000000 --- a/stdio/printf.c +++ /dev/null @@ -1,107 +0,0 @@ -#include -#include -#include -#include -#include - -static bool print(const char * str, size_t len) { - const unsigned char * bytes = (const unsigned char *) str; - - for(size_t i = 0; i < len; i++) { - if(putchar(bytes[i]) == EOF) { - return false; - } - } - - return true; -} - -int printf(const char * restrict format, ...) { - va_list parameters; - va_start(parameters, format); - - int written = 0; - - while(*format != '\0') { - size_t maxrem = INT_MAX - written; - - if(format[0] != '%' || format[1] == '%') { - if(format[0] == '%') { - format++; - } - - size_t amount = 1; - - while(format[amount] && format[amount] != '%') { - amount++; - } - - if(maxrem < amount) { - /* TODO: Set errno to EOVERFLOW after implementing errno.h */ - return -1; - } - - if(!print(format, amount)) { - return -1; - } - - format += amount; - written += amount; - continue; - } - - const char * format_begun_at = format++; - - /* TODO: Implement all format specifiers (%g, %o, &c.) */ - if(*format == 'c') { - format++; - char c = (char) va_arg(parameters, int); - - if(!maxrem) { - /* TODO: Set errno to EOVERFLOW after implementing errno.h */ - return -1; - } - - if(!print(&c, sizeof(c))) { - return -1; - } - - written++; - } - else if(*format == 's') { - format++; - const char * str = va_arg(parameters, const char *); - size_t len = strlen(str); - - if(maxrem < len) { - /* TODO: Set errno to EOVERFLOW after implementing errno.h */ - return -1; - } - - if(!print(str, len)) { - return -1; - } - - written += len; - } - else { - format = format_begun_at; - size_t len = strlen(format); - - if(maxrem < len) { - /* TODO: Set errno to EOVERFLOW after implementing errno.h */ - return -1; - } - - if(!print(format, len)) { - return -1; - } - - format += len; - } - } - - va_end(parameters); - - return(written); -} diff --git a/stdio/printf.libk.d b/stdio/printf.libk.d deleted file mode 100755 index eec0880..0000000 --- a/stdio/printf.libk.d +++ /dev/null @@ -1,6 +0,0 @@ -stdio/printf.libk.o: stdio/printf.c \ - /usr/home/helmsulfrinn/opt/cross/lib/gcc/i686-elf/9.2.0/include-fixed/limits.h \ - /usr/home/helmsulfrinn/opt/cross/lib/gcc/i686-elf/9.2.0/include/stdbool.h \ - /usr/home/helmsulfrinn/opt/cross/lib/gcc/i686-elf/9.2.0/include/stdarg.h \ - include/stdio.h include/sys/cdefs.h include/string.h \ - /usr/home/helmsulfrinn/opt/cross/lib/gcc/i686-elf/9.2.0/include/stddef.h diff --git a/stdio/putchar.c b/stdio/putchar.c deleted file mode 100755 index 8f95abd..0000000 --- a/stdio/putchar.c +++ /dev/null @@ -1,16 +0,0 @@ -#include - -#ifdef __is_libk -#include -#endif - -int putchar(int ic) { -#ifdef __is_libk - char c = (char) ic; - term_write(&c, sizeof(c)); -#else - /* TODO: Implement write system call to do this part */ -#endif - - return ic; -} diff --git a/stdio/putchar.libk.d b/stdio/putchar.libk.d deleted file mode 100755 index 1560a12..0000000 --- a/stdio/putchar.libk.d +++ /dev/null @@ -1,3 +0,0 @@ -stdio/putchar.libk.o: stdio/putchar.c include/stdio.h include/sys/cdefs.h \ - /home/helmsulfrinn/Documents/projects/coding/active/fenix/sysroot/usr/include/kernel/tty.h \ - /usr/home/helmsulfrinn/opt/cross/lib/gcc/i686-elf/9.2.0/include/stddef.h diff --git a/stdio/puts.c b/stdio/puts.c deleted file mode 100755 index 12d2007..0000000 --- a/stdio/puts.c +++ /dev/null @@ -1,5 +0,0 @@ -#include - -int puts(const char * string) { - return printf("%s\n", string); -} diff --git a/stdio/puts.libk.d b/stdio/puts.libk.d deleted file mode 100755 index 41ba5a8..0000000 --- a/stdio/puts.libk.d +++ /dev/null @@ -1 +0,0 @@ -stdio/puts.libk.o: stdio/puts.c include/stdio.h include/sys/cdefs.h diff --git a/stdlib/abort.c b/stdlib/abort.c deleted file mode 100755 index 0f6454d..0000000 --- a/stdlib/abort.c +++ /dev/null @@ -1,15 +0,0 @@ -#include -#include - -__attribute__((__noreturn__)) -void abort(void) { -#if defined(__is_libk) - /* TODO: Add proper kernel panic */ - printf("kernel: panic: abort()\n"); -#else - /* TODO: Abnormally terminate process like by SIGABRT */ - printf("abort()\n"); -#endif - while(1) {} - __builtin_unreachable(); -} diff --git a/stdlib/abort.libk.d b/stdlib/abort.libk.d deleted file mode 100755 index 6cb385e..0000000 --- a/stdlib/abort.libk.d +++ /dev/null @@ -1,2 +0,0 @@ -stdlib/abort.libk.o: stdlib/abort.c include/stdio.h include/sys/cdefs.h \ - include/stdlib.h diff --git a/string/memcmp.c b/string/memcmp.c deleted file mode 100755 index 2024b57..0000000 --- a/string/memcmp.c +++ /dev/null @@ -1,17 +0,0 @@ -#include - -int memcmp(const void * a_ptr, const void * b_ptr, size_t size) { - const unsigned char * a = (const unsigned char *) a_ptr; - const unsigned char * b = (const unsigned char *) b_ptr; - - for(size_t i = 0; i < size; i++) { - if(a[i] < b[i]) { - return -1; - } - else if(a[i] > b[i]) { - return 1; - } - } - - return 0; -} diff --git a/string/memcmp.libk.d b/string/memcmp.libk.d deleted file mode 100755 index b730894..0000000 --- a/string/memcmp.libk.d +++ /dev/null @@ -1,3 +0,0 @@ -string/memcmp.libk.o: string/memcmp.c include/string.h \ - include/sys/cdefs.h \ - /usr/home/helmsulfrinn/opt/cross/lib/gcc/i686-elf/9.2.0/include/stddef.h diff --git a/string/memcpy.c b/string/memcpy.c deleted file mode 100755 index 21acf80..0000000 --- a/string/memcpy.c +++ /dev/null @@ -1,12 +0,0 @@ -#include - -void * memcpy(void * restrict dest, const void * restrict src, size_t size) { - unsigned char * to = (unsigned char *) dest; - const unsigned char * from = (const unsigned char *) src; - - for(size_t i = 0; i < size; i++) { - to[i] = from[i]; - } - - return dest; -} diff --git a/string/memcpy.libk.d b/string/memcpy.libk.d deleted file mode 100755 index 3dfcb42..0000000 --- a/string/memcpy.libk.d +++ /dev/null @@ -1,3 +0,0 @@ -string/memcpy.libk.o: string/memcpy.c include/string.h \ - include/sys/cdefs.h \ - /usr/home/helmsulfrinn/opt/cross/lib/gcc/i686-elf/9.2.0/include/stddef.h diff --git a/string/memmove.c b/string/memmove.c deleted file mode 100755 index d9a8340..0000000 --- a/string/memmove.c +++ /dev/null @@ -1,20 +0,0 @@ -#include - -void * memmove(void * dest, const void * src, size_t size) { - unsigned char * to = (unsigned char *) dest; - const unsigned char * from = (const unsigned char *) src; - - /* We check this to make sure we don't overwrite memory */ - if(to < from) { - for(size_t i = 0; i < size; i++) { - to[i] = from[i]; - } - } - else { - for(size_t i = size; i != 0; i--) { - to[i - 1] = from[i - 1]; - } - } - - return dest; -} diff --git a/string/memmove.libk.d b/string/memmove.libk.d deleted file mode 100755 index 11545b8..0000000 --- a/string/memmove.libk.d +++ /dev/null @@ -1,3 +0,0 @@ -string/memmove.libk.o: string/memmove.c include/string.h \ - include/sys/cdefs.h \ - /usr/home/helmsulfrinn/opt/cross/lib/gcc/i686-elf/9.2.0/include/stddef.h diff --git a/string/memset.c b/string/memset.c deleted file mode 100755 index fac6e8b..0000000 --- a/string/memset.c +++ /dev/null @@ -1,11 +0,0 @@ -#include - -void * memset(void * buffer, int value, size_t size) { - unsigned char * buf = (unsigned char *) buffer; - - for(size_t i = 0; i < size; i++) { - buf[i] = (unsigned char) value; - } - - return buffer; -} diff --git a/string/memset.libk.d b/string/memset.libk.d deleted file mode 100755 index 96a14b8..0000000 --- a/string/memset.libk.d +++ /dev/null @@ -1,3 +0,0 @@ -string/memset.libk.o: string/memset.c include/string.h \ - include/sys/cdefs.h \ - /usr/home/helmsulfrinn/opt/cross/lib/gcc/i686-elf/9.2.0/include/stddef.h diff --git a/string/strlen.c b/string/strlen.c deleted file mode 100755 index db86633..0000000 --- a/string/strlen.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -size_t strlen(const char * str) { - size_t len = 0; - while(str[len] != '\0') { - len++; - } - return len; -} diff --git a/string/strlen.libk.d b/string/strlen.libk.d deleted file mode 100755 index 398d7db..0000000 --- a/string/strlen.libk.d +++ /dev/null @@ -1,3 +0,0 @@ -string/strlen.libk.o: string/strlen.c include/string.h \ - include/sys/cdefs.h \ - /usr/home/helmsulfrinn/opt/cross/lib/gcc/i686-elf/9.2.0/include/stddef.h