slinky55/RockOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

trying to get VGA fb mode to work..

Browse Source
This commit is contained in:
slinky55
2026-07-14 00:07:50 -05:00
parent 5c7febbbf0
commit 454de8feed
17 changed files with 567 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

462
compile_commands.json
View File

@@ -26,12 +26,12 @@
"-Wextra", "-Wextra",
"-Ikernel", "-Ikernel",
"-o", "-o",
"obj/kernel/kbd.c.o", "obj/kernel/vfs.c.o",
"kernel/kbd.c" "kernel/vfs.c"
], ],
"directory": "/home/slinky/source/RockOS", "directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/kbd.c", "file": "/home/slinky/source/RockOS/kernel/vfs.c",
"output": "/home/slinky/source/RockOS/obj/kernel/kbd.c.o" "output": "/home/slinky/source/RockOS/obj/kernel/vfs.c.o"
}, },
{ {
"arguments": [ "arguments": [
@@ -43,12 +43,12 @@
"-Wextra", "-Wextra",
"-Ikernel", "-Ikernel",
"-o", "-o",
"obj/kernel/gdt.c.o", "obj/kernel/kmain.c.o",
"kernel/gdt.c" "kernel/kmain.c"
], ],
"directory": "/home/slinky/source/RockOS", "directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/gdt.c", "file": "/home/slinky/source/RockOS/kernel/kmain.c",
"output": "/home/slinky/source/RockOS/obj/kernel/gdt.c.o" "output": "/home/slinky/source/RockOS/obj/kernel/kmain.c.o"
}, },
{ {
"arguments": [ "arguments": [
@@ -67,6 +67,91 @@
"file": "/home/slinky/source/RockOS/kernel/drivers/pic/pic.c", "file": "/home/slinky/source/RockOS/kernel/drivers/pic/pic.c",
"output": "/home/slinky/source/RockOS/obj/kernel/drivers/pic/pic.c.o" "output": "/home/slinky/source/RockOS/obj/kernel/drivers/pic/pic.c.o"
}, },
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/drivers/devfs/devfs.c.o",
"kernel/drivers/devfs/devfs.c"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/drivers/devfs/devfs.c",
"output": "/home/slinky/source/RockOS/obj/kernel/drivers/devfs/devfs.c.o"
},
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/drivers/cpio/cpio.c.o",
"kernel/drivers/cpio/cpio.c"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/drivers/cpio/cpio.c",
"output": "/home/slinky/source/RockOS/obj/kernel/drivers/cpio/cpio.c.o"
},
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/drivers/pty/pty.c.o",
"kernel/drivers/pty/pty.c"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/drivers/pty/pty.c",
"output": "/home/slinky/source/RockOS/obj/kernel/drivers/pty/pty.c.o"
},
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/drivers/vga/vga.c.o",
"kernel/drivers/vga/vga.c"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/drivers/vga/vga.c",
"output": "/home/slinky/source/RockOS/obj/kernel/drivers/vga/vga.c.o"
},
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/drivers/ide/ide.c.o",
"kernel/drivers/ide/ide.c"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/drivers/ide/ide.c",
"output": "/home/slinky/source/RockOS/obj/kernel/drivers/ide/ide.c.o"
},
{ {
"arguments": [ "arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc", "/home/slinky/opt/cross/bin/i686-elf-gcc",
@@ -111,12 +196,12 @@
"-Wextra", "-Wextra",
"-Ikernel", "-Ikernel",
"-o", "-o",
"obj/kernel/drivers/ide/ide.c.o", "obj/kernel/gdt.c.o",
"kernel/drivers/ide/ide.c" "kernel/gdt.c"
], ],
"directory": "/home/slinky/source/RockOS", "directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/drivers/ide/ide.c", "file": "/home/slinky/source/RockOS/kernel/gdt.c",
"output": "/home/slinky/source/RockOS/obj/kernel/drivers/ide/ide.c.o" "output": "/home/slinky/source/RockOS/obj/kernel/gdt.c.o"
}, },
{ {
"arguments": [ "arguments": [
@@ -128,12 +213,12 @@
"-Wextra", "-Wextra",
"-Ikernel", "-Ikernel",
"-o", "-o",
"obj/kernel/drivers/vga/vga.c.o", "obj/kernel/memory/mm.c.o",
"kernel/drivers/vga/vga.c" "kernel/memory/mm.c"
], ],
"directory": "/home/slinky/source/RockOS", "directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/drivers/vga/vga.c", "file": "/home/slinky/source/RockOS/kernel/memory/mm.c",
"output": "/home/slinky/source/RockOS/obj/kernel/drivers/vga/vga.c.o" "output": "/home/slinky/source/RockOS/obj/kernel/memory/mm.c.o"
}, },
{ {
"arguments": [ "arguments": [
@@ -145,80 +230,12 @@
"-Wextra", "-Wextra",
"-Ikernel", "-Ikernel",
"-o", "-o",
"obj/kernel/drivers/cpio/cpio.c.o", "obj/kernel/kbd.c.o",
"kernel/drivers/cpio/cpio.c" "kernel/kbd.c"
], ],
"directory": "/home/slinky/source/RockOS", "directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/drivers/cpio/cpio.c", "file": "/home/slinky/source/RockOS/kernel/kbd.c",
"output": "/home/slinky/source/RockOS/obj/kernel/drivers/cpio/cpio.c.o" "output": "/home/slinky/source/RockOS/obj/kernel/kbd.c.o"
},
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/drivers/devfs/devfs.c.o",
"kernel/drivers/devfs/devfs.c"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/drivers/devfs/devfs.c",
"output": "/home/slinky/source/RockOS/obj/kernel/drivers/devfs/devfs.c.o"
},
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/drivers/pty/pty.c.o",
"kernel/drivers/pty/pty.c"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/drivers/pty/pty.c",
"output": "/home/slinky/source/RockOS/obj/kernel/drivers/pty/pty.c.o"
},
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/scheduler.c.o",
"kernel/scheduler.c"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/scheduler.c",
"output": "/home/slinky/source/RockOS/obj/kernel/scheduler.c.o"
},
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/elf.c.o",
"kernel/elf.c"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/elf.c",
"output": "/home/slinky/source/RockOS/obj/kernel/elf.c.o"
}, },
{ {
"arguments": [ "arguments": [
@@ -254,6 +271,23 @@
"file": "/home/slinky/source/RockOS/kernel/interrupts.c", "file": "/home/slinky/source/RockOS/kernel/interrupts.c",
"output": "/home/slinky/source/RockOS/obj/kernel/interrupts.c.o" "output": "/home/slinky/source/RockOS/obj/kernel/interrupts.c.o"
}, },
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/elf.c.o",
"kernel/elf.c"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/elf.c",
"output": "/home/slinky/source/RockOS/obj/kernel/elf.c.o"
},
{ {
"arguments": [ "arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc", "/home/slinky/opt/cross/bin/i686-elf-gcc",
@@ -271,57 +305,6 @@
"file": "/home/slinky/source/RockOS/kernel/syscall.c", "file": "/home/slinky/source/RockOS/kernel/syscall.c",
"output": "/home/slinky/source/RockOS/obj/kernel/syscall.c.o" "output": "/home/slinky/source/RockOS/obj/kernel/syscall.c.o"
}, },
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/kmain.c.o",
"kernel/kmain.c"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/kmain.c",
"output": "/home/slinky/source/RockOS/obj/kernel/kmain.c.o"
},
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/lib/tasks.c.o",
"kernel/lib/tasks.c"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/lib/tasks.c",
"output": "/home/slinky/source/RockOS/obj/kernel/lib/tasks.c.o"
},
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/lib/ringbuf.c.o",
"kernel/lib/ringbuf.c"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/lib/ringbuf.c",
"output": "/home/slinky/source/RockOS/obj/kernel/lib/ringbuf.c.o"
},
{ {
"arguments": [ "arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc", "/home/slinky/opt/cross/bin/i686-elf-gcc",
@@ -349,12 +332,12 @@
"-Wextra", "-Wextra",
"-Ikernel", "-Ikernel",
"-o", "-o",
"obj/kernel/lib/strtok.c.o", "obj/kernel/lib/memory.c.o",
"kernel/lib/strtok.c" "kernel/lib/memory.c"
], ],
"directory": "/home/slinky/source/RockOS", "directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/lib/strtok.c", "file": "/home/slinky/source/RockOS/kernel/lib/memory.c",
"output": "/home/slinky/source/RockOS/obj/kernel/lib/strtok.c.o" "output": "/home/slinky/source/RockOS/obj/kernel/lib/memory.c.o"
}, },
{ {
"arguments": [ "arguments": [
@@ -383,12 +366,12 @@
"-Wextra", "-Wextra",
"-Ikernel", "-Ikernel",
"-o", "-o",
"obj/kernel/lib/memory.c.o", "obj/kernel/lib/ringbuf.c.o",
"kernel/lib/memory.c" "kernel/lib/ringbuf.c"
], ],
"directory": "/home/slinky/source/RockOS", "directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/lib/memory.c", "file": "/home/slinky/source/RockOS/kernel/lib/ringbuf.c",
"output": "/home/slinky/source/RockOS/obj/kernel/lib/memory.c.o" "output": "/home/slinky/source/RockOS/obj/kernel/lib/ringbuf.c.o"
}, },
{ {
"arguments": [ "arguments": [
@@ -400,12 +383,12 @@
"-Wextra", "-Wextra",
"-Ikernel", "-Ikernel",
"-o", "-o",
"obj/kernel/vfs.c.o", "obj/kernel/lib/tasks.c.o",
"kernel/vfs.c" "kernel/lib/tasks.c"
], ],
"directory": "/home/slinky/source/RockOS", "directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/vfs.c", "file": "/home/slinky/source/RockOS/kernel/lib/tasks.c",
"output": "/home/slinky/source/RockOS/obj/kernel/vfs.c.o" "output": "/home/slinky/source/RockOS/obj/kernel/lib/tasks.c.o"
}, },
{ {
"arguments": [ "arguments": [
@@ -417,12 +400,12 @@
"-Wextra", "-Wextra",
"-Ikernel", "-Ikernel",
"-o", "-o",
"obj/kernel/memory/mm.c.o", "obj/kernel/lib/strtok.c.o",
"kernel/memory/mm.c" "kernel/lib/strtok.c"
], ],
"directory": "/home/slinky/source/RockOS", "directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/memory/mm.c", "file": "/home/slinky/source/RockOS/kernel/lib/strtok.c",
"output": "/home/slinky/source/RockOS/obj/kernel/memory/mm.c.o" "output": "/home/slinky/source/RockOS/obj/kernel/lib/strtok.c.o"
}, },
{ {
"arguments": [ "arguments": [
@@ -434,46 +417,12 @@
"-Wextra", "-Wextra",
"-Ikernel", "-Ikernel",
"-o", "-o",
"obj/kernel/drivers/pic/pic.S.o", "obj/kernel/scheduler.c.o",
"kernel/drivers/pic/pic.S" "kernel/scheduler.c"
], ],
"directory": "/home/slinky/source/RockOS", "directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/drivers/pic/pic.S", "file": "/home/slinky/source/RockOS/kernel/scheduler.c",
"output": "/home/slinky/source/RockOS/obj/kernel/drivers/pic/pic.S.o" "output": "/home/slinky/source/RockOS/obj/kernel/scheduler.c.o"
},
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/drivers/ps2/ps2.S.o",
"kernel/drivers/ps2/ps2.S"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/drivers/ps2/ps2.S",
"output": "/home/slinky/source/RockOS/obj/kernel/drivers/ps2/ps2.S.o"
},
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/drivers/pit/pit.S.o",
"kernel/drivers/pit/pit.S"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/drivers/pit/pit.S",
"output": "/home/slinky/source/RockOS/obj/kernel/drivers/pit/pit.S.o"
}, },
{ {
"arguments": [ "arguments": [
@@ -492,40 +441,6 @@
"file": "/home/slinky/source/RockOS/kernel/syscall.S", "file": "/home/slinky/source/RockOS/kernel/syscall.S",
"output": "/home/slinky/source/RockOS/obj/kernel/syscall.S.o" "output": "/home/slinky/source/RockOS/obj/kernel/syscall.S.o"
}, },
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/interrupts.S.o",
"kernel/interrupts.S"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/interrupts.S",
"output": "/home/slinky/source/RockOS/obj/kernel/interrupts.S.o"
},
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/boot/boot.S.o",
"kernel/boot/boot.S"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/boot/boot.S",
"output": "/home/slinky/source/RockOS/obj/kernel/boot/boot.S.o"
},
{ {
"arguments": [ "arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc", "/home/slinky/opt/cross/bin/i686-elf-gcc",
@@ -553,12 +468,46 @@
"-Wextra", "-Wextra",
"-Ikernel", "-Ikernel",
"-o", "-o",
"obj/kernel/scheduler.S.o", "obj/kernel/drivers/pic/pic.S.o",
"kernel/scheduler.S" "kernel/drivers/pic/pic.S"
], ],
"directory": "/home/slinky/source/RockOS", "directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/scheduler.S", "file": "/home/slinky/source/RockOS/kernel/drivers/pic/pic.S",
"output": "/home/slinky/source/RockOS/obj/kernel/scheduler.S.o" "output": "/home/slinky/source/RockOS/obj/kernel/drivers/pic/pic.S.o"
},
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/drivers/pit/pit.S.o",
"kernel/drivers/pit/pit.S"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/drivers/pit/pit.S",
"output": "/home/slinky/source/RockOS/obj/kernel/drivers/pit/pit.S.o"
},
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/drivers/ps2/ps2.S.o",
"kernel/drivers/ps2/ps2.S"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/drivers/ps2/ps2.S",
"output": "/home/slinky/source/RockOS/obj/kernel/drivers/ps2/ps2.S.o"
}, },
{ {
"arguments": [ "arguments": [
@@ -577,6 +526,40 @@
"file": "/home/slinky/source/RockOS/kernel/memory/mm.S", "file": "/home/slinky/source/RockOS/kernel/memory/mm.S",
"output": "/home/slinky/source/RockOS/obj/kernel/memory/mm.S.o" "output": "/home/slinky/source/RockOS/obj/kernel/memory/mm.S.o"
}, },
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/boot/boot.S.o",
"kernel/boot/boot.S"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/boot/boot.S",
"output": "/home/slinky/source/RockOS/obj/kernel/boot/boot.S.o"
},
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/scheduler.S.o",
"kernel/scheduler.S"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/scheduler.S",
"output": "/home/slinky/source/RockOS/obj/kernel/scheduler.S.o"
},
{ {
"arguments": [ "arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc", "/home/slinky/opt/cross/bin/i686-elf-gcc",
@@ -593,5 +576,22 @@
"directory": "/home/slinky/source/RockOS", "directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/gdt.S", "file": "/home/slinky/source/RockOS/kernel/gdt.S",
"output": "/home/slinky/source/RockOS/obj/kernel/gdt.S.o" "output": "/home/slinky/source/RockOS/obj/kernel/gdt.S.o"
},
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-c",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Ikernel",
"-o",
"obj/kernel/interrupts.S.o",
"kernel/interrupts.S"
],
"directory": "/home/slinky/source/RockOS",
"file": "/home/slinky/source/RockOS/kernel/interrupts.S",
"output": "/home/slinky/source/RockOS/obj/kernel/interrupts.S.o"
} }
] ]

