12 files changed, 227 insertions, 0 deletions
diff --git a/libc/inc/arg.h b/libc/inc/arg.h
new file mode 100644
index 0000000..73e592d
--- /dev/null
+++ b/libc/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/libc/inc/assert.h b/libc/inc/assert.h
new file mode 100644
index 0000000..91c4ccd
--- /dev/null
+++ b/libc/inc/assert.h
@@ -0,0 +1,14 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#ifndef ASSERT_H
+#define ASSERT_H
+
+#include <print.h>
+
+#define assert(exp)                                                                                \
+	if (!(exp)) {                                                                              \
+		printf("%s:%d: %s: Assertion '%s' failed\n", __FILE__, __LINE__, __func__, #exp);  \
+		__asm__ volatile("cli\nhlt");                                                      \
+	}
+
+#endif
diff --git a/libc/inc/conv.h b/libc/inc/conv.h
new file mode 100644
index 0000000..d878deb
--- /dev/null
+++ b/libc/inc/conv.h
@@ -0,0 +1,15 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#ifndef CONV_H
+#define CONV_H
+
+#include <def.h>
+
+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/libc/inc/cpu.h b/libc/inc/cpu.h
new file mode 100644
index 0000000..2d367cb
--- /dev/null
+++ b/libc/inc/cpu.h
@@ -0,0 +1,30 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#ifndef CPU_H
+#define CPU_H
+
+#include <def.h>
+
+u8 inb(u16 port);
+u16 inw(u16 port);
+u32 inl(u16 port);
+void insl(u16 port, void *addr, int n);
+
+void outb(u16 port, u8 data);
+void outw(u16 port, u16 data);
+void outl(u16 port, u32 data);
+void cli();
+void sti();
+void hlt();
+void idle();
+void loop();
+
+static inline void spinlock(int *ptr)
+{
+	int prev;
+	do
+		__asm__ volatile("lock xchgl %0,%1" : "=a"(prev) : "m"(*ptr), "a"(1));
+	while (prev);
+}
+
+#endif
diff --git a/libc/inc/def.h b/libc/inc/def.h
new file mode 100644
index 0000000..42939a0
--- /dev/null
+++ b/libc/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/libc/inc/list.h b/libc/inc/list.h
new file mode 100644
index 0000000..5deaf59
--- /dev/null
+++ b/libc/inc/list.h
@@ -0,0 +1,25 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#ifndef LIST_H
+#define LIST_H
+
+#include <def.h>
+
+struct list {
+	struct node *head;
+};
+
+struct node {
+	void *data;
+	int nonce;
+	struct node *next;
+	struct node *prev;
+};
+
+struct list *list_new();
+/* struct node *list_new_node(); */ // TODO: Make node-specific things static/private?
+/* void list_add_node(struct list *list, struct node *node); */
+void list_add(struct list *list, void *data);
+void list_remove(struct list *list, struct node *node);
+
+#endif
diff --git a/libc/inc/math.h b/libc/inc/math.h
new file mode 100644
index 0000000..268e3e7
--- /dev/null
+++ b/libc/inc/math.h
@@ -0,0 +1,10 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#ifndef MATH_H
+#define MATH_H
+
+#include <def.h>
+
+int pow(int base, int exp);
+
+#endif
diff --git a/libc/inc/mem.h b/libc/inc/mem.h
new file mode 100644
index 0000000..0030b3d
--- /dev/null
+++ b/libc/inc/mem.h
@@ -0,0 +1,27 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#ifndef MEM_H
+#define MEM_H
+
+#include <def.h>
+
+// Huh
+#ifdef kernel
+#define malloc(n) (void *)((HEAP += n) - n) // TODO: Implement real/better malloc/free
+#define free(ptr)
+#elif defined(userspace)
+#include <sys.h>
+#define malloc(n) (void *)sys1(SYS_MALLOC, n)
+#define free(ptr) (void)(sys1(SYS_FREE, (int)ptr))
+#else
+#error "No lib target specified. Please use -Dkernel or -Duserspace"
+#endif
+
+u32 HEAP;
+u32 HEAP_START;
+
+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/libc/inc/print.h b/libc/inc/print.h
new file mode 100644
index 0000000..04668b2
--- /dev/null
+++ b/libc/inc/print.h
@@ -0,0 +1,14 @@
+// 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);
+int print(const char *str);
+
+#endif
diff --git a/libc/inc/serial.h b/libc/inc/serial.h
new file mode 100644
index 0000000..6511952
--- /dev/null
+++ b/libc/inc/serial.h
@@ -0,0 +1,9 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#ifndef SERIAL_H
+#define SERIAL_H
+
+void serial_install();
+void serial_print(const char *data);
+
+#endif
diff --git a/libc/inc/str.h b/libc/inc/str.h
new file mode 100644
index 0000000..65774e7
--- /dev/null
+++ b/libc/inc/str.h
@@ -0,0 +1,17 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#ifndef STR_H
+#define STR_H
+
+#include <def.h>
+
+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/libc/inc/sys.h b/libc/inc/sys.h
new file mode 100644
index 0000000..16d3c4f
--- /dev/null
+++ b/libc/inc/sys.h
@@ -0,0 +1,27 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+// Syscall implementation
+
+#ifndef SYS_H
+#define SYS_H
+
+enum sys { SYS_LOOP, SYS_MALLOC, SYS_FREE, SYS_EXEC, SYS_EXIT };
+
+int sys0(enum sys num);
+int sys1(enum sys num, int d1);
+int sys2(enum sys num, int d1, int d2);
+int sys3(enum sys num, int d1, int d2, int d3);
+int sys4(enum sys num, int d1, int d2, int d3, int d4);
+int sys5(enum sys num, int d1, int d2, int d3, int d4, int d5);
+
+/**
+ * Wrappers
+ */
+
+#define loop() sys0(SYS_LOOP)
+#define exec(path) sys1(SYS_EXEC, (int)path)
+#define exit()                                                                                     \
+	sys0(SYS_EXIT);                                                                            \
+	while (1) {                                                                                \
+	}
+
+#endif