Cleaned up comments

This commit is contained in:
plane000
2018-10-07 20:18:20 +01:00
parent 4782d084a7
commit 5e113daf7b
4 changed files with 38 additions and 13 deletions

24
.vscode/tasks.json vendored
View File

@@ -24,9 +24,27 @@
"problemMatcher": [] "problemMatcher": []
}, },
{ {
"label": "Run", "label": "Build All",
"type": "shell", "type": "shell",
"command": "&('C:/Program Files/qemu/qemu-system-i386') -kernel bin/ThanOS.bin -serial mon:stdio -drive id=disk,file=hda.img,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0", "command": "bash --login -c 'make'; bash --login -c 'make iso'",
"group": {
"kind": "test",
"isDefault": true,
},
},
{
"label": "Build all and run",
"type": "shell",
"command": "bash --login -c 'make'; bash --login -c 'make iso'; &('D:/Program Files/qemu/qemu-system-i386') -cdrom E:/OS/ThanOS/bin/ThanOS.iso -serial mon:stdio",
"group": {
"kind": "test",
"isDefault": true,
},
},
{
"label": "Run (NOT WORKING)",
"type": "shell",
"command": "&('D:/Program Files/qemu/qemu-system-i386') -kernel bin/ThanOS.bin -serial mon:stdio -drive id=disk,file=hda.img,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0",
"group": { "group": {
"kind": "test", "kind": "test",
"isDefault": true "isDefault": true
@@ -35,7 +53,7 @@
{ {
"label": "Run (With ISO)", "label": "Run (With ISO)",
"type": "shell", "type": "shell",
"command": "&('C:/Program Files/qemu/qemu-system-i386') -cdrom bin/ThanOS.iso -serial mon:stdio -drive file=hda.img,format=raw", "command": "&('D:/Program Files/qemu/qemu-system-i386') -cdrom E:/OS/ThanOS/bin/ThanOS.iso -serial mon:stdio",
"group": { "group": {
"kind": "test", "kind": "test",
"isDefault": true "isDefault": true

Binary file not shown.

View File

@@ -1,9 +1,12 @@
/* Declare constants for the multiboot header. */ ;; ThanOS
.set ALIGN, 1<<0 /* align loaded modules on page boundaries */ ;; Copyright Benjamin Kyd (c) 2018
.set MEMINFO, 1<<1 /* provide memory map */
.set FLAGS, ALIGN | MEMINFO /* this is the Multiboot 'flag' field */ ;; declare constants for the multiboot header
.set MAGIC, 0x1BADB002 /* 'magic number' lets bootloader find the header */ .set ALIGN, 1<<0 ; align loaded modules on page boundaries
.set CHECKSUM, -(MAGIC + FLAGS) /* checksum of above, to prove we are multiboot */ .set MEMINFO, 1<<1 ; provide memory map
.set FLAGS, ALIGN | MEMINFO ; this is the Multiboot 'flag' field
.set MAGIC, 0x1BADB002 ;'magic number' lets bootloader find the header
.set CHECKSUM, -(MAGIC + FLAGS) ; checksum of above, to prove we are multiboot
.section .multiboot .section .multiboot
.align 4 .align 4
@@ -14,12 +17,13 @@
.section .bss .section .bss
.align 16 .align 16
stack_bottom: stack_bottom:
.skip 16384 ; 16 KiB .skip 16384 ; 16 KiB
stack_top: stack_top:
.section .text .section .text
.global _start .global _start
.type _start, @function .type _start, @function
_start: _start:
mov $stack_top, %esp mov $stack_top, %esp
call kernel_main call kernel_main

View File

@@ -1,3 +1,6 @@
// ThanOS
// Copyright Benjamin Kyd (c) 2018
int kernel_main(void) { int kernel_main(void) {
const char* str = "Your mother gay lol"; const char* str = "Your mother gay lol";
char* videoMemoryPtr = (char*)0xb8000; // Video memory start char* videoMemoryPtr = (char*)0xb8000; // Video memory start