ratio submodule

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "libbozo"]
-	path = libbozo
-	url = git@git.chauvet.pro:starnakin/42_KFS_LIB.git

libbozo

@@ -1 +0,0 @@
-Subproject commit 5b4d1fbf365d39322bfa0b19b450b68f4bc75426

libbozo/Makefile

@@ -0,0 +1,34 @@
+SRCDIR = src
+OBJDIR = obj
+BUILDDIR = build
+
+SRC := $(shell find $(SRCDIR) -name '*.c')
+OBJ := $(patsubst $(SRCDIR)/%.c,$(OBJDIR)/%.o,$(SRC))
+
+CC = i386-elf-gcc
+CFLAGS = -std=gnu99 -ffreestanding -O2 -Wall -Wextra -iquoteheaders -c
+
+AR = ar
+ARFLAGS = 
+
+NAME = libbozo.a
+
+$(OBJDIR)/%.o: $(SRCDIR)/%.c
+	mkdir -p  $(dir $@)
+	$(CC) $(CFLAGS) $< -o $@
+
+all : $(NAME)
+
+clean :
+	rm -rf $(OBJDIR)
+
+fclean : clean
+	rm -rf $(BUILDDIR)
+
+$(NAME) : $(OBJ)
+	mkdir -p $(BUILDDIR)
+	$(AR) -rc $(BUILDDIR)/$(NAME) $(OBJ)
+
+re: fclean all
+
+.PHONY: clean fclean test all re

libbozo/headers/ctype.h

@@ -0,0 +1,37 @@
+#pragma once
+
+/*
+int isalnum(int c);
+int isalpha(int c);
+int iscntrl(int c);
+*/
+int isdigit(int c);
+/*
+int isgraph(int c);
+int islower(int c);
+*/
+int isprint(int c);
+/*
+int ispunct(int c);
+int isspace(int c);
+int isupper(int c);
+int isxdigit(int c);
+
+int isascii(int c);
+int isblank(int c);
+
+int isalnum_l(int c, locale_t locale);
+int isalpha_l(int c, locale_t locale);
+int isblank_l(int c, locale_t locale);
+int iscntrl_l(int c, locale_t locale);
+int isdigit_l(int c, locale_t locale);
+int isgraph_l(int c, locale_t locale);
+int islower_l(int c, locale_t locale);
+int isprint_l(int c, locale_t locale);
+int ispunct_l(int c, locale_t locale);
+int isspace_l(int c, locale_t locale);
+int isupper_l(int c, locale_t locale);
+int isxdigit_l(int c, locale_t locale);
+
+int isascii_l(int c, locale_t locale);
+*/

libbozo/headers/kprintf.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <stdarg.h>
+
+enum print_level {
+    KERN_EMERG,
+    KERN_ALERT,
+    KERN_CRIT,
+    KERN_ERR,
+    KERN_WARNING,
+    KERN_NOTICE,
+    KERN_INFO,
+    KERN_DEBUG,
+    KERN_DEFAULT,
+    KERN_CONT
+};
+
+int kprintf(int level, const char *restrict format, ...);
+int kvprintf(int level, const char *restrict format, va_list ap);

libbozo/headers/stdlib.h

@@ -0,0 +1,5 @@
+#pragma once
+
+int atoi(const char *nptr);
+long atol(const char *nptr);
+long long atoll(const char *nptr);

libbozo/headers/string.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include <stddef.h>
+
+char *strchr(const char *str, int c);
+int strcmp(const char *s1, const char *s2);
+int strncmp(const char *s1, const char *s2, size_t n);
+size_t strlen(const char *str);
+char *strstr(const char *haystack, const char *needle);
+void *memcpy(void *dest, const void *src, size_t n);

libbozo/headers/sys/io.h

@@ -0,0 +1,16 @@
+#pragma once
+
+static inline void outb(uint16_t port, uint8_t val)
+{
+    __asm__ volatile ( "outb %b0, %w1" : : "a"(val), "Nd"(port) : "memory");
+}
+
+static inline uint8_t inb(uint16_t port)
+{
+    uint8_t ret;
+    __asm__ volatile ( "inb %w1, %b0"
+                   : "=a"(ret)
+                   : "Nd"(port)
+                   : "memory");
+    return ret;
+}

libbozo/headers/terminal.h

