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/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 +++++++++++++++++
 8 files changed, 123 insertions(+)
 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

(limited to 'lib/inc')

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 <print.h>
+
+#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 <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/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 <def.h>
+
+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 <def.h>
+
+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 <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
-- 
cgit v1.2.3