From bfe16de4be67565f1a1e7b1331fcbe3aedf9c54e Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Tue, 28 Apr 2020 19:15:47 +0200 Subject: Userspace rewrite -> IT WORKS! :) Finally, after many months of work and rewrites the syscalls with constant char pointers work now :D --- src/kernel/kernel.c | 4 +- src/kernel/syscall/syscall.c | 2 +- src/userspace/graphics/framebuffer.c | 46 ------------------ src/userspace/graphics/graphics.h | 20 -------- src/userspace/libc/syscall.c | 20 ++++++++ src/userspace/libc/syscall.h | 87 +++++++++++++++++++++++++++++++++++ src/userspace/main.c | 13 ------ src/userspace/mlibc/math.h | 6 --- src/userspace/mlibc/math/pow.c | 13 ------ src/userspace/mlibc/stdio.h | 16 ------- src/userspace/mlibc/stdio/getch.c | 6 --- src/userspace/mlibc/stdio/printf.c | 10 ---- src/userspace/mlibc/stdio/readline.c | 14 ------ src/userspace/mlibc/stdio/vprintf.c | 52 --------------------- src/userspace/mlibc/stdio/writec.c | 6 --- src/userspace/mlibc/stdlib.h | 26 ----------- src/userspace/mlibc/stdlib/atoi.c | 28 ----------- src/userspace/mlibc/stdlib/htoa.c | 32 ------------- src/userspace/mlibc/stdlib/htoi.c | 23 --------- src/userspace/mlibc/stdlib/itoa.c | 48 ------------------- src/userspace/mlibc/stdlib/liballoc.c | 12 ----- src/userspace/mlibc/stdlib/liballoc.h | 10 ---- src/userspace/mlibc/string.h | 28 ----------- src/userspace/mlibc/string/memcmp.c | 14 ------ src/userspace/mlibc/string/memcpy.c | 10 ---- src/userspace/mlibc/string/memset.c | 9 ---- src/userspace/mlibc/string/strcat.c | 11 ----- src/userspace/mlibc/string/strcati.c | 9 ---- src/userspace/mlibc/string/strcmp.c | 13 ------ src/userspace/mlibc/string/strcpy.c | 10 ---- src/userspace/mlibc/string/strdisp.c | 14 ------ src/userspace/mlibc/string/strdup.c | 11 ----- src/userspace/mlibc/string/strinv.c | 13 ------ src/userspace/mlibc/string/strlen.c | 35 -------------- src/userspace/programs/sh.c | 10 ++++ src/userspace/syscall.c | 20 -------- src/userspace/syscall.h | 87 ----------------------------------- 37 files changed, 120 insertions(+), 668 deletions(-) delete mode 100644 src/userspace/graphics/framebuffer.c delete mode 100644 src/userspace/graphics/graphics.h create mode 100644 src/userspace/libc/syscall.c create mode 100644 src/userspace/libc/syscall.h delete mode 100644 src/userspace/main.c delete mode 100644 src/userspace/mlibc/math.h delete mode 100644 src/userspace/mlibc/math/pow.c delete mode 100644 src/userspace/mlibc/stdio.h delete mode 100644 src/userspace/mlibc/stdio/getch.c delete mode 100644 src/userspace/mlibc/stdio/printf.c delete mode 100644 src/userspace/mlibc/stdio/readline.c delete mode 100644 src/userspace/mlibc/stdio/vprintf.c delete mode 100644 src/userspace/mlibc/stdio/writec.c delete mode 100644 src/userspace/mlibc/stdlib.h delete mode 100644 src/userspace/mlibc/stdlib/atoi.c delete mode 100644 src/userspace/mlibc/stdlib/htoa.c delete mode 100644 src/userspace/mlibc/stdlib/htoi.c delete mode 100644 src/userspace/mlibc/stdlib/itoa.c delete mode 100644 src/userspace/mlibc/stdlib/liballoc.c delete mode 100644 src/userspace/mlibc/stdlib/liballoc.h delete mode 100644 src/userspace/mlibc/string.h delete mode 100644 src/userspace/mlibc/string/memcmp.c delete mode 100644 src/userspace/mlibc/string/memcpy.c delete mode 100644 src/userspace/mlibc/string/memset.c delete mode 100644 src/userspace/mlibc/string/strcat.c delete mode 100644 src/userspace/mlibc/string/strcati.c delete mode 100644 src/userspace/mlibc/string/strcmp.c delete mode 100644 src/userspace/mlibc/string/strcpy.c delete mode 100644 src/userspace/mlibc/string/strdisp.c delete mode 100644 src/userspace/mlibc/string/strdup.c delete mode 100644 src/userspace/mlibc/string/strinv.c delete mode 100644 src/userspace/mlibc/string/strlen.c create mode 100644 src/userspace/programs/sh.c delete mode 100644 src/userspace/syscall.c delete mode 100644 src/userspace/syscall.h (limited to 'src') diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index 3461913..1b34a73 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -68,7 +68,7 @@ void kernel_main(uint32_t magic, uint32_t multiboot_address, uint32_t esp) printf("%s", read_file("/etc/test")); syscalls_install(); - struct process *proc = elf_load("/bin/user"); + struct process *proc = elf_load("/bin/sh"); if (proc) { proc->stdin = NULL; proc->stdout = NULL; @@ -79,4 +79,4 @@ void kernel_main(uint32_t magic, uint32_t multiboot_address, uint32_t esp) log("Okidoko!"); halt_loop(); // asm ("div %0" :: "r"(0)); // Exception testing x/0 -} \ No newline at end of file +} diff --git a/src/kernel/syscall/syscall.c b/src/kernel/syscall/syscall.c index 1454198..f883f2e 100644 --- a/src/kernel/syscall/syscall.c +++ b/src/kernel/syscall/syscall.c @@ -35,4 +35,4 @@ void syscall_handler(struct regs *r) void syscalls_install() { isr_install_handler(0x80, syscall_handler); -} \ No newline at end of file +} diff --git a/src/userspace/graphics/framebuffer.c b/src/userspace/graphics/framebuffer.c deleted file mode 100644 index 9994075..0000000 --- a/src/userspace/graphics/framebuffer.c +++ /dev/null @@ -1,46 +0,0 @@ -#include -#include - -unsigned char *fb; -int vbe_bpl = 4; -int vbe_pitch = 10240; -int vbe_height = 1600; -int vbe_width = 2560; - -void vesa_draw_rectangle(int x1, int y1, int x2, int y2, const uint32_t color[3]) -{ - int pos1 = x1 * vbe_bpl + y1 * vbe_pitch; - char *draw = (char *)&fb[pos1]; - for (int i = 0; i <= y2 - y1; i++) { - for (int j = 0; j <= x2 - x1; j++) { - draw[vbe_bpl * j] = color[2]; - draw[vbe_bpl * j + 1] = color[1]; - draw[vbe_bpl * j + 2] = color[0]; - } - draw += vbe_pitch; - } -} - -void vesa_set_pixel(uint16_t x, uint16_t y, const uint32_t color[3]) -{ - unsigned pos = x * vbe_bpl + y * vbe_pitch; - char *draw = (char *)&fb[pos]; - draw[pos] = color[2]; - draw[pos + 1] = color[1]; - draw[pos + 2] = color[0]; -} - -void vesa_clear() -{ - uint32_t color[3] = { 0, 0, 0 }; - vesa_draw_rectangle(0, 0, vbe_width - 1, vbe_height - 1, color); -} - -void init_framebuffer() -{ - struct userspace_pointers *pointers = (struct userspace_pointers *)syscall_get_pointers(); - fb = (unsigned char *)0xfd000000; - - uint32_t color[3] = { 0xff, 0x00, 0x00 }; - vesa_set_pixel(0, 0, color); -} \ No newline at end of file diff --git a/src/userspace/graphics/graphics.h b/src/userspace/graphics/graphics.h deleted file mode 100644 index 0e3d5be..0000000 --- a/src/userspace/graphics/graphics.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef MELVIX_GRAPHICS_H -#define MELVIX_GRAPHICS_H - -#include - -struct font { - uint16_t font_32[758][32]; - uint16_t font_24[758][24]; - uint8_t font_16[758][16]; - uint16_t cursor[19]; -}; - -struct userspace_pointers { - unsigned char *fb; - struct font *font; -}; - -void init_framebuffer(); - -#endif \ No newline at end of file diff --git a/src/userspace/libc/syscall.c b/src/userspace/libc/syscall.c new file mode 100644 index 0000000..c147703 --- /dev/null +++ b/src/userspace/libc/syscall.c @@ -0,0 +1,20 @@ +#include + +/** + * DEFINITIONS + */ +DEFN_SYSCALL0(halt, 0); + +DEFN_SYSCALL1(write, 1, const char *); + +DEFN_SYSCALL1(read, 2, const char *); + +DEFN_SYSCALL1(writec, 3, char); + +DEFN_SYSCALL0(readc, 4); + +DEFN_SYSCALL0(get_pointers, 5); + +DEFN_SYSCALL1(alloc, 6, uint32_t); + +DEFN_SYSCALL1(free, 7, uint32_t); diff --git a/src/userspace/libc/syscall.h b/src/userspace/libc/syscall.h new file mode 100644 index 0000000..7dfd28d --- /dev/null +++ b/src/userspace/libc/syscall.h @@ -0,0 +1,87 @@ +#ifndef MELVIX_SYSCALL_H +#define MELVIX_SYSCALL_H + +#include + +#define DECL_SYSCALL0(fn) int syscall_##fn(); +#define DECL_SYSCALL1(fn, p1) int syscall_##fn(p1); +#define DECL_SYSCALL2(fn, p1, p2) int syscall_##fn(p1, p2); +#define DECL_SYSCALL3(fn, p1, p2, p3) int syscall_##fn(p1, p2, p3); +#define DECL_SYSCALL4(fn, p1, p2, p3, p4) int syscall_##fn(p1, p2, p3, p4); +#define DECL_SYSCALL5(fn, p1, p2, p3, p4, p5) int syscall_##fn(p1, p2, p3, p4, p5); + +#define DEFN_SYSCALL0(fn, num) \ + int syscall_##fn() \ + { \ + int a; \ + asm volatile("int $0x80" : "=a"(a) : "0"(num)); \ + return a; \ + } + +#define DEFN_SYSCALL1(fn, num, P1) \ + int syscall_##fn(P1 p1) \ + { \ + int a; \ + asm volatile("int $0x80" : "=a"(a) : "0"(num), "b"((int)p1)); \ + return a; \ + } + +#define DEFN_SYSCALL2(fn, num, P1, P2) \ + int syscall_##fn(P1 p1, P2 p2) \ + { \ + int a; \ + asm volatile("int $0x80" : "=a"(a) : "0"(num), "b"((int)p1), "c"((int)p2)); \ + return a; \ + } + +#define DEFN_SYSCALL3(fn, num, P1, P2, P3) \ + int syscall_##fn(P1 p1, P2 p2, P3 p3) \ + { \ + int a; \ + asm volatile("int $0x80" \ + : "=a"(a) \ + : "0"(num), "b"((int)p1), "c"((int)p2), "d"((int)p3)); \ + return a; \ + } + +#define DEFN_SYSCALL4(fn, num, P1, P2, P3, P4) \ + int syscall_##fn(P1 p1, P2 p2, P3 p3, P4 p4) \ + { \ + int a; \ + asm volatile("int $0x80" \ + : "=a"(a) \ + : "0"(num), "b"((int)p1), "c"((int)p2), "d"((int)p3), "S"((int)p4)); \ + return a; \ + } + +#define DEFN_SYSCALL5(fn, num) \ + int syscall_##fn(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) \ + { \ + int a; \ + asm volatile("int $0x80" \ + : "=a"(a) \ + : "0"(num), "b"((int)p1), "c"((int)p2), "d"((int)p3), "S"((int)p4), \ + "D"((int)p5)); \ + return a; \ + } + +/** + * DECLARATIONS + */ +DECL_SYSCALL0(halt); + +DECL_SYSCALL1(write, const char *); + +DECL_SYSCALL1(read, const char *); + +DECL_SYSCALL1(writec, char); + +DECL_SYSCALL0(readc); + +DECL_SYSCALL0(get_pointers); + +DECL_SYSCALL1(alloc, uint32_t); + +DECL_SYSCALL1(free, uint32_t); + +#endif diff --git a/src/userspace/main.c b/src/userspace/main.c deleted file mode 100644 index 4a8ff33..0000000 --- a/src/userspace/main.c +++ /dev/null @@ -1,13 +0,0 @@ -#include -#include - -void main() -{ - syscall_halt(); - // As char[]: 0xC105BFD6 - // As const char *: 0x8048B20 - - /* char test[] = "banane"; */ - /* syscall_write(test); */ - /* syscall_halt(); */ -} \ No newline at end of file diff --git a/src/userspace/mlibc/math.h b/src/userspace/mlibc/math.h deleted file mode 100644 index 57877ad..0000000 --- a/src/userspace/mlibc/math.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MELVIX_MATH_H -#define MELVIX_MATH_H - -int pow(int base, int exp); - -#endif \ No newline at end of file diff --git a/src/userspace/mlibc/math/pow.c b/src/userspace/mlibc/math/pow.c deleted file mode 100644 index 5cdcfa5..0000000 --- a/src/userspace/mlibc/math/pow.c +++ /dev/null @@ -1,13 +0,0 @@ -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; -} \ No newline at end of file diff --git a/src/userspace/mlibc/stdio.h b/src/userspace/mlibc/stdio.h deleted file mode 100644 index b44a9b7..0000000 --- a/src/userspace/mlibc/stdio.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef MELVIX_STDIO_H -#define MELVIX_STDIO_H - -#include - -char getch(); - -char *readline(); - -void writec(char c); - -void vprintf(const char *format, va_list args); - -void printf(const char *format, ...); - -#endif \ No newline at end of file diff --git a/src/userspace/mlibc/stdio/getch.c b/src/userspace/mlibc/stdio/getch.c deleted file mode 100644 index 908a871..0000000 --- a/src/userspace/mlibc/stdio/getch.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -char getch() -{ - return (char)syscall_readc(); -} \ No newline at end of file diff --git a/src/userspace/mlibc/stdio/printf.c b/src/userspace/mlibc/stdio/printf.c deleted file mode 100644 index 5a50f8d..0000000 --- a/src/userspace/mlibc/stdio/printf.c +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include - -void printf(const char *fmt, ...) -{ - va_list args; - va_start(args, fmt); - vprintf(fmt, args); - va_end(args); -} \ No newline at end of file diff --git a/src/userspace/mlibc/stdio/readline.c b/src/userspace/mlibc/stdio/readline.c deleted file mode 100644 index b59545b..0000000 --- a/src/userspace/mlibc/stdio/readline.c +++ /dev/null @@ -1,14 +0,0 @@ -#include -#include - -char *readline() -{ - char *ret = malloc(256); - char buf = 0; - while (buf != '\n') { - buf = getch(); - writec(buf); - strcpy(ret, &buf); - } - return ret; -} \ No newline at end of file diff --git a/src/userspace/mlibc/stdio/vprintf.c b/src/userspace/mlibc/stdio/vprintf.c deleted file mode 100644 index 0f5ae68..0000000 --- a/src/userspace/mlibc/stdio/vprintf.c +++ /dev/null @@ -1,52 +0,0 @@ -#include -#include -#include -#include - -void _writes(const char *data) -{ - for (size_t i = 0; i < strlen(data); i++) - writec(data[i]); -} - -void vprintf(const char *fmt, va_list args) -{ - uint8_t readyToFormat = 0; - - char buff = 0; - - for (; *fmt; fmt++) { - if (readyToFormat) { - if (*fmt == '%') { - writec('%'); - readyToFormat = 0; - continue; - } - - buff = *fmt; - if (buff == 's') { - const char *str = va_arg(args, const char *); - _writes(str); - readyToFormat = 0; - } else if (buff == 'x') { - char *p = htoa((uint32_t)va_arg(args, int)); - _writes(p); - free(p); - readyToFormat = 0; - } else if (buff == 'd') { - char *p = itoa(va_arg(args, int)); - _writes(p); - free(p); - readyToFormat = 0; - } else if (buff == 'c') { - writec((char)va_arg(args, int)); - readyToFormat = 0; - } - } else { - if (*fmt == '%') - readyToFormat = 1; - else - writec(*fmt); - } - } -} \ No newline at end of file diff --git a/src/userspace/mlibc/stdio/writec.c b/src/userspace/mlibc/stdio/writec.c deleted file mode 100644 index 1f918b6..0000000 --- a/src/userspace/mlibc/stdio/writec.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -void writec(char c) -{ - syscall_writec(c); -} \ No newline at end of file diff --git a/src/userspace/mlibc/stdlib.h b/src/userspace/mlibc/stdlib.h deleted file mode 100644 index 3ccdec2..0000000 --- a/src/userspace/mlibc/stdlib.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef MELVIX_STDLIB_H -#define MELVIX_STDLIB_H - -#include - -#ifndef MELVIX_ALLOC_H - -#include - -#endif - -#ifndef MELVIX_STRING_H - -#include - -#endif - -char *itoa(int n); - -int atoi(char *str); - -char *htoa(uint32_t n); - -int htoi(char *str); - -#endif \ No newline at end of file diff --git a/src/userspace/mlibc/stdlib/atoi.c b/src/userspace/mlibc/stdlib/atoi.c deleted file mode 100644 index f1c3755..0000000 --- a/src/userspace/mlibc/stdlib/atoi.c +++ /dev/null @@ -1,28 +0,0 @@ -#include -#include -#include -#include - -int atoi(char *str) -{ - size_t s_str = strlen(str); - if (!s_str) - return 0; - - uint8_t negative = 0; - if (str[0] == '-') - negative = 1; - - size_t i = 0; - if (negative) - i++; - - int ret = 0; - for (; i < s_str; i++) { - ret += (str[i] - '0') * pow(10, (s_str - i) - 1); - } - - if (negative) - ret *= -1; - return ret; -} \ No newline at end of file diff --git a/src/userspace/mlibc/stdlib/htoa.c b/src/userspace/mlibc/stdlib/htoa.c deleted file mode 100644 index 42cc71c..0000000 --- a/src/userspace/mlibc/stdlib/htoa.c +++ /dev/null @@ -1,32 +0,0 @@ -#include -#include -#include - -static const char HTOA_TABLE[] = "0123456789ABCDEF"; - -char *htoa(uint32_t n) -{ - char *ret = 0; - //kmalloc(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); - // kfree(ret); - ret = aux; - - strinv(ret); - return ret; -} \ No newline at end of file diff --git a/src/userspace/mlibc/stdlib/htoi.c b/src/userspace/mlibc/stdlib/htoi.c deleted file mode 100644 index 69149d6..0000000 --- a/src/userspace/mlibc/stdlib/htoi.c +++ /dev/null @@ -1,23 +0,0 @@ -#include -#include -#include - -int htoi(char *str) -{ - size_t s_str = strlen(str); - - size_t 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, (s_str - i) - 1); - } - - return ret; -} \ No newline at end of file diff --git a/src/userspace/mlibc/stdlib/itoa.c b/src/userspace/mlibc/stdlib/itoa.c deleted file mode 100644 index 6db7539..0000000 --- a/src/userspace/mlibc/stdlib/itoa.c +++ /dev/null @@ -1,48 +0,0 @@ -#include -#include -#include - -static const char ITOA_TABLE[] = "0123456789"; - -char *itoa(int n) -{ - //if (paging_enabled == 0) - // return "0"; // kmalloc isn't available - - if (!n) { - char *ret = 0; - //kmalloc(2); - ret[0] = '0'; - ret[1] = 0; - return ret; - } - uint8_t negative = (uint8_t)(n < 0); - if (negative) - n *= -1; - - int sz; - for (sz = 0; n % pow(10, sz) != n; sz++) { - } - - char *ret = 0; - //kmalloc(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 = 0; - //kmalloc(sz + 2); - strcpy(aux, ret); - aux[sz] = '-'; - aux[sz + 1] = 0; - // kfree(ret); - ret = aux; - } - - strinv(ret); - return ret; -} \ No newline at end of file diff --git a/src/userspace/mlibc/stdlib/liballoc.c b/src/userspace/mlibc/stdlib/liballoc.c deleted file mode 100644 index e57a5e2..0000000 --- a/src/userspace/mlibc/stdlib/liballoc.c +++ /dev/null @@ -1,12 +0,0 @@ -#include -#include - -void *malloc(size_t count) -{ - return (void *)syscall_alloc(count); -} - -void free(void *ptr) -{ - syscall_free((uint32_t)ptr); -} \ No newline at end of file diff --git a/src/userspace/mlibc/stdlib/liballoc.h b/src/userspace/mlibc/stdlib/liballoc.h deleted file mode 100644 index 64b7cce..0000000 --- a/src/userspace/mlibc/stdlib/liballoc.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef MELVIX_ALLOC_H -#define MELVIX_ALLOC_H - -#include - -void *malloc(size_t); - -void free(void *); - -#endif \ No newline at end of file diff --git a/src/userspace/mlibc/string.h b/src/userspace/mlibc/string.h deleted file mode 100644 index ad0858d..0000000 --- a/src/userspace/mlibc/string.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef MELVIX_STRING_H -#define MELVIX_STRING_H - -#include - -size_t strlen(const char *str); - -void strcpy(char *dest, const char *orig); - -void strdisp(char *str, int n); - -void strcat(char *dest, const char *orig); - -void strcati(char *dest, const char *orig); - -char strcmp(const char *a, const char *b); - -char *strdup(const char *orig); - -void strinv(char *str); - -void *memcpy(void *dest, const void *src, size_t count); - -void *memset(void *dest, char val, size_t count); - -int memcmp(const void *a_ptr, const void *b_ptr, size_t size); - -#endif \ No newline at end of file diff --git a/src/userspace/mlibc/string/memcmp.c b/src/userspace/mlibc/string/memcmp.c deleted file mode 100644 index f1f1e3f..0000000 --- a/src/userspace/mlibc/string/memcmp.c +++ /dev/null @@ -1,14 +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 (b[i] < a[i]) - return 1; - } - return 0; -} \ No newline at end of file diff --git a/src/userspace/mlibc/string/memcpy.c b/src/userspace/mlibc/string/memcpy.c deleted file mode 100644 index eec798b..0000000 --- a/src/userspace/mlibc/string/memcpy.c +++ /dev/null @@ -1,10 +0,0 @@ -#include - -void *memcpy(void *dest, const void *src, size_t count) -{ - const char *sp = (const char *)src; - char *dp = (char *)dest; - for (; count != 0; count--) - *dp++ = *sp++; - return dest; -} \ No newline at end of file diff --git a/src/userspace/mlibc/string/memset.c b/src/userspace/mlibc/string/memset.c deleted file mode 100644 index 1d9bec1..0000000 --- a/src/userspace/mlibc/string/memset.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -void *memset(void *dest, char val, size_t count) -{ - char *temp = (char *)dest; - for (; count != 0; count--) - *temp++ = val; - return dest; -} \ No newline at end of file diff --git a/src/userspace/mlibc/string/strcat.c b/src/userspace/mlibc/string/strcat.c deleted file mode 100644 index 0374e6c..0000000 --- a/src/userspace/mlibc/string/strcat.c +++ /dev/null @@ -1,11 +0,0 @@ -#include - -void strcat(char *dest, const char *orig) -{ - size_t s_dest = strlen(dest); - size_t s_orig = strlen(orig); - - for (size_t i = 0; i < s_orig; i++) - dest[s_dest + i] = orig[i]; - dest[s_dest + s_orig] = 0; -} \ No newline at end of file diff --git a/src/userspace/mlibc/string/strcati.c b/src/userspace/mlibc/string/strcati.c deleted file mode 100644 index be39b51..0000000 --- a/src/userspace/mlibc/string/strcati.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -void strcati(char *dest, const char *orig) -{ - size_t s_orig = strlen(orig); - strdisp(dest, (int)s_orig); - for (size_t i = 0; i < s_orig; i++) - dest[i] = orig[i]; -} \ No newline at end of file diff --git a/src/userspace/mlibc/string/strcmp.c b/src/userspace/mlibc/string/strcmp.c deleted file mode 100644 index 8cbf189..0000000 --- a/src/userspace/mlibc/string/strcmp.c +++ /dev/null @@ -1,13 +0,0 @@ -#include - -char strcmp(const char *a, const char *b) -{ - if (strlen(a) != strlen(b)) - return 1; - - for (size_t i = 0; i < strlen(a); i++) - if (a[i] != b[i]) - return 1; - - return 0; -} \ No newline at end of file diff --git a/src/userspace/mlibc/string/strcpy.c b/src/userspace/mlibc/string/strcpy.c deleted file mode 100644 index 3a4832c..0000000 --- a/src/userspace/mlibc/string/strcpy.c +++ /dev/null @@ -1,10 +0,0 @@ -#include - -void strcpy(char *dest, const char *orig) -{ - size_t s_orig = strlen(orig); - - for (size_t i = 0; i < s_orig; i++) - dest[i] = orig[i]; - dest[s_orig] = 0; -} \ No newline at end of file diff --git a/src/userspace/mlibc/string/strdisp.c b/src/userspace/mlibc/string/strdisp.c deleted file mode 100644 index 51c5a90..0000000 --- a/src/userspace/mlibc/string/strdisp.c +++ /dev/null @@ -1,14 +0,0 @@ -#include - -void strdisponce(char *str) -{ - for (size_t i = sizeof(str) + 2; i > 0; i--) - str[i] = str[i - 1]; - str[0] = 0; -} - -void strdisp(char *str, int n) -{ - for (int i = 0; i < n; i++) - strdisponce(str); -} \ No newline at end of file diff --git a/src/userspace/mlibc/string/strdup.c b/src/userspace/mlibc/string/strdup.c deleted file mode 100644 index 6a4fa86..0000000 --- a/src/userspace/mlibc/string/strdup.c +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include - -char *strdup(const char *orig) -{ - // size_t s_orig = strlen(orig); - char *ret = 0; - // kmalloc(s_orig + 1); - strcpy(ret, orig); - return ret; -} \ No newline at end of file diff --git a/src/userspace/mlibc/string/strinv.c b/src/userspace/mlibc/string/strinv.c deleted file mode 100644 index 20b916e..0000000 --- a/src/userspace/mlibc/string/strinv.c +++ /dev/null @@ -1,13 +0,0 @@ -#include - -void strinv(char *str) -{ - size_t s_str = strlen(str); - - int iterations = (int)s_str / 2; - for (int i = 0; i < iterations; i++) { - char aux = str[i]; - str[i] = str[(s_str - i) - 1]; - str[(s_str - i) - 1] = aux; - } -} \ No newline at end of file diff --git a/src/userspace/mlibc/string/strlen.c b/src/userspace/mlibc/string/strlen.c deleted file mode 100644 index f652495..0000000 --- a/src/userspace/mlibc/string/strlen.c +++ /dev/null @@ -1,35 +0,0 @@ -#include - -size_t strlen(const char *str) -{ - const char *char_ptr; - const unsigned long int *longword_ptr; - unsigned long int longword, himagic, lomagic; - - for (char_ptr = str; ((unsigned long int)char_ptr & (sizeof(longword) - 1)) != 0; - ++char_ptr) - if (*char_ptr == '\0') - return char_ptr - str; - - longword_ptr = (unsigned long int *)char_ptr; - - himagic = 0x80808080L; - lomagic = 0x01010101L; - - for (;;) { - longword = *longword_ptr++; - - if (((longword - lomagic) & himagic) != 0) { - const char *cp = (const char *)(longword_ptr - 1); - - if (cp[0] == 0) - return cp - str; - if (cp[1] == 0) - return cp - str + 1; - if (cp[2] == 0) - return cp - str + 2; - if (cp[3] == 0) - return cp - str + 3; - } - } -} \ No newline at end of file diff --git a/src/userspace/programs/sh.c b/src/userspace/programs/sh.c new file mode 100644 index 0000000..3cb2bf9 --- /dev/null +++ b/src/userspace/programs/sh.c @@ -0,0 +1,10 @@ +#include + +void main() +{ + syscall_write("\nHello from Userspace!\n"); + + syscall_write("> "); + + syscall_halt(); +} diff --git a/src/userspace/syscall.c b/src/userspace/syscall.c deleted file mode 100644 index 9462b10..0000000 --- a/src/userspace/syscall.c +++ /dev/null @@ -1,20 +0,0 @@ -#include - -/** - * DEFINITIONS - */ -DEFN_SYSCALL0(halt, 0); - -DEFN_SYSCALL1(write, 1, const char *); - -DEFN_SYSCALL1(read, 2, const char *); - -DEFN_SYSCALL1(writec, 3, char); - -DEFN_SYSCALL0(readc, 4); - -DEFN_SYSCALL0(get_pointers, 5); - -DEFN_SYSCALL1(alloc, 6, uint32_t); - -DEFN_SYSCALL1(free, 7, uint32_t); \ No newline at end of file diff --git a/src/userspace/syscall.h b/src/userspace/syscall.h deleted file mode 100644 index 9f5bdb0..0000000 --- a/src/userspace/syscall.h +++ /dev/null @@ -1,87 +0,0 @@ -#ifndef MELVIX_SYSCALL_H -#define MELVIX_SYSCALL_H - -#include - -#define DECL_SYSCALL0(fn) int syscall_##fn(); -#define DECL_SYSCALL1(fn, p1) int syscall_##fn(p1); -#define DECL_SYSCALL2(fn, p1, p2) int syscall_##fn(p1, p2); -#define DECL_SYSCALL3(fn, p1, p2, p3) int syscall_##fn(p1, p2, p3); -#define DECL_SYSCALL4(fn, p1, p2, p3, p4) int syscall_##fn(p1, p2, p3, p4); -#define DECL_SYSCALL5(fn, p1, p2, p3, p4, p5) int syscall_##fn(p1, p2, p3, p4, p5); - -#define DEFN_SYSCALL0(fn, num) \ - int syscall_##fn() \ - { \ - int a; \ - asm volatile("int $0x80" : "=a"(a) : "0"(num)); \ - return a; \ - } - -#define DEFN_SYSCALL1(fn, num, P1) \ - int syscall_##fn(P1 p1) \ - { \ - int a; \ - asm volatile("int $0x80" : "=a"(a) : "0"(num), "b"((int)p1)); \ - return a; \ - } - -#define DEFN_SYSCALL2(fn, num, P1, P2) \ - int syscall_##fn(P1 p1, P2 p2) \ - { \ - int a; \ - asm volatile("int $0x80" : "=a"(a) : "0"(num), "b"((int)p1), "c"((int)p2)); \ - return a; \ - } - -#define DEFN_SYSCALL3(fn, num, P1, P2, P3) \ - int syscall_##fn(P1 p1, P2 p2, P3 p3) \ - { \ - int a; \ - asm volatile("int $0x80" \ - : "=a"(a) \ - : "0"(num), "b"((int)p1), "c"((int)p2), "d"((int)p3)); \ - return a; \ - } - -#define DEFN_SYSCALL4(fn, num, P1, P2, P3, P4) \ - int syscall_##fn(P1 p1, P2 p2, P3 p3, P4 p4) \ - { \ - int a; \ - asm volatile("int $0x80" \ - : "=a"(a) \ - : "0"(num), "b"((int)p1), "c"((int)p2), "d"((int)p3), "S"((int)p4)); \ - return a; \ - } - -#define DEFN_SYSCALL5(fn, num) \ - int syscall_##fn(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) \ - { \ - int a; \ - asm volatile("int $0x80" \ - : "=a"(a) \ - : "0"(num), "b"((int)p1), "c"((int)p2), "d"((int)p3), "S"((int)p4), \ - "D"((int)p5)); \ - return a; \ - } - -/** - * DECLARATIONS - */ -DECL_SYSCALL0(halt); - -DECL_SYSCALL1(write, const char *); - -DECL_SYSCALL1(read, const char *); - -DECL_SYSCALL1(writec, char); - -DECL_SYSCALL0(readc); - -DECL_SYSCALL0(get_pointers); - -DECL_SYSCALL1(alloc, uint32_t); - -DECL_SYSCALL1(free, uint32_t); - -#endif \ No newline at end of file -- cgit v1.2.3