@@ -0,0 +1,115 @@
+#pragma once
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+enum vga_color {
+	VGA_COLOR_BLACK = 0,
+	VGA_COLOR_BLUE = 1,
+	VGA_COLOR_GREEN = 2,
+	VGA_COLOR_CYAN = 3,
+	VGA_COLOR_RED = 4,
+	VGA_COLOR_MAGENTA = 5,
+	VGA_COLOR_BROWN = 6,
+	VGA_COLOR_LIGHT_GREY = 7,
+	VGA_COLOR_DARK_GREY = 8,
+	VGA_COLOR_LIGHT_BLUE = 9,
+	VGA_COLOR_LIGHT_GREEN = 10,
+	VGA_COLOR_LIGHT_CYAN = 11,
+	VGA_COLOR_LIGHT_RED = 12,
+	VGA_COLOR_LIGHT_MAGENTA = 13,
+	VGA_COLOR_LIGHT_BROWN = 14,
+	VGA_COLOR_WHITE = 15,
+};
+
+void terminal_initialize(void);
+void terminal_setcolor(uint8_t color);
+void terminal_putentryat(char c, uint8_t color, size_t x, size_t y);
+int terminal_putchar(char c);
+int terminal_write(const char* data, size_t size);
+int terminal_writestring(const char* data);
+int terminal_writelong(long number);
+
+#define KEYBOARD_PORT 0x60
+
+#define KEY_A 0x1E
+#define KEY_B 0x30
+#define KEY_C 0x2E
+#define KEY_D 0x20
+#define KEY_E 0x12
+#define KEY_F 0x21
+#define KEY_G 0x22
+#define KEY_H 0x23
+#define KEY_I 0x17
+#define KEY_J 0x24
+#define KEY_K 0x25
+#define KEY_L 0x26
+#define KEY_M 0x32
+#define KEY_N 0x31
+#define KEY_O 0x18
+#define KEY_P 0x19
+#define KEY_Q 0x10
+#define KEY_R 0x13
+#define KEY_S 0x1F
+#define KEY_T 0x14
+#define KEY_U 0x16
+#define KEY_V 0x2F
+#define KEY_W 0x11
+#define KEY_X 0x2D
+#define KEY_Y 0x15
+#define KEY_Z 0x2C
+#define KEY_1 0x02
+#define KEY_2 0x03
+#define KEY_3 0x04
+#define KEY_4 0x05
+#define KEY_5 0x06
+#define KEY_6 0x07
+#define KEY_7 0x08
+#define KEY_8 0x09
+#define KEY_9 0x0A
+#define KEY_0 0x0B
+#define KEY_MINUS 0x0C
+#define KEY_EQUAL 0x0D
+#define KEY_SQUARE_OPEN_BRACKET 0x1A
+#define KEY_SQUARE_CLOSE_BRACKET 0x1B
+#define KEY_SEMICOLON 0x27
+#define KEY_BACKSLASH 0x2B
+#define KEY_COMMA 0x33
+#define KEY_DOT 0x34
+#define KEY_FORESLHASH 0x35
+#define KEY_F1 0x3B
+#define KEY_F2 0x3C
+#define KEY_F3 0x3D
+#define KEY_F4 0x3E
+#define KEY_F5 0x3F
+#define KEY_F6 0x40
+#define KEY_F7 0x41
+#define KEY_F8 0x42
+#define KEY_F9 0x43
+#define KEY_F10 0x44
+#define KEY_F11 0x85
+#define KEY_F12 0x86
+#define KEY_BACKSPACE 0x0E
+#define KEY_DELETE 0x53
+#define KEY_DOWN 0x50
+#define KEY_END 0x4F
+#define KEY_ENTER 0x1C
+#define KEY_ESC 0x01
+#define KEY_HOME 0x47
+#define KEY_INSERT 0x52
+#define KEY_KEYPAD_5 0x4C
+#define KEY_KEYPAD_MUL 0x37
+#define KEY_KEYPAD_Minus 0x4A
+#define KEY_KEYPAD_PLUS 0x4E
+#define KEY_KEYPAD_DIV 0x35
+#define KEY_LEFT 0x4B
+#define KEY_PAGE_DOWN 0x51
+#define KEY_PAGE_UP 0x49
+#define KEY_PRINT_SCREEN 0x37
+#define KEY_RIGHT 0x4D
+#define KEY_SPACE 0x39
+#define KEY_TAB 0x0F
+#define KEY_UP 0x48
+
+uint8_t terminal_getkey();

libbozo/src/ctype/isdigit.c