24
kernel/boot/boot.S
View File

@@ -1,14 +1,26 @@
.set ALIGN, 1<<0 /* align loaded modules on page boundaries */ .set ALIGN, 1<<0 /* align loaded modules on page boundaries */
.set MEMINFO, 1<<1 /* provide memory map */ .set MEMINFO, 1<<1 /* provide memory map */
.set FLAGS, ALIGN | MEMINFO /* this is the Multiboot 'flag' field */ .set GRAPHICS, 1<<2 /* <-- NEW: Request video mode table/framebuffer from GRUB */
.set FLAGS, ALIGN | MEMINFO | GRAPHICS /* Updated to include GRAPHICS */
.set MAGIC, 0x1BADB002 /* 'magic number' lets bootloader find the header */ .set MAGIC, 0x1BADB002 /* 'magic number' lets bootloader find the header */
.set CHECKSUM, -(MAGIC + FLAGS) /* checksum of above, to prove we are multiboot */ .set CHECKSUM, -(MAGIC + FLAGS) /* recalculated checksum of the new flags */
.section .multiboot, "a" .section .multiboot, "a"
.align 4 .align 4
.long MAGIC .long MAGIC
.long FLAGS .long FLAGS
.long CHECKSUM .long CHECKSUM
.long 0 /* header_addr */
.long 0 /* load_addr */
.long 0 /* load_end_addr */
.long 0 /* bss_end_addr */
.long 0 /* entry_addr */
.long 0 /* Mode Type: 0 = Linear Framebuffer, 1 = Standard EGA Text */
.long 1024 /* Width (Pixels) */
.long 768 /* Height (Pixels) */
.long 32 /* Color Depth (Bits Per Pixel) */
.section .text .section .text
.global _start .global _start

