diff --git a/7/Binaries/OS.bin b/7/Binaries/OS.bin index 79488c6..90e21e4 100644 Binary files a/7/Binaries/OS.bin and b/7/Binaries/OS.bin differ diff --git a/7/Binaries/full_kernel.bin b/7/Binaries/full_kernel.bin old mode 100644 new mode 100755 index b8fcb3e..1a0d032 Binary files a/7/Binaries/full_kernel.bin and b/7/Binaries/full_kernel.bin differ diff --git a/7/Binaries/kernel.o b/7/Binaries/kernel.o index ac005a1..f1bbcd2 100644 Binary files a/7/Binaries/kernel.o and b/7/Binaries/kernel.o differ diff --git a/7/kernel.cpp b/7/kernel.c similarity index 63% rename from 7/kernel.cpp rename to 7/kernel.c index 2676d84..8df86e6 100644 --- a/7/kernel.cpp +++ b/7/kernel.c @@ -1,4 +1,4 @@ -extern "C" void main(){ +void main(){ *(char*)0xb8000 = 'Q'; return; } diff --git a/7/run.sh b/7/run.sh old mode 100644 new mode 100755 index ce50bc8..f4f1e56 --- a/7/run.sh +++ b/7/run.sh @@ -2,7 +2,7 @@ export PATH=$PATH:/usr/local/i386elfgcc/bin nasm "boot.asm" -f bin -o "Binaries/boot.bin" nasm "kernel_entry.asm" -f elf -o "Binaries/kernel_entry.o" -i386-elf-gcc -ffreestanding -m32 -g -c "kernel.cpp" -o "Binaries/kernel.o" +i386-elf-gcc -ffreestanding -m32 -g -c "kernel.c" -o "Binaries/kernel.o" nasm "zeroes.asm" -f bin -o "Binaries/zeroes.bin" i386-elf-ld -o "Binaries/full_kernel.bin" -Ttext 0x1000 "Binaries/kernel_entry.o" "Binaries/kernel.o" --oformat binary