@@ -0,0 +1,4 @@
+int isdigit(int c)
+{
+    return '9' >= c && c >= '0';
+}

libbozo/src/ctype/isprint.c

@@ -0,0 +1,4 @@
+int	isprint(int c)
+{
+	return (32 <= c && c < 127);
+}

libbozo/src/kprint/kprintf.c

@@ -0,0 +1,18 @@
+#include "kprintf.h"
+#include "string.h"
+#include "terminal.h"
+#include "ctype.h"
+
+#include <stdarg.h>
+
+int kprintf(int level, const char *restrict format, ...)
+{
+    va_list	va;
+	int		i;
+
+	va_start(va, format);
+	i = kvprintf(level, format, va);
+	va_end(va);
+
+	return (i);
+}

libbozo/src/kprint/kvprintf.c

@@ -0,0 +1,41 @@
+#include "ctype.h"
+#include "kprintf.h"
+#include "stdlib.h"
+#include "string.h"
+#include "terminal.h"
+
+#include <stdarg.h>
+
+static int print_flag(char flag, va_list *ap)
+{
+	switch (flag) {
+	case '%':
+		return terminal_putchar('%');
+	case 'i':
+		return terminal_writelong(va_arg(*ap, int));
+	case 'd':
+		return terminal_writelong(va_arg(*ap, int));
+	case 'c':
+		return terminal_putchar(va_arg(*ap, int));
+	case 's':
+		return terminal_writestring(va_arg(*ap, char *));
+	}
+	return 0;
+}
+
+int kvprintf(int level, const char *restrict format, va_list ap)
+{
+	const char *start = format;
+	int ret = 0;
+
+	while (*start != '\0') {
+		if (*start == '%' && *(start + 1) != '\0') {
+			ret += print_flag(*(start + 1), &ap);
+			start++;
+		} else {
+			ret += terminal_putchar(*start);
+		}
+		start++;
+	}
+	return ret;
+}

libbozo/src/stdlib/atoi.c

@@ -0,0 +1,6 @@
+#include "../../headers/stdlib.h"
+
+int atoi(const char *str)
+{
+    return atoll(str);
+}

libbozo/src/stdlib/atol.c

@@ -0,0 +1,6 @@
+#include "../../headers/stdlib.h"
+
+long atol(const char *str)
+{
+    return atoll(str);
+}

libbozo/src/stdlib/atoll.c

@@ -0,0 +1,13 @@
+#include "../../headers/ctype.h"
+
+long long atoll(const char *str)
+{
+    const char *start = str;
+    long long ret = 0;
+
+    while (*start != '\0') {
+        if (isdigit(*str))
+            ret = ret * 10 + *str - '0';
+    }
+    return ret;
+}

libbozo/src/string/memcpy.c

@@ -0,0 +1,14 @@
+#include "kprintf.h"
+#include <stddef.h>
+#include <stdint.h>
+
+void *memcpy(void *dest, const void *src, size_t n)
+{
+	uint16_t *c1 = (uint16_t *)dest;
+	const uint16_t *c2 = (const uint16_t *)src;
+
+	for (size_t i = 0; i < n; i++)
+		c1[i] = c2[i];
+	kprintf(0, "c1: %s\n", c1);
+	return c1;
+}

libbozo/src/string/strchr.c

@@ -0,0 +1,14 @@
+#include <stddef.h>
+
+char *strchr(const char *str, int c)
+{
+	char *start = (char *) str;
+
+	while (*start)
+	{
+		if (*start == c)
+			return start;
+		start++;
+	}
+	return NULL;
+}

libbozo/src/string/strcmp.c

@@ -0,0 +1,10 @@
+#include <stddef.h>
+
+int strcmp(const char *s1, const char *s2)
+{
+	size_t i = 0;
+
+	while (s1[i] == s2[i] && s1[i] != '\0')
+		i++;
+	return s1[i] - s2[i];
+}

libbozo/src/string/strlen.c

@@ -0,0 +1,10 @@
+#include <stddef.h>
+
+size_t	strlen(const char *str)
+{
+	const char *start = str;
+
+	while (*start != '\0')
+		start++;
+	return start - str;
+}

libbozo/src/string/strncmp.c

@@ -0,0 +1,12 @@
+#include <stddef.h>
+
+int strncmp(const char *s1, const char *s2, size_t n)
+{
+	size_t i = 0;
+
+	if (n == 0)
+		return 0;
+	while (s1[i] == s2[i] && i < (n - 1))
+		i++;
+	return s1[i] - s2[i];
+}