83
kernel/drivers/vga/vga.c
View File

@@ -7,9 +7,12 @@
#include <common.h> #include <common.h>
#define VGA_WIDTH 80 static uint32_t framebuffer_address;
#define VGA_HEIGHT 25 static uint32_t framebuffer_width;
#define VGA_MEMORY (0xB8000 + 0xC0000000) static uint32_t framebuffer_height;
static uint32_t framebuffer_total_pixels;
static uint32_t framebuffer_pitch;
static uint32_t framebuffer_bpp;
enum vga_color { enum vga_color {
VGA_COLOR_BLACK = 0, VGA_COLOR_BLACK = 0,
@@ -30,52 +33,39 @@ enum vga_color {
VGA_COLOR_WHITE = 15, VGA_COLOR_WHITE = 15,
}; };
static size_t terminal_row; void vga_init(
static size_t terminal_column; uint32_t fb_vaddr,
static uint8_t terminal_color; uint32_t fb_width,
static uint16_t* terminal_buffer = (uint16_t*)VGA_MEMORY; uint32_t fb_height,
uint32_t fb_pitch,
uint8_t fb_bpp
) {
framebuffer_address = fb_vaddr;
framebuffer_width = fb_width;
framebuffer_height = fb_height;
framebuffer_pitch = fb_pitch;
framebuffer_bpp = fb_bpp;
static inline uint8_t vga_entry_color(enum vga_color fg, enum vga_color bg) framebuffer_total_pixels = framebuffer_width * framebuffer_height;
{
return fg | bg << 4; vga_clear_scrn(0xFFFFFFFF);
} }
static inline uint16_t vga_entry(unsigned char uc, uint8_t color) void vga_clear_scrn(uint32_t color) {
{ if (framebuffer_address == 0) return;
return (uint16_t) uc | (uint16_t) color << 8;
}
static void update_cursor() // Completely ignore the framebuffer address for a split second.
{ // Let's force raw ASCII text into the legacy VGA text console area.
uint16_t pos = terminal_row * VGA_WIDTH + terminal_column; uint16_t* text_mode_buffer = (uint16_t*)0xB8000;
outb(0x3D4, 0x0F);
outb(0x3D5, (uint8_t) (pos & 0xFF)); // Fill the screen with 'A' characters on a red background
outb(0x3D4, 0x0E); for (int i = 0; i < 80 * 25; i++) {
outb(0x3D5, (uint8_t) ((pos >> 8) & 0xFF)); text_mode_buffer[i] = (0x4F << 8) | 'A';
} }
void vga_init() {
outb(0x3D4, 0x0A);
outb(0x3D5, (inb(0x3D5) & 0xC0) | 14);
outb(0x3D4, 0x0B);
outb(0x3D5, (inb(0x3D5) & 0xE0) | 15);
terminal_row = 0;
terminal_column = 0;
terminal_color = vga_entry_color(VGA_COLOR_LIGHT_GREY, VGA_COLOR_BLACK);
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);
}
}
} }
void vga_putchar(char c) { void vga_putchar(char c) {
if (c == '\n') { if (c == '\n') {
terminal_row++;
terminal_column = 0;
return; return;
} }
@@ -85,19 +75,9 @@ void vga_putchar(char c) {
} }
return; return;
} }
const size_t index = terminal_row * VGA_WIDTH + terminal_column;
terminal_buffer[index] = vga_entry(c, terminal_color);
if (++terminal_column == VGA_WIDTH) {
terminal_column = 0;
if (++terminal_row == VGA_HEIGHT)
terminal_row = 0;
}
} }
uint32_t vga_seek(vfs_node_t* node, uint32_t offset, int whence) { uint32_t vga_seek(vfs_node_t* node, uint32_t offset, int whence) {
terminal_row = offset / VGA_WIDTH;
terminal_column = offset % VGA_WIDTH;
return 0; return 0;
} }
@@ -105,6 +85,5 @@ uint32_t vga_write(vfs_node_t* node, uint32_t offset, uint32_t size, uint8_t* bu
for (uint32_t i = 0; i < size; i++) { for (uint32_t i = 0; i < size; i++) {
vga_putchar((char)buf[i]); vga_putchar((char)buf[i]);
} }
update_cursor();
return size; return size;
} }

