PoliEcho-holding-org/kern
1
0
Fork 1
mirror of https://github.com/Tom-on64/kern.git synced 2026-11-03 18:22:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implemented custom font and text drawing in VBE graphics mode! No colors :(

Browse Source
This commit is contained in:
Tom-on
2024-04-19 13:23:55 +02:00
parent 5d517b1654
commit 12c0fafa1f
10 changed files with 1822 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+3 -1
View File
@@ -14,10 +14,12 @@ BUILD = ./build
# Main compilation target
os: $(BUILD) bootloader kernel
@$(AS) -fbin -o $(BUILD)/filetable.bin $(SRC)/filetable.asm
@$(AS) -fbin -o $(BUILD)/testfont.bin $(SRC)/testfont.asm
@cat $(BUILD)/boot.bin $(BUILD)/filetable.bin $(BUILD)/kernel.bin > $(BUILD)/os.bin
@dd if=/dev/zero of=kern.iso bs=512 count=2880
@dd if=$(BUILD)/os.bin of=kern.iso conv=notrunc
@dd if=$(SRC)/fs/test.txt of=kern.iso bs=512 seek=25 conv=notrunc
@dd if=$(BUILD)/testfont.bin of=kern.iso bs=512 seek=25 conv=notrunc
@dd if=$(SRC)/fs/test.txt of=kern.iso bs=512 seek=29 conv=notrunc
$(BUILD):
@[ -d $(BUILD) ] || mkdir $(BUILD)
README.md
+2
View File
@@ -14,6 +14,8 @@ Since there's always more to do, here are the [todos](todo.txt).
- Filesystem (filetable)
- Interactive Shell
- Disk I/O
- Font support (funky format)
- 1920x1080 Resolution, 32bpp
## Building & Running
If you want to try kern for some reason, you can.
include/isrs.h
+3 -3
View File
@@ -113,11 +113,11 @@ void setupIsrs() {
void faultHandler(struct regs* r) {
if (r->intNo < 32) {
print(exceptionMessages[r->intNo], 0x04);
print(exceptionMessages[r->intNo]);
if (r->errCode) {
print(": 0x", 0x04);
print(itoa(r->errCode, 16), 0x04);
print(": 0x");
print(itoa(r->errCode, 16));
}
cli();
include/keyboard.h
+3 -5
View File
@@ -49,7 +49,6 @@ uint8_t shift = 0;
uint16_t bufferLen = 0;
char buffer[MAX_BUFFER_SIZE + 1] = { 0 };
bool echo = false;
uint8_t echoAttr = 0x0f;
bool canBackspace = false;
void keyboardHandler() {
@@ -64,7 +63,7 @@ void keyboardHandler() {
if (scancode & 0x80) { // Keyup
} else if (c != 0) {
if (!canBackspace && c == '\b') return;
if (echo) putc(c, echoAttr);
if (echo) putc(c);
buffer[bufferLen] = c;
@@ -76,10 +75,9 @@ void keyboardHandler() {
}
}
char* read(char terminator, uint8_t attr) {
char* read(char terminator) {
bufferLen = 0;
echo = attr ? true : false;
echoAttr = attr;
echo = true;
while (buffer[bufferLen-1] != terminator && bufferLen < MAX_BUFFER_SIZE);
include/screen.h
+48 -112
View File
@@ -1,138 +1,74 @@
#ifndef SCREEN_H
#define SCREEN_H
#include "screen.h"
#include "stdint.h"
#include "system.h"
#include "string.h"
#define VIDMEM 0xb8000
#define CURSOR_HIGH 14
#define CURSOR_LOW 15
#define CTRLREG 0x3d4
#define DATAREG 0x3d5
#define MODE_INFO_BLOCK 0x5000
#define WIDTH 1920
#define HEIGHT 1080
#define BG_COLOR 0xff1f2937
#define FG_COLOR 0xffd1d5db
// 80x25 VGA Text mode
#define ROWS 25
#define COLS 80
#define CHARS (ROWS*COLS)
struct cursor_s {
uint32_t x;
uint32_t y;
};
uint32_t cursor = 0;
char* font;
uint32_t* vidmem;
uint16_t bytesPerScanline;
void updateCursor() {
// Move visual cursor position
outb(0x3d4, 0x0f); // Low byte
outb(0x3d5, cursor & 0xff);
outb(0x3d4, 0x0e); // High byte
outb(0x3d5, cursor >> 8);
struct cursor_s cursor = { 0, 0 };
void setupScreen() {
vidmem = *(uint32_t**)(MODE_INFO_BLOCK + 40); // Vidmem pointer location
bytesPerScanline = *(uint16_t*)(MODE_INFO_BLOCK + 16); // Bytes per scanline location
}
void setCursorPos(uint32_t offset) {
cursor = offset;
updateCursor();
void putcAt(char c, uint32_t x, uint32_t y) {
uint32_t offset = WIDTH * y * 16 + x * 8;
char* bitmap = &font[(c-1) * 16];
for (uint8_t i = 0; i < 16; i++) { // Rows
char bitmapRow = bitmap[i];
for (uint8_t j = 0; j < 8; j++) { // Cols
vidmem[offset + j] = (bitmapRow & 0x80) ? FG_COLOR : BG_COLOR;
bitmapRow = bitmapRow << 1;
}
offset += WIDTH;
}
}
uint32_t getCursorPos() {
return cursor;
}
void putc(char c) {
putcAt(c, cursor.x, cursor.y);
uint32_t calcOffset(uint8_t col, uint8_t row) {
return row * COLS + col;
}
void scroll() {
if (cursor < COLS * ROWS) return;
for (int i = 1; i < ROWS; i++) {
memcopy((char*)(calcOffset(0, i)*2)+VIDMEM, (char*)(calcOffset(0, i-1)*2)+VIDMEM, COLS*2);
}
char* lastRow = (char*)(calcOffset(0, ROWS-1)*2)+VIDMEM;
for (int i = 0; i < COLS*2; i += 2) {
lastRow[i] = '\0';
lastRow[i+1] = 0x0f;
}
cursor = calcOffset(0, ROWS-1);
}
void putc(char c, uint8_t attr) {
if (c == '\n') {
uint16_t line = cursor - (cursor % COLS);
setCursorPos(line + COLS);
scroll();
updateCursor();
return;
} else if (c == '\b') {
cursor--;
int mem = VIDMEM + cursor * 2;
*(char*)(mem) = ' ';
*(char*)(mem+1) = attr;
updateCursor();
return;
}
int mem = VIDMEM + cursor * 2;
*(char*)(mem) = c;
*(char*)(mem+1) = attr;
cursor++;
scroll();
updateCursor();
}
void print(char* s, uint8_t attr) {
char c = *s;
while (c != '\0') {
putc(c, attr);
c = *(++s);
}
scroll();
updateCursor();
}
void putcAt(char c, uint8_t attr, uint8_t col, uint8_t row) {
uint16_t offset = calcOffset(col, row);
*(char*)(VIDMEM + offset * 2) = c;
*(char*)(VIDMEM + offset * 2 + 1) = attr;
}
void printAt(char* s, uint8_t attr, uint8_t col, uint8_t row) {
uint16_t offset = calcOffset(col, row);
char c = *s;
while (c != '\0') {
*(char*)(VIDMEM + offset * 2) = c;
*(char*)(VIDMEM + offset * 2 + 1) = attr;
c = *(++s);
offset++;
cursor.y++;
cursor.x = 0;
} else {
cursor.x++;
}
}
void clear(uint8_t attr) {
for (int i = 0; i < CHARS*2; i += 2) {
*(char*)(VIDMEM + i) = ' ';
*(char*)(VIDMEM + i + 1) = attr;
void print(const char* str) {
while (*str != '\0') {
putc(*str++);
}
cursor = 0;
updateCursor();
}
void enableCursor(uint8_t start, uint8_t end) {
outb(0x3d4, 0x0a); // Sending cursor start
outb(0x3d5, (inb(0x3d5) & 0xc0) | start);
outb(0x3d4, 0x0b); // Sending cursor end
outb(0x3d5, (inb(0x3d5) & 0xe0) | end);
void clear() {
size_t i = 0;
while (i < WIDTH*HEIGHT) {
vidmem[i] = BG_COLOR; // #1f2937
i++;
}
void disableCursor() {
outb(0x3d4, 0x0a);
outb(0x3d4, 0x0b);
cursor.x = 0;
cursor.y = 0;
}
void loadFont(char* address) {
font = address;
}
#endif
src/filetable.asm
+2 -1
View File
@@ -13,7 +13,8 @@ filetable:
db "boot",0,0,0,0,0,0, "bin",0,0,4
db "filetable",0, "tab",0,4,1
db "kernel",0,0,0,0, "bin",0,5,20
db "test",0,0,0,0,0,0, "txt",0,25,1
db "testfont",0,0, "fnt",0,25,4
db "test",0,0,0,0,0,0, "txt",0,29,1
times 512-($-$$) db 0
src/kernel.c
+66 -59
View File
@@ -10,7 +10,8 @@
#define PROMPT "#> "
char filetable[512];
// TODO: Put this at a set address
char filetable[512] = { 0 };
void main() {
// Interrupts
@@ -22,18 +23,22 @@ void main() {
setupKeyboard();
setupTimer();
timerPhase(100); // 1 tick per 10ms
enableCursor(14, 15);
clear(0x0f);
print("kern.\n\n", 0x0f);
// Screen setup
diskRead(25, 4, (char*)0x6000); // Read font from disk
setupScreen();
loadFont((char*)0x6000);
clear();
print("kern.\n\n");
diskRead(4, 1, filetable); // Read the filetable and store it in memory
// Run Interactive Shell Program
// TODO: Make it in another file
while (1) {
print(PROMPT, 0x0a);
char* input = read('\n', 0x0f);
print(PROMPT);
char* input = read('\n');
if (input[0] == '\n') continue;
@@ -45,14 +50,14 @@ void main() {
*args++ = '\0'; // Separate command from args
if (strcmp(input, "clear") == 0) {
clear(0x0f);
clear();
} else if (strcmp(input, "disk") == 0) {
char buf[512] = { 0 };
if (*args == '\0') {
print("disk: ", 0x0f);
print("No arguments given\n", 0x0c);
print("Usage: disk <r/w> <sector> [data]\n", 0x0f);
print("disk: ");
print("No arguments given\n");
print("Usage: disk <r/w> <sector> [data]\n");
continue;
}
@@ -62,30 +67,30 @@ void main() {
if (mode == 'r') {
if (*args == '\0') {
print("disk: ", 0x0f);
print("Sector not specified\n", 0x0c);
print("Usage: disk <r/w> <sector> [data]\n", 0x0f);
print("disk: ");
print("Sector not specified\n");
print("Usage: disk <r/w> <sector> [data]\n");
continue;
}
uint32_t sector = atoi(args);
print("Reading...\n", 0x0f);
print("Reading...\n");
diskRead(sector, 1, buf);
print("Contents:\n", 0x0f);
print("Contents:\n");
for (size_t i = 0; i < 512; i++) {
if (buf[i] != '\0') {
putc(buf[i], 0x0f);
putc(buf[i]);
}
}
putc('\n', 0x0f);
putc('\n');
} else if (mode == 'w') {
char* data;
if ((data = strchr(args, ' ')) == NULL) {
print("disk: ", 0x0f);
print("No data given\n", 0x0c);
print("Usage: disk <r/w> <sector> [data]\n", 0x0f);
print("disk: ");
print("No data given\n");
print("Usage: disk <r/w> <sector> [data]\n");
continue;
}
@@ -95,28 +100,28 @@ void main() {
while (isSpace(*args)) { args++; } // Skip whitespace
strcpy(buf, data);
print("Writing...\n", 0x0f);
print("Writing...\n");
diskWrite(sector, 1, buf);
} else {
print("disk: ", 0x0f);
print("Invalid access mode. Use r(ead) or w(rite)\n", 0x0c);
print("Usage: disk <r/w> <sector> [data]\n", 0x0f);
print("disk: ");
print("Invalid access mode. Use r(ead) or w(rite)\n");
print("Usage: disk <r/w> <sector> [data]\n");
continue;
}
} else if (strcmp(input, "echo") == 0) {
print(args, 0x0f);
print(args);
} else if (strcmp(input, "exit") == 0) {
break;
} else if (strcmp(input, "help") == 0) {
print("Available Commands:\n", 0x0f);
print(" clear | Clears the screen\n", 0x0f);
print(" disk | Reads/Writes data from/to the disk\n", 0x0f);
print(" echo | Prints a message to stdout\n", 0x0f);
print(" exit | Exits shell\n", 0x0f);
print(" help | Prints this message\n", 0x0f);
print(" ls | Lists all available files\n", 0x0f);
// TODO: print(" reboot | Reboots the system\n", 0x0f);
print(" test | Performs tests\n", 0x0f);
print("Available Commands:\n");
print(" clear | Clears the screen\n");
print(" disk | Reads/Writes data from/to the disk\n");
print(" echo | Prints a message to stdout\n");
print(" exit | Exits shell\n");
print(" help | Prints this message\n");
print(" ls | Lists all available files\n");
print(" reboot | Reboots the system\n");
print(" test | Performs tests\n");
} else if (strcmp(input, "ls") == 0) {
char* ft = filetable;
@@ -136,47 +141,49 @@ void main() {
uint8_t sector = *ft++;
uint8_t size = *ft++;
if (sector < 10) putc('0', 0x0f);
if (sector == 0) putc('0', 0x0f);
else print(itoa(sector, 10), 0x0f);
print(": ", 0x0f);
print(filename, 0x0f);
if (sector < 10) putc('0');
if (sector == 0) putc('0');
else print(itoa(sector, 10));
print(": ");
print(filename);
for (uint8_t i = 14 - strlen(filename); i > 0; i--) {
putc(' ', 0x0f);
putc(' ');
}
print(" | ", 0x0f);
print(" | ");
if (size >> 1) {
print(itoa(size >> 1, 10), 0x0f);
if (size & 0x01) { print(".5", 0x0f); }
print("kB\n", 0x0f);
print(itoa(size >> 1, 10));
if (size & 0x01) { print(".5"); }
print("kB\n");
} else {
print(itoa(size*512, 10), 0x0f);
print("B\n", 0x0f);
print(itoa(size*512, 10));
print("B\n");
}
}
} else if (strcmp(input, "reboot") == 0) {
outb(0x64, 0xFE);
} else if (strcmp(input, "test") == 0) {
print("Running Tests...\n", 0x0f);
print("Running Tests...\n");
uint8_t buf[512];
print("Read Test .......... ", 0x0f);
print("Read Test .......... ");
diskRead(0, 1, (char*)buf);
if (buf[510] == 0x55 && buf[511] == 0xaa) {
print("[ DONE ]\n", 0x0a);
print("[ DONE ]\n");
} else {
print("[ FAIL ]\n", 0x0c);
print("[ FAIL ]\n");
}
print("Write Test ......... ", 0x0f);
print("Write Test ......... ");
buf[510] = 0x55; buf[511] = 0xaa;
diskWrite(0, 1, (char*)buf);
diskRead(0, 1, (char*)buf); // Idk how else to test if the right data was written (also could break the bootloader if it fails)
if (buf[510] == 0x55 && buf[511] == 0xaa) {
print("[ DONE ]\n", 0x0a);
print("[ DONE ]\n");
} else {
print("[ FAIL ]\n", 0x0c);
print("[ FAIL ]\n");
}
print("Tests Finished!\n", 0x0f);
print("Tests Finished!\n");
} else {
char* ft = filetable;
uint8_t found = 0;
@@ -203,10 +210,10 @@ void main() {
for (size_t i = 0; i < size * 512; i++) {
if (buf[i] != '\0') {
putc(buf[i], 0x0f);
putc(buf[i]);
}
}
putc('\n', 0x0f);
putc('\n');
found++; // Set found to 1
break;
@@ -216,9 +223,9 @@ void main() {
}
if (!found) {
print("Command not found: ", 0x0c);
print(input, 0x0c);
putc('\n', 0x0f);
print("Command not found: ");
print(input);
putc('\n');
}
}
}
src/stage2.asm
+42 -4
View File
@@ -85,6 +85,17 @@ start:
cmp al, [modeInfoBlock.bpp]
jne .nextMode
mov ax, [vbeInfoBlock.videoModePtr]
ror ax, 8
call printHex
ror ax, 8
call printHex
mov ax, [vbeInfoBlock.videoModePtr+2]
ror ax, 8
call printHex
ror ax, 8
call printHex
; Set VBE mode
mov ax, 0x4f02
mov bx, [mode]
@@ -104,14 +115,14 @@ start:
jmp .findMode
.endOfModes:
mov ax, 0x0e4e ; Print 'N'
int 0x10
mov si, modeNotFoundErr
call print
cli
hlt
error:
mov ax, 0x0e46 ; Print 'F'
int 0x10
mov si, vbeErr
call print
cli
hlt
@@ -157,6 +168,23 @@ printHex:
pop ax
ret
;;
;; Prints a null terminated string
;; si - pointer to string
;;
print:
push ax
mov ah, 0x0e
.loop:
lodsb ; mov al, [si] inc si
cmp al, 0
je .done
int 0x10
jmp .loop
.done:
pop ax
ret
;; 32 Bit entry code
[bits 32]
protected_start:
@@ -172,6 +200,13 @@ protected_start:
mov ebp, 0x90000
mov esp, ebp
; Store VBE Mode Info Block in memory
mov esi, modeInfoBlock
mov edi, 0x5000 ; Destination
mov ecx, 64 ; 64 * 4 = 256B (size of modeInfoBlock)
rep movsd
; Perform The far jump
mov al, [driveNum]
push ax
@@ -181,6 +216,9 @@ protected_start:
;; Data
driveNum: db 0
vbeErr: db "VBE Error!", 0
modeNotFoundErr: db "VBE Mode not found!", 0
;; GDT
GDT:
.start:
src/testfont.asm
+1645
View File
File diff suppressed because it is too large Load Diff
todo.txt
+7 -4
View File
@@ -1,13 +1,17 @@
=== Todo ===
- [*] Multistage Bootloader
- [ ] Write down where stuff is in memory (0x1000 - kernel, 0x2000 - filetable, 0x5000 - VBE Mode Info, 0x6000 - Font)
- [ ] Screen
- [*] Scrolling
- [ ] Scrolling
- [ ] Scroll-back
- [ ] Color codes (and just multicolor text in general)
- [*] VESA BIOS Extensions
- [*] Better resolution
- [*] Graphics mode
- [ ] Custom font
- [*] Custom font
- [ ] Larger text size
- [ ] color codes
- [ ] Filesystem
- [ ] Utility for filesystem building (not just an assembly file)
- [*] Filetable
@@ -40,14 +44,13 @@
- [ ] touch (make file)
- [ ] rm
- [ ] mkdir (add dirs first)
- [ ] reboot
- [*] reboot
- [ ] cd
- [ ] Standard I/O stuff
- [ ] stdin
- [ ] stdout
- [ ] stderr
- [ ] printf
- [ ] color codes
- [ ] Virtual Memory
- [ ] Paging
- [ ] User (or system) programs