PoliEcho-holding-org/kern
1
0
Fork 1
mirror of https://github.com/Tom-on64/kern.git synced 2026-11-04 02:23:10 +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
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
+67 -60
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,21 +23,25 @@ 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;
char* args;
if ((args = strchr(input, ' ')) == NULL) {
args = strchr(input, '\n');
@@ -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