This commit is contained in:
Mika Westphal 2023-01-19 19:35:53 +01:00
commit 7caa808d2a
11 changed files with 251 additions and 0 deletions

27
.gdb_history Normal file
View File

@ -0,0 +1,27 @@
remote localhost:1234
target remote localhost:1234
kill
target remote localhost:1234
symbol-file build/kernel
symbol-file build/kernel.elf
d main
disassemble main
list
p VGA
p *(VGA)
b _ZN3VGA20terminal_writestringEPKc
n
line
list
n
list
c
list
b VGA::linebreak
c
c
c
d VGA::linebreak
disassemble VGA::linebreak
list
list VGA::linebreak

38
Makefile Normal file
View File

@ -0,0 +1,38 @@
LINKFILE=linker.ld
QEMU=qemu-system-i386
BUILDPATH=build
SOURCEPATH=src
CC=i686-elf-g++
CFLAGS=-m32 -c -Wmultichar -ffreestanding -O2 -Wall -Wextra -fno-exceptions -fno-rtti -Wwrite-strings -fpermissive -g
#OBJ=$(BUILDPATH)/boot.o $(BUILDPATH)/kernel.o $(BUILDPATH)/kernel/vga.o $(BUILDPATH)/kernel/keyboard.o $(BUILDPATH)/kernel/idt.o
OBJ=$(BUILDPATH)/boot.o $(BUILDPATH)/kernel.o $(BUILDPATH)/kernel/vga.o
ASMC=i686-elf-as
LD=ld
LDFLAGS=-m elf_i386 -T $(LINKFILE) -z muldefs -g
all: $(BUILDPATH)/kernel.elf
$(QEMU) -kernel $(BUILDPATH)/kernel.elf
debug: $(BUILDPATH)/kernel.elf
$(QEMU) -s -S -kernel $(BUILDPATH)/kernel.elf
$(BUILDPATH)/boot.o: $(SOURCEPATH)/boot.asm
$(ASMC) $(SOURCEPATH)/boot.asm -o $(BUILDPATH)/boot.o
$(BUILDPATH)/kernel.o: $(SOURCEPATH)/kernel.*
$(CC) $(CFLAGS) $(SOURCEPATH)/kernel.cpp -o $(BUILDPATH)/kernel.o
$(BUILDPATH)/kernel/vga.o: $(SOURCEPATH)/kernel/vga.*
$(CC) $(CFLAGS) $(SOURCEPATH)/kernel/vga.cpp -o $(BUILDPATH)/kernel/vga.o
$(BUILDPATH)/kernel/keyboard.o: $(SOURCEPATH)/kernel/keyboard.* $(BUILDPATH)/boot.o
$(CC) $(CFLAGS) $(SOURCEPATH)/kernel/keyboard.cpp -o $(BUILDPATH)/kernel/keyboard.o
$(BUILDPATH)/kernel/idt.o: $(SOURCEPATH)/kernel/idt.* $(BUILDPATH)/boot.o
$(CC) $(CFLAGS) $(SOURCEPATH)/kernel/idt.cpp -o $(BUILDPATH)/kernel/idt.o
$(BUILDPATH)/kernel.elf: $(OBJ)
$(LD) $(LDFLAGS) -o $(BUILDPATH)/kernel.elf $(OBJ)
clean:
rm $(OBJ)

BIN
build/boot.o Normal file

Binary file not shown.

BIN
build/kernel.elf Executable file

Binary file not shown.

BIN
build/kernel.o Normal file

Binary file not shown.

BIN
build/kernel/vga.o Normal file

Binary file not shown.

26
linker.ld Normal file
View File

@ -0,0 +1,26 @@
ENTRY(_start)
SECTIONS
{
. = 1M;
.text BLOCK(4K) : ALIGN(4K)
{
*(.multiboot)
*(.text)
}
 
.rodata BLOCK(4K) : ALIGN(4K)
{
*(.rodata)
}
 
.data BLOCK(4K) : ALIGN(4K)
{
*(.data)
}
 
.bss BLOCK(4K) : ALIGN(4K)
{
*(COMMON)
*(.bss)
}
}

28
src/boot.asm Normal file
View File

@ -0,0 +1,28 @@
.set ALIGN, 1<<0
.set MEMINFO, 1<<1
.set FLAGS, ALIGN | MEMINFO
.set MAGIC, 0x1BADB002
.set CHECKSUM, -(MAGIC + FLAGS)
.section .multiboot
.align 4
.long MAGIC
.long FLAGS
.long CHECKSUM
.section .bss
.align 16
stack_bottom:
.skip 16384
stack_top:
.section .text
.global _start
.type _start, @function
_start:
mov $stack_top, %esp
call kernel_main
cli
1: hlt
jmp 1b
.size _start, . - _start

13
src/kernel.cpp Normal file
View File

@ -0,0 +1,13 @@
#include "kernel/vga.h"
void main() {
VGA vga = VGA();
vga.terminal_init();
vga.terminal_writestring("Hello from kernel main\nTest\n");
for(int i = 0; i < 80; i++)
vga.terminal_writestring("YEET\n");
}
extern "C" void kernel_main(void) {
main();
}

73
src/kernel/vga.cpp Normal file
View File

@ -0,0 +1,73 @@
#include "vga.h"
inline uint8_t VGA::vga_entry_color(enum vga_color fg, enum vga_color bg) {
return fg | bg << 4;
}
inline uint16_t VGA::vga_entry(unsigned char uc, uint8_t color) {
return (uint16_t) uc | (uint16_t) color << 8;
}
size_t VGA::strlen(const char* str) {
size_t len = 0;
while (str[len])
len++;
return len;
}
void VGA::linebreak() {
if(terminal_row == VGA_HEIGHT) {
for(size_t row = 1; row < VGA_HEIGHT; row++) {
terminal_buffer[row - 1] = terminal_buffer[row];
}
}else {
terminal_row++;
}
terminal_column = 0;
}
void VGA::terminal_setcolor(uint8_t color) {
terminal_color = color;
}
void VGA::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);
}
void VGA::terminal_putchar(char c) {
terminal_putentryat(c, terminal_color, terminal_column, terminal_row);
if(++terminal_column == VGA_WIDTH) {
terminal_column = 0;
if(++terminal_row == VGA_HEIGHT)
terminal_row = 0;
}
}
void VGA::terminal_write(const char* data, size_t size) {
for(size_t i = 0; i < size; i++) {
if(data[i] == '\n') {
linebreak();
continue;
}
terminal_putchar(data[i]);
}
}
void VGA::terminal_writestring(const char* data) {
terminal_write(data, strlen(data));
}
void VGA::terminal_init(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);
}
}
}

46
src/kernel/vga.h Normal file
View File

@ -0,0 +1,46 @@
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
class VGA {
protected:
static const size_t VGA_WIDTH = 80;
static const size_t VGA_HEIGHT = 80;
size_t terminal_row;
size_t terminal_column;
uint8_t terminal_color;
uint16_t* terminal_buffer;
void terminal_putentryat(char c, uint8_t color, size_t x, size_t y);
void terminal_putchar(char c);
void linebreak();
public:
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,
};
static inline uint8_t vga_entry_color(enum vga_color fg, enum vga_color bg);
static inline uint16_t vga_entry(unsigned char uc, uint8_t color);
size_t strlen(const char* str);
void terminal_setcolor(uint8_t color);
void terminal_write(const char* data, size_t size);
void terminal_writestring(const char* data);
void terminal_init(void);
};