libbozo/src/string/strstr.c

@@ -0,0 +1,18 @@
+#include "string.h"
+
+#include <stddef.h>
+
+char *strstr(const char *haystack, const char *needle)
+{
+	char *start = (char *) haystack;
+	size_t len;
+
+	len = strlen(needle);
+	while (*start != '\0')
+	{
+		if (strncmp(start, needle, len) == 0)
+			return start;
+		start++;
+	}
+	return NULL;
+}

libbozo/src/terminal/get.c

@@ -0,0 +1,15 @@
+#include "terminal.h"
+#include "sys/io.h"
+#include "kprintf.h"
+
+uint8_t terminal_getkey()
+{
+    static uint8_t prev_scan_code = 0;
+    uint8_t scan_code;
+
+    scan_code = inb(KEYBOARD_PORT);
+    if (scan_code != prev_scan_code && prev_scan_code != 0)
+        kprintf(0, "%d", scan_code);
+    prev_scan_code = scan_code;
+    return scan_code;
+}

libbozo/src/terminal/put.c

@@ -0,0 +1,113 @@
+#include "terminal.h"
+#include "ctype.h"
+#include "kprintf.h"
+#include "string.h"
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+static inline uint8_t vga_entry_color(enum vga_color fg, enum vga_color bg)
+{
+	return fg | bg << 4;
+}
+
+static inline uint16_t vga_entry(unsigned char uc, uint8_t color)
+{
+	return (uint16_t)uc | (uint16_t)color << 8;
+}
+
+#define VGA_WIDTH 80
+#define VGA_HEIGHT 25
+
+size_t terminal_row;
+size_t terminal_column;
+uint8_t terminal_color;
+uint16_t *terminal_buffer;
+void terminal_initialize(void)
+{
+	terminal_row = 0;
+	terminal_column = 0;
+	terminal_color = vga_entry_color(VGA_COLOR_LIGHT_GREY, VGA_COLOR_BLACK);
+	terminal_buffer = (uint16_t *)0xB8000;
+	for (size_t y = 0; y < VGA_HEIGHT; y++) {
+		for (size_t x = 0; x < VGA_WIDTH; x++) {
+			const size_t index = y * VGA_WIDTH + x;
+			terminal_buffer[index] = vga_entry(' ', terminal_color);
+		}
+	}
+}
+
+void terminal_setcolor(uint8_t color)
+{
+	terminal_color = color;
+}
+
+void terminal_putentryat(char c, uint8_t color, size_t x, size_t y)
+{
+	const size_t index = y * VGA_WIDTH + x;
+	terminal_buffer[index] = vga_entry(c, color);
+}
+
+static void terminal_scroll(void)
+{
+	terminal_row--;
+	for (size_t i = 0; i < VGA_WIDTH * (VGA_HEIGHT - 1); i++)
+		terminal_buffer[i] = terminal_buffer[i + VGA_WIDTH];
+	for (size_t i = 0; i < VGA_WIDTH; i++)
+		terminal_putentryat(' ', terminal_color, i, VGA_HEIGHT - 1);
+}
+
+static void terminal_new_line(void)
+{
+	terminal_column = 0;
+	if (++terminal_row == VGA_HEIGHT)
+		terminal_scroll();
+}
+
+int terminal_putchar(char c)
+{
+	if (c == '\r')
+		terminal_column = 0;
+	else if (c == '\n')
+		terminal_new_line();
+	if (!isprint(c))
+		return 1;
+	terminal_putentryat(c, terminal_color, terminal_column, terminal_row);
+	if (++terminal_column == VGA_WIDTH)
+		terminal_new_line();
+	return 1;
+}
+
+int terminal_write(const char *data, size_t size)
+{
+	size_t i;
+	for (i = 0; i < size; i++)
+		terminal_putchar(data[i]);
+	return (int)i;
+}
+
+int terminal_writestring(const char *data)
+{
+	size_t len = strlen(data);
+	terminal_write(data, len);
+	return len;
+}
+
+int terminal_writelong(long n)
+{
+	long div = 10;
+	int rv = 0;
+	if (n < 0) {
+		rv += terminal_putchar('-');
+		n *= -1;
+	}
+	div = 1;
+	while (div <= n / 10)
+		div *= 10;
+	while (div > 0) {
+		rv += terminal_putchar('0' + n / div % 10);
+		div /= 10;
+	}
+	return rv;
+}