From 9dbc5231dd738d97eea13f8ecf9005e5b78ea0d3 Mon Sep 17 00:00:00 2001 From: Nic Gaffney Date: Sun, 17 Dec 2023 13:21:21 -0600 Subject: Restructured --- Makefile | 5 ++-- src/boot/boot.s | 59 ++++++++++++++++++++++++++++++++++++++++ src/boot/crti.s | 11 ++++++++ src/boot/crtn.s | 7 +++++ src/header/boot.s | 59 ---------------------------------------- src/header/crti.s | 11 -------- src/header/crtn.s | 7 ----- src/include/str.h | 2 +- src/kernel/gdt.c | 39 -------------------------- src/kernel/gdt/compile_flags.txt | 1 + src/kernel/gdt/gdt.c | 56 ++++++++++++++++++++++++++++++++++++++ src/kernel/gen_gdt.c | 19 ------------- src/kernel/kernel.c | 49 +++++++++++++++++++++++++++------ src/kernel/print.c | 2 +- src/utils/str.c | 6 ++-- 15 files changed, 182 insertions(+), 151 deletions(-) create mode 100644 src/boot/boot.s create mode 100644 src/boot/crti.s create mode 100644 src/boot/crtn.s delete mode 100644 src/header/boot.s delete mode 100644 src/header/crti.s delete mode 100644 src/header/crtn.s delete mode 100644 src/kernel/gdt.c create mode 100644 src/kernel/gdt/compile_flags.txt create mode 100644 src/kernel/gdt/gdt.c delete mode 100644 src/kernel/gen_gdt.c diff --git a/Makefile b/Makefile index 2d16e10..f855c41 100644 --- a/Makefile +++ b/Makefile @@ -27,8 +27,8 @@ ASM_OBJS := $(ASM:$(SRC)/%.s=$(BUILD)/%.o) CRTBEGIN_OBJ := $(shell $(CC) $(CFLAGS) -print-file-name=crtbegin.o) CRTEND_OBJ := $(shell $(CC) $(CFLAGS) -print-file-name=crtend.o) -CRTI_OBJ = $(BUILD)/header/crti.o -CRTN_OBJ = $(BUILD)/header/crtn.o +CRTI_OBJ = $(BUILD)/boot/crti.o +CRTN_OBJ = $(BUILD)/boot/crtn.o OBJS += $(CRTI_OBJ) $(CRTBEGIN_OBJ) OBJS += $(C_OBJS) $(ASM_OBJS) @@ -65,3 +65,4 @@ clean: rm -rf $(INTERNAL_OBJS) rm -rf $(OUT_DIR)/$(ISO).iso rm -rf $(OUT_DIR)/isodir/boot/$(ISO).bin + rm -rf $(BUILD) diff --git a/src/boot/boot.s b/src/boot/boot.s new file mode 100644 index 0000000..aba32ff --- /dev/null +++ b/src/boot/boot.s @@ -0,0 +1,59 @@ +MBALIGN equ 1<<0 ; Align loaded modules on page boundries */ +MBMEMINFO equ 1<<1 ; Provide memory map*/ +MBFLAGS equ MBALIGN | MBMEMINFO ; Multiboot flag field*/ +MAGIC equ 0x1BADB002 ;Lets bootloader find header*/ +CHECKSUM equ -(MAGIC + MBFLAGS) ; Proves we are multiboot via checksum*/ +CODESEG equ 0x08 +DATASEG equ 0x10 + +section .multiboot +align 4 + dd MAGIC + dd MBFLAGS + dd CHECKSUM + +section .bss +align 16 +stack_bottom: +resb 16384 +stack_top: + +section .text +global gdtr +gdtr: + dw 0 + dd 0 +global _start:function (_start.end - _start) +_start: + mov esp, stack_top + + extern get_gdtr + call get_gdtr + cli + lgdt [gdtr] + mov eax, cr0 + or al, 1 + mov cr0, eax + + call reloadSegments + + [bits 32] + extern kernel_main + call kernel_main + + + cli +.hang: hlt + jmp .hang +.end: + +reloadSegments: + JMP CODESEG:.reload_CS ; should def define a CODESEG +.reload_CS: + MOV AX, DATASEG + MOV DS, AX + MOV ES, AX ; TODO: Setup proper extra segment + MOV FS, AX ; TODO: Setup proper General purpose segments + MOV GS, AX ; ... + MOV SS, AX ; TODO: Setup proper stack segment + RET diff --git a/src/boot/crti.s b/src/boot/crti.s new file mode 100644 index 0000000..26d677a --- /dev/null +++ b/src/boot/crti.s @@ -0,0 +1,11 @@ +section .init +global _init:function +_init: + push ebp + mov ebp, esp, + +section .fini +global _fini +_fini: + push ebp + mov ebp, esp diff --git a/src/boot/crtn.s b/src/boot/crtn.s new file mode 100644 index 0000000..46f8de6 --- /dev/null +++ b/src/boot/crtn.s @@ -0,0 +1,7 @@ +section .init + pop ebp + ret + +section .fini + pop ebp + ret diff --git a/src/header/boot.s b/src/header/boot.s deleted file mode 100644 index aba32ff..0000000 --- a/src/header/boot.s +++ /dev/null @@ -1,59 +0,0 @@ -MBALIGN equ 1<<0 ; Align loaded modules on page boundries */ -MBMEMINFO equ 1<<1 ; Provide memory map*/ -MBFLAGS equ MBALIGN | MBMEMINFO ; Multiboot flag field*/ -MAGIC equ 0x1BADB002 ;Lets bootloader find header*/ -CHECKSUM equ -(MAGIC + MBFLAGS) ; Proves we are multiboot via checksum*/ -CODESEG equ 0x08 -DATASEG equ 0x10 - -section .multiboot -align 4 - dd MAGIC - dd MBFLAGS - dd CHECKSUM - -section .bss -align 16 -stack_bottom: -resb 16384 -stack_top: - -section .text -global gdtr -gdtr: - dw 0 - dd 0 -global _start:function (_start.end - _start) -_start: - mov esp, stack_top - - extern get_gdtr - call get_gdtr - cli - lgdt [gdtr] - mov eax, cr0 - or al, 1 - mov cr0, eax - - call reloadSegments - - [bits 32] - extern kernel_main - call kernel_main - - - cli -.hang: hlt - jmp .hang -.end: - -reloadSegments: - JMP CODESEG:.reload_CS ; should def define a CODESEG -.reload_CS: - MOV AX, DATASEG - MOV DS, AX - MOV ES, AX ; TODO: Setup proper extra segment - MOV FS, AX ; TODO: Setup proper General purpose segments - MOV GS, AX ; ... - MOV SS, AX ; TODO: Setup proper stack segment - RET diff --git a/src/header/crti.s b/src/header/crti.s deleted file mode 100644 index 26d677a..0000000 --- a/src/header/crti.s +++ /dev/null @@ -1,11 +0,0 @@ -section .init -global _init:function -_init: - push ebp - mov ebp, esp, - -section .fini -global _fini -_fini: - push ebp - mov ebp, esp diff --git a/src/header/crtn.s b/src/header/crtn.s deleted file mode 100644 index 46f8de6..0000000 --- a/src/header/crtn.s +++ /dev/null @@ -1,7 +0,0 @@ -section .init - pop ebp - ret - -section .fini - pop ebp - ret diff --git a/src/include/str.h b/src/include/str.h index 11b8408..4e84e9c 100644 --- a/src/include/str.h +++ b/src/include/str.h @@ -1,5 +1,5 @@ #pragma once #include -char *itoa(int, char *); +char *itoa(int, char *, int); size_t strlen(const char *); char *str_reverse(char *); diff --git a/src/kernel/gdt.c b/src/kernel/gdt.c deleted file mode 100644 index 96ddf67..0000000 --- a/src/kernel/gdt.c +++ /dev/null @@ -1,39 +0,0 @@ -#include "gdt.h" -#include - -uint16_t make_code(uint8_t priv, uint8_t dc, uint8_t rw) { - uint16_t access = 0; - access |= (1 << 7); - access |= (priv << 5); - access |= (0b11 << 3); - access |= (dc << 2); - access |= (rw << 1); // 10 - access <<= 8; - access |= FLAG; - return access; -} - -uint16_t make_data(uint8_t priv, uint8_t dc, uint8_t rw) { - uint16_t access = 0; - access |= (1 << 7); - access |= (priv << 5); - access |= (0b10 << 3); - access |= (dc << 2); - access |= (rw << 1); // 10 - access <<= 8; - access |= FLAG; - return access; -} - -Segment_Descriptor_t make_descriptor(uint32_t base, uint32_t limit, - uint16_t access_flag) { - uint16_t lim_low = limit; - uint16_t base_low = base; - uint8_t base_mid = (base >> 16); - uint8_t access_byte = access_flag >> 8; - uint8_t lim_flag = ((access_flag << 4) | (limit >> 16)); - uint8_t base_high = (base >> 24); - return (Segment_Descriptor_t){ - lim_low, base_low, base_mid, access_byte, lim_flag, base_high, - }; -} diff --git a/src/kernel/gdt/compile_flags.txt b/src/kernel/gdt/compile_flags.txt new file mode 100644 index 0000000..2af49c7 --- /dev/null +++ b/src/kernel/gdt/compile_flags.txt @@ -0,0 +1 @@ +-I../../include/ diff --git a/src/kernel/gdt/gdt.c b/src/kernel/gdt/gdt.c new file mode 100644 index 0000000..4886dc3 --- /dev/null +++ b/src/kernel/gdt/gdt.c @@ -0,0 +1,56 @@ +#include "gdt.h" +#include + +GDT_t *table = 0x0; +extern GDTR_t gdtr; +void get_gdtr() { + uint32_t base = 0x0000; + + *table = (GDT_t){ + // NULL + make_descriptor(0, 0, 0), + // Code segment, read + make_descriptor(base, 0x8FFFF, make_code(0, 0, 1)), + // Data segment, read write + make_descriptor(base, 0x8FFFF, make_data(0, 0, 1)), + }; + gdtr.size = sizeof(Segment_Descriptor_t) * 3 - 1; + gdtr.offset = base; +} + +uint16_t make_code(uint8_t priv, uint8_t dc, uint8_t rw) { + uint16_t access = 0; + access |= (1 << 7); + access |= (priv << 5); + access |= (0b11 << 3); + access |= (dc << 2); + access |= (rw << 1); // 10 + access <<= 8; + access |= FLAG; + return access; +} + +uint16_t make_data(uint8_t priv, uint8_t dc, uint8_t rw) { + uint16_t access = 0; + access |= (1 << 7); + access |= (priv << 5); + access |= (0b10 << 3); + access |= (dc << 2); + access |= (rw << 1); // 10 + access <<= 8; + access |= FLAG; + return access; +} + +Segment_Descriptor_t make_descriptor(uint32_t base, uint32_t limit, + uint16_t access_flag) { + uint16_t lim_low = limit; + uint16_t base_low = base; + uint8_t base_mid = (base >> 16); + uint8_t access_byte = access_flag >> 8; + uint8_t lim_flag = ((access_flag << 4) | (limit >> 16)); + uint8_t base_high = (base >> 24); + return (Segment_Descriptor_t){ + lim_low, base_low, base_mid, access_byte, lim_flag, base_high, + }; +} diff --git a/src/kernel/gen_gdt.c b/src/kernel/gen_gdt.c deleted file mode 100644 index ccfb461..0000000 --- a/src/kernel/gen_gdt.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "gdt.h" -#include - -GDT_t *table = 0x0; -extern GDTR_t gdtr; -void get_gdtr() { - uint32_t base = 0x0000; - - *table = (GDT_t){ - // NULL - make_descriptor(0, 0, 0), - // Code segment, read - make_descriptor(base, 0x8FFFF, make_code(0, 0, 1)), - // Data segment, read write - make_descriptor(base, 0x8FFFF, make_data(0, 0, 1)), - }; - gdtr.size = sizeof(Segment_Descriptor_t) * 3 - 1; - gdtr.offset = base; -} diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index 5f6f5ae..1fca95b 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -1,6 +1,5 @@ #include "print.h" -// Check if the compiler thinks we are targeting the wrong OS #if defined(__linux__) #error "Not using cross compiler!" #endif @@ -10,16 +9,48 @@ #error "Must use ix86-elf compiler" #endif +void motd() { + char *empty_row = " " + " \n"; + empty_row[0] = (char)186; + empty_row[79] = (char)186; + + printf("%c", 201); + for (int i = 0; i < 78; i++) + printf("%c", 205); + printf("%c\n", 187); + + printf(empty_row); + + printf("%c", 186); + for (int i = 0; i < 78 / 2 - 17 / 2; i++) + printf(" "); + printf("Welcome to gftos!"); + for (int i = 0; i < 78 / 2 - 17 / 2 - 1; i++) + printf(" "); + printf("%c\n", 186); + + for (int i = 0; i < 21; i++) { + printf(empty_row); + } + + printf("%c", 200); + for (int i = 0; i < 78; i++) + printf("%c", 205); + printf("%c", 188); +} + void kernel_main(void) { print_clear(); - for (int r = 0; r < 24; r++) { - for (int c = 0; c < 80; c += 3) { - int color = (r + c) % 15 + 1; - print_set_color(color, PRINT_COLOR_BLACK); - printf(":3 "); - } - printf("%n"); - } + motd(); + // for (int r = 0; r < 24; r++) { + // for (int c = 0; c < 80; c += 3) { + // int color = (r + c) % 15 + 1; + // print_set_color(color, PRINT_COLOR_BLACK); + // printf(":3"); + // } + // printf("%n"); + // } // print_set_color(PRINT_COLOR_YELLOW, PRINT_COLOR_BLACK); // printf("printf\n\tint: %d\n\tstring: %s\n\tchar: %c\n\tpercent: " // "%%\n\tnothing: %n", diff --git a/src/kernel/print.c b/src/kernel/print.c index d2857bc..d5e8790 100644 --- a/src/kernel/print.c +++ b/src/kernel/print.c @@ -112,7 +112,7 @@ void printf(const char *str, ...) { switch (str[++i]) { case 'i': case 'd': - print_str(itoa(va_arg(args, int), temp_str)); + print_str(itoa(va_arg(args, int), temp_str, 10)); break; case 's': print_str(va_arg(args, char *)); diff --git a/src/utils/str.c b/src/utils/str.c index 22daa30..9a7acb0 100644 --- a/src/utils/str.c +++ b/src/utils/str.c @@ -22,11 +22,11 @@ char *str_reverse(char *str) { return str; } -char *itoa(int num, char *str) { +char *itoa(int num, char *str, int base) { char *str_ptr = str; for (; num;) { - *str_ptr++ = num % 10 + 48; - num /= 10; + *str_ptr++ = num % base + 48; + num /= base; } str_reverse(str); return str; -- cgit v1.2.3