10
kernel/drivers/vga/vga.h
View File

@@ -3,7 +3,15 @@
#include <vfs.h> #include <vfs.h>
void vga_init(); void vga_init(
uint32_t fb_vaddr,
uint32_t fb_width,
uint32_t fb_height,
uint32_t fb_pitch,
uint8_t fb_bpp
);
void vga_clear_scrn(uint32_t color);
void vga_putchar(char c); void vga_putchar(char c);
uint32_t vga_write(vfs_node_t* node, uint32_t offset, uint32_t size, uint8_t* buf); uint32_t vga_write(vfs_node_t* node, uint32_t offset, uint32_t size, uint8_t* buf);

17
kernel/kmain.c
View File

@@ -97,12 +97,23 @@ void load_root_program(const char* path) {
void kmain(uint32_t magic, multiboot_info* mbi) { void kmain(uint32_t magic, multiboot_info* mbi) {
disable_interrupts(); disable_interrupts();
if (!(mbi->flags & (1 << 6))) {
vga_init(mbi->framebuffer_addr,
mbi->framebuffer_width,
mbi->framebuffer_height,
mbi->framebuffer_pitch,
mbi->framebuffer_bpp);
if (magic != 0x2BADB002) {
return;
}
// need mmap and fb info
if (!(mbi->flags & (1 << 6)) || !(mbi->flags & (1 << 12))) {
return; return;
} }
vga_init(); return;
uint32_t mmap_virtual_addr = mbi->mmap_addr + 0xC0000000; uint32_t mmap_virtual_addr = mbi->mmap_addr + 0xC0000000;
init_pmm((void*)mmap_virtual_addr, mbi->mmap_length); init_pmm((void*)mmap_virtual_addr, mbi->mmap_length);
kprintf("memory detection complete. total free memory: %dMB\n", total_free_memory() / 1024 / 1024); kprintf("memory detection complete. total free memory: %dMB\n", total_free_memory() / 1024 / 1024);

23
kernel/multiboot.h
View File

@@ -17,6 +17,29 @@ typedef struct {
uint32_t shndx; uint32_t shndx;
uint32_t mmap_length; uint32_t mmap_length;
uint32_t mmap_addr; uint32_t mmap_addr;
uint32_t drives_length;
uint32_t drives_addr;
uint32_t config_table;
uint32_t boot_loader_name;
uint32_t apm_table;
uint32_t vbe_control_info;
uint32_t vbe_mode_info;
uint16_t vbe_mode;
uint16_t vbe_interface_seg;
uint16_t vbe_interface_off;
uint16_t vbe_interface_len;
uint64_t framebuffer_addr;
uint32_t framebuffer_pitch;
uint32_t framebuffer_width;
uint32_t framebuffer_height;
uint8_t framebuffer_bpp;
uint8_t framebuffer_type;
uint8_t red_field_position;
uint8_t red_mask_size;
uint8_t green_field_position;
uint8_t green_mask_size;
uint8_t blue_field_position;
uint8_t blue_mask_size;
} __attribute__((packed)) multiboot_info; } __attribute__((packed)) multiboot_info;
typedef struct { typedef struct {

20
kernel/syscall.c
View File

@@ -95,6 +95,25 @@ static int32_t sys_brk(uint32_t new_break) {
return current->heap_end; return current->heap_end;
} }
static int32_t sys_sbrk(int32_t inc) {
process_t* current = current_task();
if (inc <= 0) { // can't shrink yet
return current->heap_end;
}
uint32_t page_start = (current->heap_end + 4095) & ~4095;
current->heap_end += inc;
uint32_t page_end = (current->heap_end + 4095) & ~4095;
for (uint32_t addr = page_start; addr < page_end; addr += 4096) {
void* phys = p_alloc_frame();
map_page(addr, (uint32_t)phys, PAGE_PRESENT | PAGE_WRITABLE | PAGE_USER);
}
return current->heap_end;
}
static int32_t sys_pty(int* slave_fd) { static int32_t sys_pty(int* slave_fd) {
pty_t* pty = (pty_t*)kalloc(sizeof(pty_t)); pty_t* pty = (pty_t*)kalloc(sizeof(pty_t));
ring_buf_init(&pty->master_rb); ring_buf_init(&pty->master_rb);
@@ -230,6 +249,7 @@ void syscall(registers_t* regs) {
case 5: ret = sys_open((const char*)regs->ebx, regs->ecx); break; case 5: ret = sys_open((const char*)regs->ebx, regs->ecx); break;
case 6: ret = sys_close(regs->ebx); break; case 6: ret = sys_close(regs->ebx); break;
case 12: ret = sys_brk(regs->ebx); break; case 12: ret = sys_brk(regs->ebx); break;
case 13: ret = sys_sbrk(regs->ebx); break;
case 20: ret = sys_pty((int*)regs->ebx); break; case 20: ret = sys_pty((int*)regs->ebx); break;
case 21: ret = sys_fork(regs); break; case 21: ret = sys_fork(regs); break;
case 22: ret = sys_exec(regs, (const char*)regs->ebx); break; case 22: ret = sys_exec(regs, (const char*)regs->ebx); break;

BIN
programs/lib/rlibc.a
View File

Binary file not shown.

11
programs/rocksh/main.c
View File

@@ -1,4 +1,5 @@
#include "syscall.h" #include "syscall.h"
#include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@@ -23,16 +24,14 @@ void parse_cmd() {
return; return;
} }
// need a strcat strcpy(path, bin_dir);
char* dst = path; strcat(path, buf);
strcpy(dst, bin_dir);
dst = path + strlen(bin_dir);
strcpy(dst, buf);
int pid = fork(); int pid = fork();
if (pid == 0) { if (pid == 0) {
if (!exec(path)) { if (!exec(path)) {
return; printf("failed to execute %s\n", path);
exit(0);
} }
} }

51
rocklibc/compile_commands.json
View File

@@ -16,6 +16,40 @@
"file": "/home/slinky/source/RockOS/rocklibc/src/string.c", "file": "/home/slinky/source/RockOS/rocklibc/src/string.c",
"output": "/home/slinky/source/RockOS/rocklibc/src/string.o" "output": "/home/slinky/source/RockOS/rocklibc/src/string.o"
}, },
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Iinclude",
"-c",
"-o",
"src/malloc.o",
"src/malloc.c"
],
"directory": "/home/slinky/source/RockOS/rocklibc",
"file": "/home/slinky/source/RockOS/rocklibc/src/malloc.c",
"output": "/home/slinky/source/RockOS/rocklibc/src/malloc.o"
},
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Iinclude",
"-c",
"-o",
"src/strcat.o",
"src/strcat.c"
],
"directory": "/home/slinky/source/RockOS/rocklibc",
"file": "/home/slinky/source/RockOS/rocklibc/src/strcat.c",
"output": "/home/slinky/source/RockOS/rocklibc/src/strcat.o"
},
{ {
"arguments": [ "arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc", "/home/slinky/opt/cross/bin/i686-elf-gcc",
@@ -33,6 +67,23 @@
"file": "/home/slinky/source/RockOS/rocklibc/src/syscall.c", "file": "/home/slinky/source/RockOS/rocklibc/src/syscall.c",
"output": "/home/slinky/source/RockOS/rocklibc/src/syscall.o" "output": "/home/slinky/source/RockOS/rocklibc/src/syscall.o"
}, },
{
"arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc",
"-ffreestanding",
"-O2",
"-Wall",
"-Wextra",
"-Iinclude",
"-c",
"-o",
"src/strtok.o",
"src/strtok.c"
],
"directory": "/home/slinky/source/RockOS/rocklibc",
"file": "/home/slinky/source/RockOS/rocklibc/src/strtok.c",
"output": "/home/slinky/source/RockOS/rocklibc/src/strtok.o"
},
{ {
"arguments": [ "arguments": [
"/home/slinky/opt/cross/bin/i686-elf-gcc", "/home/slinky/opt/cross/bin/i686-elf-gcc",

8
rocklibc/include/stdlib.h Normal file
View File

@@ -0,0 +1,8 @@
#ifndef RLIBC_STDLIB_H
#define RLIBC_STDLIB_H
#include <stddef.h>
void* malloc(size_t size);
#endif

1
rocklibc/include/string.h
View File

@@ -10,5 +10,6 @@ void *memset(void *s, int c, size_t n);
size_t strlen(const char *s); size_t strlen(const char *s);
int strcmp(const char *s1, const char *s2); int strcmp(const char *s1, const char *s2);
char *strcpy(char *dest, const char *src); char *strcpy(char *dest, const char *src);
char* strcat(char *dest, const char* src);
#endif #endif

4
rocklibc/include/syscall.h
View File

@@ -9,6 +9,8 @@
#define SYS_WRITE 4 #define SYS_WRITE 4
#define SYS_OPEN 5 #define SYS_OPEN 5
#define SYS_CLOSE 6 #define SYS_CLOSE 6
#define SYS_BRK 12
#define SYS_SBRK 13
#define SYS_PTY 20 #define SYS_PTY 20
#define SYS_FORK 21 #define SYS_FORK 21
#define SYS_EXEC 22 #define SYS_EXEC 22
@@ -25,7 +27,7 @@ int lseek(int fd, size_t offset, int whence);
void exit(int status) __attribute__((noreturn)); void exit(int status) __attribute__((noreturn));
void *sbrk(intptr_t increment); void* sbrk(int32_t increment);
int brk(void *addr); int brk(void *addr);
int pty(int* slave); int pty(int* slave);

74
rocklibc/src/malloc.c Normal file
View File

@@ -0,0 +1,74 @@
#include <stdlib.h>
#include <syscall.h>
#define ALIGN(size) (((size) + 3) & ~3)
#define HEADER_SIZE sizeof(struct Header)
struct Header {
size_t size;
int is_free;
struct Header* next;
};
static struct Header* free_list_head = NULL;
static struct Header* find_free_block(struct Header** last, size_t size) {
struct Header* current = free_list_head;
while (current && !(current->is_free && current->size >= size)) {
*last = current;
current = current->next;
}
return current;
}
static struct Header* request_space(struct Header* last, size_t size) {
struct Header* block = sbrk(0);
void* request = sbrk(size + HEADER_SIZE);
if (request == (void*)-1) {
return NULL;
}
if (last) {
last->next = block;
}
block->size = size;
block->next = NULL;
block->is_free = 0;
return block;
}
void* malloc(size_t size) {
if (size <= 0) {
return NULL;
}
size = ALIGN(size);
if (free_list_head == NULL) {
struct Header* block = request_space(NULL, size);
if (!block) return NULL;
free_list_head = block;
return (void*)(block + 1);
}
struct Header* last = free_list_head;
struct Header* block = find_free_block(&last, size);
if (block) {
block->is_free = 0;
} else {
block = request_space(last, size);
if (!block) return NULL;
}
return (void*)(block + 1);
}
void free(void* ptr) {
if (!ptr) return;
struct Header* block = (struct Header*)ptr - 1;
block->is_free = 1;
}

8
rocklibc/src/strcat.c Normal file
View File

@@ -0,0 +1,8 @@
#include <string.h>
#include <stdint.h>
char* strcat(char* dest, const char* src) {
char* start = dest + strlen(dest);
strcpy(start, src);
return dest;
}

63
rocklibc/src/strtok.c Normal file
View File

@@ -0,0 +1,63 @@
#include <string.h>
static size_t kernel_strspn(const char *s, const char *accept) {
const char *p;
const char *a;
size_t count = 0;
for (p = s; *p != '\0'; ++p) {
for (a = accept; *a != '\0'; ++a) {
if (*p == *a)
break;
}
if (*a == '\0')
return count;
++count;
}
return count;
}
static char *kernel_strpbrk(const char *s, const char *accept) {
while (*s != '\0') {
const char *a = accept;
while (*a != '\0') {
if (*s == *a) {
return (char *)s;
}
a++;
}
s++;
}
return NULL;
}
char *strtok_r(char *str, const char *delim, char **saveptr) {
char *token;
if (str == NULL) {
str = *saveptr;
}
if (str == NULL || *str == '\0') {
*saveptr = NULL;
return NULL;
}
str += kernel_strspn(str, delim);
if (*str == '\0') {
*saveptr = NULL;
return NULL;
}
token = str;
str = kernel_strpbrk(token, delim);
if (str == NULL) {
*saveptr = NULL;
} else {
*str = '\0';
*saveptr = str + 1;
}
return token;
}

8
rocklibc/src/syscall.c
View File

@@ -65,4 +65,12 @@ int dup2(int src, int dst) {
int waitpid(int pid, int* status) { int waitpid(int pid, int* status) {
return syscall3(SYS_WAIT, pid, (uint32_t)status, 0); return syscall3(SYS_WAIT, pid, (uint32_t)status, 0);
}
void* sbrk(int32_t increment) {
return (void*)syscall1(SYS_SBRK, increment);
}
int brk(void *addr) {
return syscall1(SYS_BRK, (uint32_t)addr);
} }