From 6c243376ad761f24eb0c39e25a307197572bb6f6 Mon Sep 17 00:00:00 2001
From: c0repwn3r <core@coredoes.dev>
Date: Fri, 13 May 2022 21:44:14 -0400
Subject: [PATCH] Merge branch 'feature/rewrite'

---
 .gitignore                                    |   4 +-
 .vscode/c_cpp_properties.json                 |   2 +-
 .vscode/settings.json                         |   2 +-
 Makefile                                      |  83 ++++++-----
 bin/boot.bin                                  | Bin 512 -> 0 bytes
 bin/kernel.bin                                | Bin 7027 -> 0 bytes
 bochsrc.txt                                   |  57 +++++++
 .../shade/platform}/ports.h                   |   0
 {src/kernel => include/shade}/print.h         |   0
 {src/kernel => include/shade}/util.h          |   0
 {src/kernel => include}/strings.h             |   0
 {old_src => learning/old_src}/16bit/boot.asm  |   0
 {old_src => learning/old_src}/16bit/disk.asm  |   0
 .../old_src}/16bit/disk_boot.asm              |   0
 .../old_src}/16bit/segmentation.asm           |   0
 {old_src => learning/old_src}/32bit_gdt.asm   |   0
 {old_src => learning/old_src}/32bit_jump.asm  |   0
 {old_src => learning/old_src}/32bit_main.asm  |   0
 {old_src => learning/old_src}/32bit_print.asm |   0
 {old_src => learning/old_src}/function.c      |   0
 {old_src => learning/old_src}/functioncalls.c |   0
 .../old_src}/old-16b/basic_boot.asm           |   0
 .../old_src}/old-16b/boot_hello.asm           |   0
 .../old_src}/old-16b/boot_memory.asm          |   0
 .../old_src}/old-16b/boot_org.asm             |   0
 .../old_src}/old-16b/boot_stack.asm           |   0
 .../old_src}/old_bin/boot_hello.bin           | Bin
 .../old_src}/old_bin/boot_memory.bin          | Bin
 .../old_src}/old_bin/boot_simple.bin          | Bin
 .../old_src}/old_bin/boot_stack.bin           | Bin
 {old_src => learning/old_src}/print.asm       |   0
 {old_src => learning/old_src}/print_hex.asm   |   0
 obj/kernel/entry.o                            | Bin 480 -> 0 bytes
 obj/kernel/kernel.o                           | Bin 5604 -> 3160 bytes
 obj/kernel/platform/drivers/ports.o           | Bin 2680 -> 0 bytes
 obj/kernel/platform/interrupts/int.o          | Bin 4072 -> 0 bytes
 obj/kernel/platform/interrupts/int_lowlevel.o | Bin 2240 -> 0 bytes
 obj/kernel/print.o                            | Bin 6632 -> 3952 bytes
 obj/kernel/strings.o                          | Bin 3652 -> 0 bytes
 obj/kernel/util.o                             | Bin 2792 -> 1616 bytes
 old/Makefile                                  |  56 +++++++
 getinblocks.py => old/getinblocks.py          |   0
 old/os-image.bin                              | Bin 0 -> 4609 bytes
 {src => old/src}/boot/boot.asm                |   0
 {src => old/src}/boot/disk/disk.asm           |   0
 {src => old/src}/boot/kernel.asm              |   0
 {src => old/src}/boot/output/print.asm        |   0
 {src => old/src}/boot/output/print_hex.asm    |   0
 {src => old/src}/boot/output/vga-print.asm    |   0
 {src => old/src}/boot/protected/gdt.asm       |  13 +-
 .../src}/boot/protected/protected-switch.asm  |   0
 {src => old/src}/kernel/entry.asm             |   0
 old/src/kernel/kernel.c                       |  54 +++++++
 .../src}/kernel/platform/drivers/ports.c      |   0
 old/src/kernel/platform/drivers/ports.h       |   4 +
 old/src/kernel/platform/gdt.h                 |  28 ++++
 .../src}/kernel/platform/interrupts/int.c     |   8 +-
 .../src}/kernel/platform/interrupts/int.h     |   9 +-
 .../platform/interrupts/int_lowlevel.asm      | 102 +++++++++++++
 {src => old/src}/kernel/platform/types.h      |   0
 old/src/kernel/print.c                        | 110 ++++++++++++++
 old/src/kernel/print.h                        |  44 ++++++
 {src => old/src}/kernel/strings.c             |   0
 old/src/kernel/strings.h                      |  10 ++
 old/src/kernel/util.c                         |  25 ++++
 old/src/kernel/util.h                         |   8 +
 os-image.bin                                  | Bin 7539 -> 0 bytes
 src/boot/entry.asm                            | 141 ++++++++++++++++++
 src/boot/entry64.asm                          |  17 +++
 src/boot/mb2_header.asm                       |  16 ++
 src/iso/boot/grub/grub.cfg                    |   7 +
 src/kernel/kernel.c                           |  14 +-
 .../platform/interrupts/int_lowlevel.asm      |  54 -------
 src/kernel/platform/ports.c                   |  26 ++++
 src/kernel/print.c                            |   4 +-
 src/kernel/util.c                             |   2 +-
 src/libc/strings.c                            |  48 ++++++
 src/linker.ld                                 |  30 ++++
 78 files changed, 862 insertions(+), 116 deletions(-)
 delete mode 100644 bin/boot.bin
 delete mode 100755 bin/kernel.bin
 create mode 100644 bochsrc.txt
 rename {src/kernel/platform/drivers => include/shade/platform}/ports.h (100%)
 rename {src/kernel => include/shade}/print.h (100%)
 rename {src/kernel => include/shade}/util.h (100%)
 rename {src/kernel => include}/strings.h (100%)
 rename {old_src => learning/old_src}/16bit/boot.asm (100%)
 rename {old_src => learning/old_src}/16bit/disk.asm (100%)
 rename {old_src => learning/old_src}/16bit/disk_boot.asm (100%)
 rename {old_src => learning/old_src}/16bit/segmentation.asm (100%)
 rename {old_src => learning/old_src}/32bit_gdt.asm (100%)
 rename {old_src => learning/old_src}/32bit_jump.asm (100%)
 rename {old_src => learning/old_src}/32bit_main.asm (100%)
 rename {old_src => learning/old_src}/32bit_print.asm (100%)
 rename {old_src => learning/old_src}/function.c (100%)
 rename {old_src => learning/old_src}/functioncalls.c (100%)
 rename {old_src => learning/old_src}/old-16b/basic_boot.asm (100%)
 rename {old_src => learning/old_src}/old-16b/boot_hello.asm (100%)
 rename {old_src => learning/old_src}/old-16b/boot_memory.asm (100%)
 rename {old_src => learning/old_src}/old-16b/boot_org.asm (100%)
 rename {old_src => learning/old_src}/old-16b/boot_stack.asm (100%)
 rename {old_src => learning/old_src}/old_bin/boot_hello.bin (100%)
 rename {old_src => learning/old_src}/old_bin/boot_memory.bin (100%)
 rename {old_src => learning/old_src}/old_bin/boot_simple.bin (100%)
 rename {old_src => learning/old_src}/old_bin/boot_stack.bin (100%)
 rename {old_src => learning/old_src}/print.asm (100%)
 rename {old_src => learning/old_src}/print_hex.asm (100%)
 delete mode 100644 obj/kernel/entry.o
 delete mode 100644 obj/kernel/platform/drivers/ports.o
 delete mode 100644 obj/kernel/platform/interrupts/int.o
 delete mode 100644 obj/kernel/platform/interrupts/int_lowlevel.o
 delete mode 100644 obj/kernel/strings.o
 create mode 100644 old/Makefile
 rename getinblocks.py => old/getinblocks.py (100%)
 create mode 100644 old/os-image.bin
 rename {src => old/src}/boot/boot.asm (100%)
 rename {src => old/src}/boot/disk/disk.asm (100%)
 rename {src => old/src}/boot/kernel.asm (100%)
 rename {src => old/src}/boot/output/print.asm (100%)
 rename {src => old/src}/boot/output/print_hex.asm (100%)
 rename {src => old/src}/boot/output/vga-print.asm (100%)
 rename {src => old/src}/boot/protected/gdt.asm (72%)
 rename {src => old/src}/boot/protected/protected-switch.asm (100%)
 rename {src => old/src}/kernel/entry.asm (100%)
 create mode 100644 old/src/kernel/kernel.c
 rename {src => old/src}/kernel/platform/drivers/ports.c (100%)
 create mode 100644 old/src/kernel/platform/drivers/ports.h
 create mode 100644 old/src/kernel/platform/gdt.h
 rename {src => old/src}/kernel/platform/interrupts/int.c (85%)
 rename {src => old/src}/kernel/platform/interrupts/int.h (69%)
 create mode 100644 old/src/kernel/platform/interrupts/int_lowlevel.asm
 rename {src => old/src}/kernel/platform/types.h (100%)
 create mode 100644 old/src/kernel/print.c
 create mode 100644 old/src/kernel/print.h
 rename {src => old/src}/kernel/strings.c (100%)
 create mode 100644 old/src/kernel/strings.h
 create mode 100644 old/src/kernel/util.c
 create mode 100644 old/src/kernel/util.h
 delete mode 100644 os-image.bin
 create mode 100644 src/boot/entry.asm
 create mode 100644 src/boot/entry64.asm
 create mode 100644 src/boot/mb2_header.asm
 create mode 100644 src/iso/boot/grub/grub.cfg
 delete mode 100644 src/kernel/platform/interrupts/int_lowlevel.asm
 create mode 100644 src/kernel/platform/ports.c
 create mode 100644 src/libc/strings.c
 create mode 100644 src/linker.ld

diff --git a/.gitignore b/.gitignore
index 2cfa49f..cbbd0b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-i386-elf-toolchain-aur
-i386-elf-tools-aur-pkgs
+bin/
+obj/
\ No newline at end of file
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 9e6febf..88da4ee 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -3,7 +3,7 @@
         {
             "name": "Linux",
             "includePath": [
-                "${workspaceFolder}/**"
+                "${workspaceFolder}/include/**"
             ],
             "defines": [],
             "compilerPath": "/usr/bin/clang",
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 3e427ab..288d5f0 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
     "files.associations": {
-        "idt.h": "c"
+        "types.h": "c"
     }
 }
diff --git a/Makefile b/Makefile
index c4564c7..fbf99ed 100644
--- a/Makefile
+++ b/Makefile
@@ -1,56 +1,67 @@
-# $@ = target file
-# $< = first dependency
-# $^ = all dependencies
+ASM := nasm
 
-GDB = gdb
+CC := x86_64-elf-gcc
+CCFLAGS := 
 
-C_FILES = $(shell find src/ -type f -name '*.c')
-CO_FILES = $(patsubst src/%.c, obj/%.o, $(C_FILES))
-ASM_FILES = $(shell find src/kernel/ -type f -name '*.asm')
-AO_FILES = $(patsubst src/kernel/%.asm, obj/kernel/%.o, $(ASM_FILES))
-ABIN_FILES = $(patsubst src/%.asm, bin/%.bin, $(ASM_FILES))
+LD := x86_64-elf-ld
+LDFLAGS := 
 
-os-image.bin: bin/boot.bin bin/kernel.bin
-	cat $^ > $@
+INCLUDE := include/
 
-bin/boot.bin: src/boot/boot.asm bin/kernel.bin .FORCE
-	sed -i.orig "s@CH_REPLACE_BOOTSECTORCOUNT@$(shell ./getinblocks.py $(shell du -b "bin/kernel.bin" | cut -f 1))@g" src/boot/kernel.asm
-	nasm -Isrc/boot/ $< -f bin -o $@
-	mv src/boot/kernel.asm.orig src/boot/kernel.asm
+# Target: kernel, type: C ASM
+kernel_c_source_files = $(shell find src/kernel/ -type f -name *.c)
+kernel_c_object_files = $(patsubst src/%.c,obj/%.o,$(kernel_c_source_files))
+kernel_asm_source_files = $(shell find src/kernel/ -type f -name *.asm)
+kernel_asm_object_files = $(patsubst src/%.asm,obj/%.o,$(kernel_asm_source_files))
+kernel_source_files = $(kernel_c_source_files) $(kernel_asm_object_files)
+kernel_object_files = $(kernel_c_object_files) $(kernel_asm_object_files)
 
-.FORCE:
+# Target: libc, type: C ASM
+libc_c_source_files = $(shell find src/libc/ -type f -name *.c)
+libc_c_object_files = $(patsubst src/%.c,obj/%.o,$(libc_c_source_files))
+libc_asm_source_files = $(shell find src/libc/ -type f -name *.asm)
+libc_asm_object_files = $(patsubst src/%.asm,obj/%.o,$(libc_c_object_files))
+libc_source_files = $(libc_c_source_files) $(libc_asm_source_files)
+libc_object_files = $(libc_c_object_files) $(libc_asm_object_files)
 
-bin/kernel.bin: obj/kernel/entry.o ${CO_FILES} ${AO_FILES}
-	i386-elf-ld -o $@ -Ttext 0x1000 $^ --oformat binary
+# Target: sboot, type: ASM
+# Override: 32-bit
+sboot_asm_source_files = $(shell find src/boot/ -type f -name *.asm)
+sboot_asm_object_files = $(patsubst src/%.asm,obj/%.o,$(sboot_asm_source_files))
+sboot_source_files = $(sboot_asm_source_files)
+sboot_object_files = $(sboot_asm_object_files)
 
-kernel.elf: obj/kernel/entry.o ${CO_FILES} ${AO_FILES}
-	i386-elf-ld -o $@ -Ttext 0x1000 $^
+shade_bin_ldfile = src/linker.ld
 
-run: clean os-image.bin
-	qemu-system-x86_64 -hdd os-image.bin
+default: run
 
-debug: clean os-image.bin kernel.elf
-	qemu-system-x86_64 -s -S -hdd os-image.bin &
-	${GDB} os-image.bin -ex "symbol-file kernel.elf" -ex "target remote localhost:1234"
+bin/shade.iso: bin/shade.bin
+	cp bin/shade.bin src/iso/boot/shade.bin
+	grub-mkrescue src/iso/ -o $@
+	rm src/iso/boot/shade.bin
 
+bin/shade.bin: $(sboot_object_files) $(kernel_object_files) $(libc_object_files)
+	mkdir -p "$(@D)"
+	$(LD) $(LDFLAGS) -n -T $(shade_bin_ldfile) $^ -o $@
+	grub-file --is-x86-multiboot2 $@
 
+# Generics
+# Source file types: C ASM
 
+# C
 obj/%.o: src/%.c
 	mkdir -p "$(@D)"
-	i386-elf-gcc -g -ffreestanding -c $< -o $@
+	$(CC) $(CCFLAGS) -I $(INCLUDE) -ffreestanding -c $< -o $@
 
+# ASM
 obj/%.o: src/%.asm
 	mkdir -p "$(@D)"
-	nasm -f elf $< -o $@
+	$(ASM) -felf64 $< -o $@
 
-bin/%.bin: src/%.asm
-	mkdir -p "$(@D)"
-	nasm -f bin $< -o $@
+# Other
+run: clean bin/shade.iso
+	qemu-system-x86_64 -drive file=bin/shade.iso,index=0,media=disk,format=raw
 
 clean:
-	find obj -type f -name '*.o' -exec rm {} +
-	find obj -type f -name '*.bin' -exec rm {} +
-	find bin -type f -name '*.o' -exec rm {} +
-	find bin -type f -name '*.bin' -exec rm {} +
-	find . -type f -name '*.dis' -exec rm {} +
-	rm -f kernel.elf
\ No newline at end of file
+	rm -rf bin/*
+	rm -rf obj/*
\ No newline at end of file
diff --git a/bin/boot.bin b/bin/boot.bin
deleted file mode 100644
index 9a84534152acb62b4e0b43f21d2a5372a6d90276..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 512
zcmZ8eKWGzC82|1J#2U;U2q}ulLvRo}L?@MwE?otey5u$YPR`uj3-8`RD|bb_CCPBq
z4h~%$l};66P>(|DEz%O&(ank=4=+L-b;$FjA_afT_y70(>(rLxUD)W3vj?%LfVc$W
ziYCTTOdGxOBJjC>bz~;FR{X?yqhH-QH!^q5k4$B}14w?A_~q_Va%`09i?`SHQaNiy
z*AF`7z5P<Mrxl+wI}!tl^ZIIC0UG!EdS~)le**&;U0~(qTa!>xWm}Qhkm7~xd=oEa
zwjGJ5vY6g=f)-)~TZk}587%ot${1;K<cHo0VTjr&P$p%;NgDivluFw=gcG@W2=j0d
z0W{vjlM3|C^bNID#qR2AspNxR{J{BdL#us_3^cTpkD76H`2Avh7VNhsq@U8GbeJBe
zVi#Zzx?@pO)Y*P4zD&hrnt?f}_S6BzHJNA6VgT`6N-17#N;N;Y?#dk$aLhQd7Eqg!
zHfE0hP-&E_xrv25Y7yl44tKEYJjUFi{@*H>VoSyU%M8M1lLUbsy6)NndK7x?86Brc
ib-H<4ICHiL^NFjtRn#LMWorm?RA0R@d&4R2Z~p=CtJ1ds

diff --git a/bin/kernel.bin b/bin/kernel.bin
deleted file mode 100755
index 746678e2ba3b18e71b6d36234d5b558b0dd2bd32..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7027
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

diff --git a/bochsrc.txt b/bochsrc.txt
new file mode 100644
index 0000000..2ba3db3
--- /dev/null
+++ b/bochsrc.txt
@@ -0,0 +1,57 @@
+# configuration file generated by Bochs
+plugin_ctrl: unmapped=true, biosdev=true, speaker=true, extfpuirq=true, parallel=true, serial=true, iodebug=true, pcidev=false, usb_uhci=false
+config_interface: textconfig
+display_library: x
+memory: host=32, guest=32
+romimage: file="/usr/share/bochs/BIOS-bochs-latest", address=0x00000000, options=none
+vgaromimage: file="/usr/share/bochs/VGABIOS-lgpl-latest"
+boot: floppy
+floppy_bootsig_check: disabled=0
+floppya: type=1_44
+# no floppyb
+ata0: enabled=true, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14
+ata0-master: type=disk, path="bin/shade.iso", mode=flat, cylinders=0, heads=0, spt=0, sect_size=512, model="Generic 1234", biosdetect=auto, translation=auto
+ata0-slave: type=none
+ata1: enabled=true, ioaddr1=0x170, ioaddr2=0x370, irq=15
+ata1-master: type=none
+ata1-slave: type=none
+ata2: enabled=false
+ata3: enabled=false
+optromimage1: file=none
+optromimage2: file=none
+optromimage3: file=none
+optromimage4: file=none
+optramimage1: file=none
+optramimage2: file=none
+optramimage3: file=none
+optramimage4: file=none
+pci: enabled=1, chipset=i440fx, slot1=none, slot2=none, slot3=none, slot4=none, slot5=none
+vga: extension=vbe, update_freq=5, realtime=1, ddc=builtin
+cpu: count=1:1:1, ips=4000000, quantum=16, model=bx_generic, reset_on_triple_fault=1, cpuid_limit_winnt=0, ignore_bad_msrs=1, mwait_is_nop=0
+cpuid: level=6, stepping=3, model=3, family=6, vendor_string="AuthenticAMD", brand_string="AMD Athlon(tm) processor"
+cpuid: mmx=true, apic=xapic, simd=sse2, sse4a=false, misaligned_sse=false, sep=true
+cpuid: movbe=false, adx=false, aes=false, sha=false, xsave=false, xsaveopt=false, avx_f16c=false
+cpuid: avx_fma=false, bmi=0, xop=false, fma4=false, tbm=false, x86_64=true, 1g_pages=false
+cpuid: pcid=false, fsgsbase=false, smep=false, smap=false, mwait=true
+print_timestamps: enabled=0
+debugger_log: -
+magic_break: enabled=0
+port_e9_hack: enabled=0
+private_colormap: enabled=0
+clock: sync=none, time0=local, rtc_sync=0
+# no cmosimage
+log: -
+logprefix: %t%e%d
+debug: action=ignore
+info: action=report
+error: action=report
+panic: action=ask
+keyboard: type=mf, serial_delay=250, paste_delay=100000, user_shortcut=none
+mouse: type=ps2, enabled=false, toggle=ctrl+mbutton
+speaker: enabled=true, mode=system
+parport1: enabled=true, file=none
+parport2: enabled=false
+com1: enabled=true, mode=null
+com2: enabled=false
+com3: enabled=false
+com4: enabled=false
diff --git a/src/kernel/platform/drivers/ports.h b/include/shade/platform/ports.h
similarity index 100%
rename from src/kernel/platform/drivers/ports.h
rename to include/shade/platform/ports.h
diff --git a/src/kernel/print.h b/include/shade/print.h
similarity index 100%
rename from src/kernel/print.h
rename to include/shade/print.h
diff --git a/src/kernel/util.h b/include/shade/util.h
similarity index 100%
rename from src/kernel/util.h
rename to include/shade/util.h
diff --git a/src/kernel/strings.h b/include/strings.h
similarity index 100%
rename from src/kernel/strings.h
rename to include/strings.h
diff --git a/old_src/16bit/boot.asm b/learning/old_src/16bit/boot.asm
similarity index 100%
rename from old_src/16bit/boot.asm
rename to learning/old_src/16bit/boot.asm
diff --git a/old_src/16bit/disk.asm b/learning/old_src/16bit/disk.asm
similarity index 100%
rename from old_src/16bit/disk.asm
rename to learning/old_src/16bit/disk.asm
diff --git a/old_src/16bit/disk_boot.asm b/learning/old_src/16bit/disk_boot.asm
similarity index 100%
rename from old_src/16bit/disk_boot.asm
rename to learning/old_src/16bit/disk_boot.asm
diff --git a/old_src/16bit/segmentation.asm b/learning/old_src/16bit/segmentation.asm
similarity index 100%
rename from old_src/16bit/segmentation.asm
rename to learning/old_src/16bit/segmentation.asm
diff --git a/old_src/32bit_gdt.asm b/learning/old_src/32bit_gdt.asm
similarity index 100%
rename from old_src/32bit_gdt.asm
rename to learning/old_src/32bit_gdt.asm
diff --git a/old_src/32bit_jump.asm b/learning/old_src/32bit_jump.asm
similarity index 100%
rename from old_src/32bit_jump.asm
rename to learning/old_src/32bit_jump.asm
diff --git a/old_src/32bit_main.asm b/learning/old_src/32bit_main.asm
similarity index 100%
rename from old_src/32bit_main.asm
rename to learning/old_src/32bit_main.asm
diff --git a/old_src/32bit_print.asm b/learning/old_src/32bit_print.asm
similarity index 100%
rename from old_src/32bit_print.asm
rename to learning/old_src/32bit_print.asm
diff --git a/old_src/function.c b/learning/old_src/function.c
similarity index 100%
rename from old_src/function.c
rename to learning/old_src/function.c
diff --git a/old_src/functioncalls.c b/learning/old_src/functioncalls.c
similarity index 100%
rename from old_src/functioncalls.c
rename to learning/old_src/functioncalls.c
diff --git a/old_src/old-16b/basic_boot.asm b/learning/old_src/old-16b/basic_boot.asm
similarity index 100%
rename from old_src/old-16b/basic_boot.asm
rename to learning/old_src/old-16b/basic_boot.asm
diff --git a/old_src/old-16b/boot_hello.asm b/learning/old_src/old-16b/boot_hello.asm
similarity index 100%
rename from old_src/old-16b/boot_hello.asm
rename to learning/old_src/old-16b/boot_hello.asm
diff --git a/old_src/old-16b/boot_memory.asm b/learning/old_src/old-16b/boot_memory.asm
similarity index 100%
rename from old_src/old-16b/boot_memory.asm
rename to learning/old_src/old-16b/boot_memory.asm
diff --git a/old_src/old-16b/boot_org.asm b/learning/old_src/old-16b/boot_org.asm
similarity index 100%
rename from old_src/old-16b/boot_org.asm
rename to learning/old_src/old-16b/boot_org.asm
diff --git a/old_src/old-16b/boot_stack.asm b/learning/old_src/old-16b/boot_stack.asm
similarity index 100%
rename from old_src/old-16b/boot_stack.asm
rename to learning/old_src/old-16b/boot_stack.asm
diff --git a/old_src/old_bin/boot_hello.bin b/learning/old_src/old_bin/boot_hello.bin
similarity index 100%
rename from old_src/old_bin/boot_hello.bin
rename to learning/old_src/old_bin/boot_hello.bin
diff --git a/old_src/old_bin/boot_memory.bin b/learning/old_src/old_bin/boot_memory.bin
similarity index 100%
rename from old_src/old_bin/boot_memory.bin
rename to learning/old_src/old_bin/boot_memory.bin
diff --git a/old_src/old_bin/boot_simple.bin b/learning/old_src/old_bin/boot_simple.bin
similarity index 100%
rename from old_src/old_bin/boot_simple.bin
rename to learning/old_src/old_bin/boot_simple.bin
diff --git a/old_src/old_bin/boot_stack.bin b/learning/old_src/old_bin/boot_stack.bin
similarity index 100%
rename from old_src/old_bin/boot_stack.bin
rename to learning/old_src/old_bin/boot_stack.bin
diff --git a/old_src/print.asm b/learning/old_src/print.asm
similarity index 100%
rename from old_src/print.asm
rename to learning/old_src/print.asm
diff --git a/old_src/print_hex.asm b/learning/old_src/print_hex.asm
similarity index 100%
rename from old_src/print_hex.asm
rename to learning/old_src/print_hex.asm
diff --git a/obj/kernel/entry.o b/obj/kernel/entry.o
deleted file mode 100644
index fa6bc54912074a89408b059b2acc7216bdb04787..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 480
zcmb<-^>JflWMqH=Mh0dE1doBi0V-hvrZpJY7?@y6Nuoh!f-oCYmjRH&j%0!WlnoMN
zMiO@bs?$c|gUkQ{K_EtUNdZv80Vu`-#32138f2y<ln<o9U;|K{G>ikJVdg0U*_=q?
z7l0BRKt9MUkQ$JAApVO#|NsAg{SU~30=<&diV_CB;*8>wqLRcUAgeMLLPPmQsW}ie
zFdZl~%zls{3&Y3%$daI#5JM6Ghf#4+vVL}IQC@0}erjGxQKepDaV|q{VrCvhA;>%?
HqyPi}v*{*n

diff --git a/obj/kernel/kernel.o b/obj/kernel/kernel.o
index 987d3fc7f64f83188831191a49b4050a4df74a9a..66bfda775dcffa94bce1fa61453a1d4d4684619e 100644
GIT binary patch
literal 3160
zcmbtV-)me&6h52Owzf$dt6;QMrWGVbdz-9?_ygIvY?DGvLbjnQ$a-^kx_impxy#Jm
zBwG-Jg6La(@x}kZCm%!v!4~=;zUg03Uj!cn5qzj1)N}5gvpY_9AJhYLXU=!N^PTx|
z@7(ulD_15;C15MTt1$E!1(<zsIIiTw3QWTkY%YKN^DXj!p~tuMxHXB7-1P&e4+nh8
zsl${)bddWsGDge)o7{u9@6gnjKlpWK`McUZ*gpwF;iBT8jyHkfl!qBZY}DxB`#bBX
z_87M7GKtcT6j>^u-VU1*&Yu87gSEQYmRiX~>_~0mR0)_5%0U@6dP>ErB?!rxmzr`%
zCTX`LRYsE}yQ<<W4wLw%Y>H-Vx=Gj<rWZxhm>az$>7OWQP))mi9k<$<n2Rn7`CKN$
zjwsKU%Yj%-5|M|D(9%e~Bbx!I!L@d5L|3ORjr?M`6F0Hgh0t7z%>@yvrckMndtFR6
zBGn@9bdwkvyP?*h%KC2FK=@i)3Ywru;z%kZMHDKrg;?4{!7vk-P2XHzxmvBQR%^5c
z8BGMSOm?V9Fo?wzlftAu9pV0JDXGX(wfd5nTUy<`C>F}WLNIUl;RyBu+XL7z3KLMe
zO&D9r`ur_CVgsd{8&KMtDV?1<cKiT?=Mbkx_6<E2PtANdQJp?I@f9+P*eisib?7mO
zxAQnbqm1evf#2_sicOCELIEc8)%-Jq4zT3lyvBzu&OZ0FmNSliz9z(;!8U`<x91TU
zh1bU5b;L=Zb@M$z?9DO!Xbi5$;81)+K?JLtuQ#e|EA@P^v39*~Lyg_y6NIjgRn{<>
z=8?=AQJSReE4iD*O2T$0j1@$Q40R(+5-`N;X_M+kH#Mx<F|9_rJ=kg5ce)4h708W0
zB--a=*#5d-7~KhEgcFzXCkaGj9e)3wD&U;&>XaSa)p^0<tn;|_`JMFVv*_`ku>KX>
z`}|D@ck908>Ck&Z)+o9|^H&b;>g+i<{epOZ-nBTd>t*Y|@9^FI`NY9p{ZBoeCF_6Y
z@LiqH9o*IV(!t$%{^;N*am@4o$-$=_{5J=8_5ZLqulF76|LO3jam@OY_Tr-RI_luZ
zEzUY0+5BmT@2>ZZ$G>g)kB;G=^Z2vYKR<>qtlk9n)YvL^z&PI*5SV@^3%9V(bkVnY
zq-7EYncT}DXogt`!Im))=(KR~x10Yk1C?enXsKR+zq78?Ssyu+Dcg-3_;-^$h5ywH
z%%&yN-n&+@&Yay3j(IMe#Q>dMg$cG_rymyDJY6nmbdHou?+V#$(ZSQ$6K-i11!(()
zY{ZA3MVvJMYyJY}lBRp6=nm@ddIfp@#36eT8&UXwO&Hl-D@gw@*I17G*Dy%$v0wk5
z1$<q<KHXoW<>$}Y4S54&uKD?NFOE9DeM{u}bbbVJKA+#H+Ej1f)?c>^r8|Y*F+ZQ~
iAph(Tf*)v7X#4qd_~3nG<RKi4%KyR^YBJIGe*WL<QtGk*

literal 5604
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

diff --git a/obj/kernel/platform/drivers/ports.o b/obj/kernel/platform/drivers/ports.o
deleted file mode 100644
index 1b5320217a559a9d7af6fbc0aecf97c25a302be2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2680
zcmb7GO>7%Q6rQoYi7Pv9Vh2bl5C;kgqOp@wXlO}V5}7DadNZH`iq`fzHjV9Qcbzt<
z5=a#yAr~SFLLwIs7b<b*h(I6}2~>_q9N~fj2u_g*4c|AOaW<9^@T8gVeecbC^Y?b_
zS99l{lu`;KQiR1m6XLb*mgj_mQIQf!kzfDm>URG|E?QpCZExhZ*FWE0%k8~&;|t}8
z!m*K$!?(M3b1k>?W^QLAzx%6kABZdef?>DH8@XHU;5_0HoZp3KXG6u7e?#zJSb!yD
zgzK;_pu4-Ds+Ok4&^agr&!QVblUvWRpP}tOs-aC^&XG;F*s=(Rx_e;gdIX(J_R>6w
zb`R;+JM0;qJk}atilo6({Vld4LT`h{2hp{r`wE&0h##0Pev*#RCZ?0o5vb}=W#ll;
z6lRcHDl+m=a4IX+io68BCBlhQ!}4_OvDkbnG=PK|d1lbqhPy@v`((1~?7%C7G9^U#
zsEEa;W8s7lkrSPfR-e2-k&1<fjtnuT_YRzZP8MVSk-_;?Fj@CMIkE1$&_ZaKNA>K?
zbx^;EX2F*MqSF3M^blBMXi$biJaFDy2>Rhrg`Q=0)`YNB=G!dm8%u6lQ`43eea4ba
z>o~Npt@tOFeA=2Ghjq%5S3@XWx!iF5g~F=uEL7{ltAM4Ob+5WucS`AM-50LoHJ5zR
zwiPS3D^$>>hFf9~i745=9WXbVzL-0oPtQ)AOixT?j%UWxV>Q27cc!WjPd*CWc8e9Q
zFQ&)JW!G^$->#Rc^~F{iwIrs=RvI-YTWq*a)~nbhXRP4~&n;#zI&R%r$}TV2e!1b+
zvL&~=;<#Rx%keVB{~M=fWt@o@bF;Ij(xceLgL(@%W6_JY2a!TviN+(5HCzgB)Ceo{
ziA41E&`gh&{}Kbhjo;M0@xRdFHy@JmU+D0g&(!!$yqViz@I8u%-}j82c<{9%-><@!
zzbiN#{zDx+*1_W)JkgHeev_!$+ks~9<VV5HUdboG&ECk{SD?zw)aE{6RVWs$zy(F<
z5>e#i!^ek8VmnD9o)E5scqb7b%DqHO2)-~JcTC$)Yd)`$uP6Nr8eb+NepT}~G`_3x
zeeJ)l`KKChX#7^=_eA9RQS(1E@&;tMRcq~aV%-nW4jk90-eB-E<j6BX#O7IV<UC{Y
z$2EUm^A|P0toaqqMaEmL`E~*5yDh93&37*QBBQ?YOu_R+#&wo5C8y9_#1l|%z@>D%
zP;i}<px1Wo`l53nV5wSnOaSs5mF5M-i;Y^%!P^s<r0m)?2kZQ=as&hU9q=qE{5=l7
zvgR8ZhMhW&Tgk^74VZBwFtD!vZJfFr6AWa&z~2Qm7u~G2LuhBwC?BB?KLhf8;TOrq
z`PAJ3ja<iq-ZKPf)^|Rj(>;UxPgBui#ytfdoVSDn;+$+KrS`lwbQ1$r6p*h$MT_yh
z1Rl)iBi|@&%tyP~M-4h-#?dI>A>RirRrU0-shR|uaV`#=HX~--8VuCUxSuf&zv68%
z<J4c0wiOB%bS=QSKFTIqa35RP$64685Bw!)?}K@<^tN0>f}3D{XlB2Rp>Apgswm-p
X`JEbJ9tz`v<9@)rA1Y6)GvodSxejOv

diff --git a/obj/kernel/platform/interrupts/int.o b/obj/kernel/platform/interrupts/int.o
deleted file mode 100644
index 14dbc9596b1bdbfb7d6c7b5cc76b3c0a32e90fa5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4072
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

diff --git a/obj/kernel/platform/interrupts/int_lowlevel.o b/obj/kernel/platform/interrupts/int_lowlevel.o
deleted file mode 100644
index 98f9819729ccd5f2ab8a6c189699a2d00e5536fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2240
zcmdUxJ7^U_7=>q&7$ZcuQHuyZNrd<y$!?xPglJF{d=*+mi<_HdV}g4h?%il2Xc{fl
zMhmr2!3T&IDuNa&LJErrf))xE777+A6e3tC1g_`5bA}zTvh;_O@0{7a^WUABY%;Zd
z_YSSKvZYm}N|I8&ywF}|ld4t~_SS!*%qgnor&<wuokl5+F9a*;1qHO*=w$nmI*hsB
z<R-#?s0!l^kWl7a4!QHq;lhla1lO!x3%>}mH7#Eh^T}uB9+|HOnw>9|N^k$)pLm4w
z9@K(Mpn7N()Cg^WTA@y;2igYhg!V!QphM6AGy;WC1WiDvp)=5V=pu9lx(?lj?m-Ws
zC(v_9HOIk3teT6X#W;#HgK(2sL*^(5%{_AWUuE}8E>x)>CHDq7xqa>cvV3=Y=42=P
zk>%M<X*CQZ>tIT&JdCV~DXmVz$oiPl>MV?`l__0*URgJruffO~n$qenjI5_AtscY3
z+M3epC5)`IDXm_^$eNqd>H~~CgDI`Pz{p;h(&{^m?29R_e!~nf$@4D2g2{fF(y9(w
z_Ri*&$g+<%uSb?WwYdXX_SfdE$g<Zq??IM*x49o#&VbDUvYZE-k0Hz1u=y0SoD-YR
zA<LPu`7*McADeF>%UQDd0do0Vl?Sx)>?JS-J;U{Bj-{|3su&Hm91Wse5VjP;Ogxg0
zvMpn|IEbS0LR=J^4)Z6%;5d$9rkGX1#86O($MU)KXeKut29X*oM(JWaKA3Jzte03n
zv2BTMPi#kGI}_WL*zUw`PORs)bNYEsL(l2xIW0Y>r{^^FoUWeJ)^qy$PG8^Y>pOjY
zr?2ny^_{-H)7N+U`c7Zp>D%V?ZFBnKWf2D4QS)xDXi!T2ZU`5XOG$bE%lK+?9VvfP
zWL(aRu#4P6_K~~DedIy%Fqt8bkXf=wPLflkyg#Jh1@aPkmApaTA@7rq$fx8BavIbX
zO1&ay$T#FW@;&*H{6u~xzml`$H*${rN&X_|N%@tM{#9fRSxctKWn?|Mf?Pv3l1=0$
PQvOen`P<2EvWNTwb}hQ#

diff --git a/obj/kernel/print.o b/obj/kernel/print.o
index 6a393f3482b7a26f455f6b46f697e9f73b0ef53a..99394ea7f4e2c60ca10842cf60a5ffebeae36ebf 100644
GIT binary patch
literal 3952
zcmbtWUu;uV7(cfl%(1NlF`{T}LL`uoX2Ta}j24zFO~j2r8WRvpSMFfa_0HQ{0o`!2
zM0>N4j5i)I5nnX%frN*#5VMU*HcZs?L6@jY<i(`RmWe*h0wweN&izjN^|(e8zvSF=
z&hPtkzJK@J`+>Rt)qr6LMTU4;RCWp#qNSm-j>u(1G>Qfhi+aCBhZbABfw}06c~=Z>
z5Yy&TC^-5E3gyh-XUr0=7IussfGK#@ob#rJ&61IiUW#7WETY5a-Ka4YylyUadx0Tf
zNVzt%)c^gkv@sl;^Jcx70$LgQ=4(2zS=ns@W5ku(Pl6a~7lt244d2Ep213f+8F>oI
zj-l>_11r8x+tj(u{%UB_@TAcECm;X^V}cgCXUrnZVxdz-R>H`N)sf|c*G0EyE`gUr
z1>=UFgZw|lDhVj61Qh!}uL@{H9s@=w+EwE#=O^S9bLJw%Sj3VH4lLGZ8^+LGna71Q
zeq_?0w*0yJ3M)8jF6PYTasmI6GQN25YTjS47>j=OmZ5rDw*JMzs5elcB0_Sa$vm_|
zA!_7<qtG@F1_vGpcVlqee87skFiQ>K-S_V1Vx^o}1b2%!@2vHvU;#~)lXV(7s@f#v
z4J>-uf~rsfE3|0jJ+n041j(5AVGU&jT)0`R3yw~D(-S``a6G8XXabdf3}HCX5)Y4r
zrp*;-l6#%6g#-Z0M*%2`am@V$+LHx{UN9d<DKeiGV61!9EUvYzSTb8=0o*_tY%XkJ
zv9G=T#n6s@9kHFE*4^ROaElOY0S>{y`~X7)gfWSjB7^qo-QP?M<Gq8zIMZxwZCGD7
z0?elY$AR<?KK3*<e-vnMTo*`zgwJ~kaiBf&LHvHnmb!0Bt`NU+e&FY_en0WARPisD
z`Im_w;r#b2_P-+jcFs>!_;bYX;rzhyvi%bAKd$1R_YDwFpD=H0#UCp=j{7yM+^CNN
zZpdo*8mbnX2v>VGKL_|mS;cDkt%NH%HQN%0MkYf4ke-FHiTNXI2-r@-FJT`7$=tyF
z0t}Q_a<Zm??Irvg%t*49Fk=s*{6#wO3NnF?z(9OA*^eLyWWhk(AzaoBuq=#b7&;9B
zfbs@~CToO3eNIo>4JSoM?Dcqi=l(--aj^4^Ln3LXL^5S1oVa7378%QpC$mn*cH(_@
zh8T%d$~O>CTc=Y!X^VErlL?2G8MnMb3wFwez3sU1uCuNcx3jJ|WjSdp74OZQh})->
z-%rs3!&?udwBplS3}46aw+Y8OVvi{K9K+!?E92^2K>PS^EBVhz9&v8}OTu;gw>0@8
z`8msQZvRdVe7*+$F7*SR%l+>sT=)Mx!@2*%%nr}bHHL41GgKaK)Ufki4f$V~Jg?V0
z!+9S5WH|S;2?GMs^Z!H*{27LG``Z}K?e8L7ucO6q{AE*lxXA4AxNb3d{Dvs`pK9QR
z8u<Mh`1AChqM!K1RrX(Dcq79*7|!JnGn~u!Fr3S08P4TDtbvEX2P6!GLXrE3d{%IE
z4<6HSbq@||xVi^F)o^tWPHMQi2k&UOx|iYVlcfAq_n-)8&i1;AE|^`%pHHflW2F*d
z*E-{h@bQG35aF&&MuZ*P-z4qcUMmf}wC!5q6X|TY&$0U~$2|)&sA-*ycRPt*i#+;&
zQwY>C1ngx_5!&RaK8i=-s;$899rjYBjQERV*wjE@kbXU^Q5WwTq%Hm=w!@6Lc8s`9
zfPS97-vzp8Q`i5N0CgUSNJ3vZwZaB%@*YF}f7NdzefXuTBK(m>dd#27PvyUw_W}n~
zrJr9Qeci4e&tcGA&HpVF=oWPld7$gZ0AH<sb$Dq5P0FVbSU=QN`l^1bosB9jcxeJ%
nqVv%lLb^VFGxXX4ByLkfUc?O}Egbj<tD#T+A7{F_)b;-cS5z<*

literal 6632
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
VWVYB4=sVl)0LFdE8Ud}{e*ljAh{^x}

diff --git a/obj/kernel/strings.o b/obj/kernel/strings.o
deleted file mode 100644
index 107b607753276b035cc96d50478c217b59fc605e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3652
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
RD1W8j0Dkv#<pflI{{poCB`E*^

diff --git a/obj/kernel/util.o b/obj/kernel/util.o
index 5e77ddb798f41c47e0ccdceabcb0061aad1e88a7..7032cdd476eae9121859a242ab2c19aedca5c371 100644
GIT binary patch
literal 1616
zcmbtT&ubGw6n?X<t-l+8P=pFbdeDF_tss<EBwE(a!HNir7fVg!rVVtHl5C(+Ly>@F
z2!)&k{}6ldlx?AwoL0eG4>?pQHivpLN<rV-%(TmrlYa1a-hA(U@4d`qR*Z)aG{!)I
z!Cg4oDHfpCbL7W;Hx8%ZB$!-$<D#_7MWHFo?N7!51^0%l#sN=yylU)n=2cDHG<el)
za@H7FgNjx*4j86P7~8ME)@m~ws*KndX0u}K_(EZ{_Xg2x^VP?U3$s12X6{rXWxL7B
zr6v@1lv0#h)W2%9P*N_nq1f|trX^>oPPcf{<>~r-DwX2yZd9zhzcsPtwy(t2h37Uk
z=COLr6%FC7@)4X0y9t_@#>a_0(WpeQHWBGBohsj>;<NipdoQ+Po-kVFQVUkz`JD&5
z6xf8Dhvz{BH}O1YHehOUay)u{>X8|Xj^5Ho^$|R|UbHCMF*J;T2CPn;0+V}nM;B#)
zy?g>}Il_ic_aCoe@G|mbgem&mI~#ecO`hq~?qfzLc87SxIDJ&S;D>$fGvW~+>7(M>
zhfV@<T|jg7!jC^)LeSIYpM|5q`2g?Firj$Y)!v^Gxk1Ul!Ij|8Moz&=FX~CKEjzhX
zq$O`Tkj^->PIfktPo~q9)Hz#PHEHA%;{NxDSACy{c-0s5e9?9ibGSOW&bpvH$69tk
zf01w!pwH#=peM7oZDo+lWF1SN&lL2fTz1LIIYrQO)?z}p7G_hqgl)-Y|FI0AmhPZ0
zR3k3;6BG;}w1uk}BQEgV{p?raL|G$DUqhbm^k4NiP)jxGEd-(ZUkH-utNv=eja)w(
z-ER=|CJ5oWG;0vkxS`arzAp94!DRHqdX5~u*Em`b`?4U#38bStQu<3oBD(b^eoX3X
qv_YIeqcaZc6;C-qY)SoakVIeptV8x3df~gH;Fu(z9%go&u>LP6%IJ;&

literal 2792
zcma)7Uu;uV82`>~&vv(VZMROgIb@wv7|PlWP!X7*q#|Yz6SHIwl6lwN{t4?Xws#9t
zkYo#{Ws<;yQ4^kg=E*0GF>xAEd2w$(8jXYyc))}Nh>P?0-Fr^gEhhRU=lgyC&;N7I
zr^j9uLXajw0b19H?lt?Ky&eowoH}T{c60G=?1%I!+wOENjjt}HO|i0ce06C&EN)z+
zs<D=aZS_DpcJ{Z+mw)=s%jjH6hpXwkh^?hp@3g~z=?zgEU%fbfw;EeJ9$P#YquJZ_
z@R%3)aPizjnh!iUX{!EU{jwGPe)`~1ZROHy!}T(?Z&6>YRBu#cOUKPGa@lP5!R^}0
z@<U_!QD5!G&Xro)Ts&ve`LDf_@y&_XX~>%iYFsD6pgXY+l0=Ya*|ZPr36?sTfo}PL
z<pM=5un*A0RfoAl(JmH@D<mpznWBBOo)!!iDCRp{`3_96u&<q_=AbM%E}6miU~Umj
zJ%GS7V6D5sQfT7p&)~*3w#EH=B<8FcYTd>;#+7L?V>{Hk!!K#dPFO=BKhmYv5vU^2
z1WsI1Tr~y&0bR-~9OzdAHQLzstSW_J2i35VC@Em>?-vI`FNTiAjc#-eOJsv3kQ9e{
zw5`8sM^C%xXgb{eZjXo)1^3nq^tbpGBupDCG_{MTBk@q6ueXnLV_ihePhmPQg#sp#
z8HIQZwOW)df<;k%hInA>Jz^eP(F`<n?Qv#$|5$GGb~;E&$hZuDMcNqn8lXYwGqywC
zk7huQ8fo^7F_U{pdX+n6I4`9u6J!JfDH&r}kX=4J#*mcT7=~mVAP!1#LGBupp|7OO
zd09qM4!~nv_Ogr#8C7vPxqVDV^U}=9UN&WA^Qhdy(wuMjQAYgGFvB(9I3YV&OUibJ
zl<a0O7o?f@#jIcAn%v5c32BbX@PZVh2JXMWNt|>`lU5~DD3CKX@7fh|?c!<5<gGGI
z+ZC58rP*@ErlMV}*e*ln^gJCsF`hUw@<L){B)K~|oER#)vyMGl*t73>$W}R%S8^^f
zl+BiH)UllDf|H|4A?Hw~oJpOs%Z@#hnso~^$qc3PrJ|k6l*)FhlDDSqp;F~vZR?q&
zG8NF#BS-cp1~IOkYEam<7}^?0kT`3GgTX3xnU9Djz8x<|%nQaVZPNK30noKyUq<ae
zwaITGmLCG`Hx^U?Y>mW+OH+{kT+=e+#uu3N^<(S%y-QqA2~bO2_WhwvdU%r_A>1L4
zcs?CC=24)Y8|z!3>$$M5*Hvw_+V&0S#H-2AB|jYkL+oJ0|G~8wA7{jEd6H2Q?O;UQ
zE@gjP>F+CCR9Iz1-p5K`R=A?@7v=w5>Gu@=t&mqs;GO1uulJAfY-b%ftnfL7hg2M1
zHWFAU-h0mDKY;avN}o{rTS}*7WxnWIQ$V-uV_r+Hea5BawB=fqoT^kPS+-}A)ArPC
zZnEHHOK^FzH8oYX=Ni3M*>ZBYehmpT1;^G2{JW@JHcxtbrc^B2_)HpdvSq7iW1Rn&
zdJ)KHl-G`l|NmQ_<TLg$^`o)ueS^SW?SRarRo-hpbN?0R?FA<);(Fb>2y9y9GsCC;
zFdEYs2Kot*_n2=BH}22dE1;%5*vHSc0@U?RG|23}iMRv{igeuT&>Q>x1O0NJ+;EiY
z{aTQ94n&feczc6Eiznf0tal&v24UlRY}fNBLgt)dG^Q<Z%=x0n*~jgSLLK)Z;@<Qk
ze5T{7o8o>&9KO>!>9~(noOawtoU0WeRFAHJH_l_Lx>r08{LS@wa9u2Io$`1GzJb<`
irsu2YuFnbw4`N*gSWv`um^iO7ZVdf?=6QUk<Ng85vT%F=

diff --git a/old/Makefile b/old/Makefile
new file mode 100644
index 0000000..825ff4d
--- /dev/null
+++ b/old/Makefile
@@ -0,0 +1,56 @@
+# $@ = target file
+# $< = first dependency
+# $^ = all dependencies
+
+GDB = gdb
+
+C_FILES = $(shell find src/ -type f -name '*.c')
+CO_FILES = $(patsubst src/%.c, obj/%.o, $(C_FILES))
+ASM_FILES = $(shell find src/kernel/ -type f -name '*.asm')
+AO_FILES = $(patsubst src/kernel/%.asm, obj/kernel/%.o, $(ASM_FILES))
+ABIN_FILES = $(patsubst src/%.asm, bin/%.bin, $(ASM_FILES))
+
+os-image.bin: bin/boot.bin bin/kernel.bin
+	cat $^ > $@
+
+bin/boot.bin: src/boot/boot.asm bin/kernel.bin .FORCE
+	sed -i.orig "s@CH_REPLACE_BOOTSECTORCOUNT@$(shell ./getinblocks.py $(shell du -b "bin/kernel.bin" | cut -f 1))@g" src/boot/kernel.asm
+	nasm -Isrc/boot/ $< -f bin -o $@
+	mv src/boot/kernel.asm.orig src/boot/kernel.asm
+
+.FORCE:
+
+bin/kernel.bin: obj/kernel/entry.o ${CO_FILES} ${AO_FILES}
+	i386-elf-ld -o $@ -Ttext 0x1000 $^ --oformat binary
+
+kernel.elf: obj/kernel/entry.o ${CO_FILES} ${AO_FILES}
+	i386-elf-ld -o $@ -Ttext 0x1000 $^
+
+run: clean os-image.bin
+	qemu-system-x86_64 -hdd os-image.bin -d int
+
+debug: clean os-image.bin kernel.elf
+	qemu-system-x86_64 -s -S -hdd os-image.bin &
+	${GDB} os-image.bin -ex "symbol-file kernel.elf" -ex "target remote localhost:1234"
+
+
+
+obj/%.o: src/%.c
+	mkdir -p "$(@D)"
+	i386-elf-gcc -g -ffreestanding -c $< -o $@
+
+obj/%.o: src/%.asm
+	mkdir -p "$(@D)"
+	nasm -f elf $< -o $@
+
+bin/%.bin: src/%.asm
+	mkdir -p "$(@D)"
+	nasm -f bin $< -o $@
+
+clean:
+	find obj -type f -name '*.o' -exec rm {} +
+	find obj -type f -name '*.bin' -exec rm {} +
+	find bin -type f -name '*.o' -exec rm {} +
+	find bin -type f -name '*.bin' -exec rm {} +
+	find . -type f -name '*.dis' -exec rm {} +
+	rm -f kernel.elf
\ No newline at end of file
diff --git a/getinblocks.py b/old/getinblocks.py
similarity index 100%
rename from getinblocks.py
rename to old/getinblocks.py
diff --git a/old/os-image.bin b/old/os-image.bin
new file mode 100644
index 0000000000000000000000000000000000000000..4683e53cb0185939e44ba4d0c2e1f5761f0fd48b
GIT binary patch
literal 4609
zcmb7|4Qx}_700iggcxw+$9MQDuWYSAD<R7^tqinf(6_-#R*zy)wPT8jpRt2KviEF8
zri4cGD*0oH(r%hoHi<H%b*j{sX)H~N=<<P*K^0-Co5rMRO;uW5unDHPB7mE>|Gm#I
z33*SGW;pS?_x$d;_ndp){cv*SbDif&Zz@0Vd?#H@=o&&Fw$VJvO*f~jcaYe^vo+&F
zV#Joa<sE50TXSa7xNzp7aRG&Q2ua+njIB#$6BDk=`W@Sj+bgRFj&y8(FIhcwsWLHS
z%Y885@1T8}cclJUJwBv)-&uRI@F)9UNFNzrrc^)oL?I4S11CCYuSQR5$xrBO+Q91_
z^k-Ub`pKYrL{wz2Pm~oUs*pXAmZ+l0Eio|?4<C{hG3pmp6r+mDF=Bi)4NoU76aM}3
zWwMIA*Fi}0InuS5q$|$4;MHP($_}Rz!}i<_@5nuuZRJNDE^*MG_?ykOaq#-;P6zS#
z3#8{tPqt^UXQGFmCuAW><>^Y89=Oy=Kb)q8=>a12EleYT^igeO;H6GN=&v<Rqknu^
z!}v)kbm$wR8uKbK+4s2ErpRqxB^Wu3r)Ui0mVIJ4>XXG_Bp3^NL&2YVW5H-dZxxDq
zebCP%)p$#btg8NaDAfMA*cuPFF>|q~h@Ki|8?wqHvJ#O)unlck4o8)C(Hj%%kA0a<
z!|ccNI=xs$Fxj5e$BBGxMslR2LZY)k+AHoHbc{(whNAYJMfiT@&fQeDdv|?CDt5bV
zDNivqoROTiZ1Pf4$TT_n5BvT8JJ(X#p(*>&-3_Tro3km&kw7S4IL}Qko8NGhY{__v
z+{P%9Deu(cPPza+B`yfP7f19ll?TDK4!T#@?#3{4U+0Y-wrrZX-W^Oy`HZK4vD&hk
zreen9uw6=%q<yB&lTQkoRMeWl6t_!-j-g(o4`ECy!7j;FXi_QTDRCod^7Fy?&5Tqk
z4@6*|#1<qvog`k}&+*52yh^<pkF$HHEhRZo?%r)nH968tlL9wzb&dfo?$F{T`X*8&
zaRHBTw?tpnOU6)Y$D{(w(@|+se3giVB&D0>2;{!d??$(-w=hWve9@M*4YG%VZP=fY
zCXvx_k0aZpV#oWZmZNndkA56(T5Y!sYHkS+Yms*GQLy;*uSOrtz{i;t0xTG2_POb>
zZN8B_8|qjU>xq4M+itgZiZ$Fed|coUji*`h+A9Fy32czu51E(j;X8&)JeLZFOL<$?
zpCSH~be*S+R;IGd*|OJp?)7!<b)oEaq2tV44^Hsv-Eh%OPfoL-3nrf?F$&a|=Xet)
zFezPS0f%E<omUsdtEmgI$pv^E&anyDmOWlY@4;SLx|)<eEzi<zuHz27-pX>?7;2FZ
z^-~O$S2vz!@iL9X_rOSy2l~6m-VdJQN$GZ1=WP;O;d)oP&3)Q4GikXiM*cXE_;{g`
zo>EepN=s8i6P3x~v{bTXf6ubXz-o=SJ6Q(7eo87LS6XWVf3LtQ7SYoM!5^A(xcUa6
zatHpwH2ZZ8V_iDCbB28Y{L;LP^N&fNJui+*caQ|Po_<OssF*y6iUMgRtuFda{XKwV
z-O^`ndPkox)(>g5Q&D%7Yj3&fzvgOP)ILW$>81mQ7B85CzM+?N&wCH*tBM1b0?iM@
zp&kQf9aYe`jiNIUV(O?-W@;DxjZt(46sC61mgB74Xp|XVLxV=q8R%x}M~t#=?R$EW
zzEMJQVnDxS%;%r;Ow~QFp^q6&oPm=}{hzsN7p*RvXoU&5*uD3Qm5Hkb?Z+i7o<B(B
zmzPtSR`D)aw}jq%(8L9!=nR}?J?t%;e4l+|R99H#;aSMJ0p$a;<z`m?u3o0g*cyRG
ze`S?+-O{+dH`7$Q*zGOp!C#Jy!@Hf&Ncq%oJ}I$*^R*tCi~My$S4w8}{KaZKX{aA)
z=f44L8Vld_Ok<w;{*<Q#%~S^e@pRK@%x8Rpjp}zS6c>b3^_vK3Jk9>{$HY|Sar?cZ
z!PoK^Nl0Sbkf^Iq$`4IcR5b#|;P8Sm+bKI1cmG(U-GME#l=jf1y9%lyDsb)21*jcu
zteko2gnrik^iFKR{;{e?d}-CAl16f0g?%lv{Kf2gEbn*>^k6N(f~)epcCxCmO0H$A
zXIj!45wxyOZNt$~mu)>Wbl({E%vQDvW8iN#LXVj0n<3lYq|$at==gAE^FvgfNj4eS
z`b)Vb(DTh5{;&<R3EQ4P;@4(yfrC?t&MD)Jz_(7+&O0NN&HO)S1enAb;lYOdjKCsp
z%i@dxH~qbH|MjwrZubA;io1MX<EJ&c5SjNZPH(*A#cq55GC-RdoIu{1LAx1z+Y+oW
zgFTjDr5Thh!74Mj!xCIz2A5fa)n@QIUV-^uJIvUK1x8vIn!ytm;36}oT40OK*j@|F
zX~rJ4z#cMV)A!B3)|jz>T3}f5&ET7spkM}Hv;dcwu^(Arq;;to{F)`W%nUj$!R2P~
zqkHDikk%Du@SG*M(hR<239d4O0ZXvf41UWJTx|wdT7qlL;ElUhUavKS7c9YbX7IO`
z;CeHtSbz_kv8OCB(z?M6ZZv~~wK!`-mf{@09pZy@L;4^eKpblb*$R0U@&e=!ka0*6
zvUV*YPeQ_wUqQ}8K7qK_5%L7Y3rR!%4EZ;t3j0+Z<N%}#@*0GlkkQS|_W?Q75)I4j
zmP(!p;8sf>SwvL!@bojrE%m6ZsJQxyq`t19u7T`}M<VPF%W62e#U~$?L(#Ud9Erg+
zehDbwm~ln+1=Y5Yw_TijH)faBUD397C3rXx6F0SN7Ui$RWN%n(sBdVf6Tck_iCo2g
zH&A8esO+m_P00R0P-S=S!wOja@o13U!#8@>EkSjo=#BWqNK}-M;WDqPVpI`>;kHl^
z#8146;*G@G=QiU;_XlK=UD(A?utkojve@E{h=))Yjl&r3<XhEtb?e?eyQJ^$l9<ae
zHVD+k<S^@?ZblbmI$2bsais<ERAd<)?1{wi>qxvUrq2G3AhWB4F%Nr~WB=ph`Y$rt
BZwmkb

literal 0
HcmV?d00001

diff --git a/src/boot/boot.asm b/old/src/boot/boot.asm
similarity index 100%
rename from src/boot/boot.asm
rename to old/src/boot/boot.asm
diff --git a/src/boot/disk/disk.asm b/old/src/boot/disk/disk.asm
similarity index 100%
rename from src/boot/disk/disk.asm
rename to old/src/boot/disk/disk.asm
diff --git a/src/boot/kernel.asm b/old/src/boot/kernel.asm
similarity index 100%
rename from src/boot/kernel.asm
rename to old/src/boot/kernel.asm
diff --git a/src/boot/output/print.asm b/old/src/boot/output/print.asm
similarity index 100%
rename from src/boot/output/print.asm
rename to old/src/boot/output/print.asm
diff --git a/src/boot/output/print_hex.asm b/old/src/boot/output/print_hex.asm
similarity index 100%
rename from src/boot/output/print_hex.asm
rename to old/src/boot/output/print_hex.asm
diff --git a/src/boot/output/vga-print.asm b/old/src/boot/output/vga-print.asm
similarity index 100%
rename from src/boot/output/vga-print.asm
rename to old/src/boot/output/vga-print.asm
diff --git a/src/boot/protected/gdt.asm b/old/src/boot/protected/gdt.asm
similarity index 72%
rename from src/boot/protected/gdt.asm
rename to old/src/boot/protected/gdt.asm
index 2618221..df7bfe2 100644
--- a/src/boot/protected/gdt.asm
+++ b/old/src/boot/protected/gdt.asm
@@ -1,3 +1,4 @@
+
 gdt_start: ; use labels to compute sizes and jumps
     ; gdt starts with 8 byte null
     dd 0x0
@@ -14,12 +15,12 @@ gdt_code:
 
 ; GDT for data segment
 gdt_data:
-    dw 0xffff
-    dw 0x0
-    db 0x0
-    db 10010010b
-    db 11001111b
-    db 0x0
+    dw 0xffff ; segment length
+    dw 0x0 ; segment base
+    db 0x0 ; segment base
+    db 10010010b ; flags
+    db 11001111b ; flags + segment length
+    db 0x0 ; segment base
 
 gdt_end:
 
diff --git a/src/boot/protected/protected-switch.asm b/old/src/boot/protected/protected-switch.asm
similarity index 100%
rename from src/boot/protected/protected-switch.asm
rename to old/src/boot/protected/protected-switch.asm
diff --git a/src/kernel/entry.asm b/old/src/kernel/entry.asm
similarity index 100%
rename from src/kernel/entry.asm
rename to old/src/kernel/entry.asm
diff --git a/old/src/kernel/kernel.c b/old/src/kernel/kernel.c
new file mode 100644
index 0000000..a3f295a
--- /dev/null
+++ b/old/src/kernel/kernel.c
@@ -0,0 +1,54 @@
+#include "./platform/drivers/ports.h"
+#include "print.h"
+#include "./platform/types.h"
+#include "./platform/interrupts/int.h"
+
+void dummy_test_entrypoint() {}
+
+void kernel_welcome() {
+    print_str("Welcome to ");
+    print_set_color(PRINT_COLOR_CYAN, PRINT_COLOR_BLACK);
+    print_str("Shade");
+	print_set_color(PRINT_COLOR_WHITE, PRINT_COLOR_BLACK);
+    print_str("!\n");
+	
+	print_str("shadeOS kernel version ");
+	
+	print_set_color(PRINT_COLOR_YELLOW, PRINT_COLOR_BLACK);
+	print_str("0.2.2");
+	
+	print_set_color(PRINT_COLOR_WHITE, PRINT_COLOR_BLACK);
+	print_newline();
+	
+	print_str("Running on ");
+	
+	print_set_color(PRINT_COLOR_YELLOW, PRINT_COLOR_BLACK);
+	print_str("shade-development");
+
+    print_set_color(PRINT_COLOR_WHITE, PRINT_COLOR_BLACK);
+	
+	print_newline();
+}
+
+// kMain
+void main() {
+    // Initialize screen buffer
+	struct Char* buffer = (struct Char*) 0xb8000;
+    
+    clear_all(); // Clear screen
+    set_cursor_pos(0, 0); // Set cursor position
+    print_set_color(PRINT_COLOR_WHITE, PRINT_COLOR_BLACK); // Set print color
+
+    // welcome messages
+    kernel_msg_ok("Initialized display successfully\n");
+    kernel_welcome();
+
+    print_str("Copyright (c) e3team 2022. All rights reserved.\n");
+    print_str("This program is provided \"as-is\" and no express or implied warranty is provided.\n");
+    print_str("The full license can be found at /sys/LICENCE on this system or ./LICENCE in the source tree.\n");
+
+    idt_init();
+    kernel_msg_ok("Interrupts initialized");
+
+    __asm__ __volatile__("int $2");
+}
\ No newline at end of file
diff --git a/src/kernel/platform/drivers/ports.c b/old/src/kernel/platform/drivers/ports.c
similarity index 100%
rename from src/kernel/platform/drivers/ports.c
rename to old/src/kernel/platform/drivers/ports.c
diff --git a/old/src/kernel/platform/drivers/ports.h b/old/src/kernel/platform/drivers/ports.h
new file mode 100644
index 0000000..d616f0e
--- /dev/null
+++ b/old/src/kernel/platform/drivers/ports.h
@@ -0,0 +1,4 @@
+unsigned char port_byte_in(unsigned short port);
+void port_byte_out(unsigned short port, unsigned char data);
+unsigned short port_word_in(unsigned short port);
+void port_word_out(unsigned short port, unsigned short data);
\ No newline at end of file
diff --git a/old/src/kernel/platform/gdt.h b/old/src/kernel/platform/gdt.h
new file mode 100644
index 0000000..5545747
--- /dev/null
+++ b/old/src/kernel/platform/gdt.h
@@ -0,0 +1,28 @@
+#ifndef GDT_H
+#define GDT_H
+
+#include <stdint.h>
+
+// the GDT descriptor format makes literally no sense, who came up with this
+typedef struct {
+    uint16_t limit_low16; // Low 16 bits of limit
+    uint16_t base_low16;  // Low 16 bits of base
+    uint8_t  base_mid8;   // Middle 8 bits of base
+    uint8_t  access;      // 7: present, 6-5: priv level, 4: type, 3: executable, 2: dc, 1: rw, 0: accessed (zero)
+    uint8_t  limit_flags; // High 4 bits of limit AND flags (?? why). flags: 3: granularity, 2: size, 1: long, 0: reserved
+    uint8_t  base_high8;  // High 8 bits of base
+} __attribute__((packed)) gdt_entry_t;
+
+typedef struct {
+    uint16_t size;   // GDT size (bytes) - 1
+    uint32_t offset; // Address of element 0 of the GDT
+} __attribute__((packed)) gdt_ptr_t;
+
+static gdt_entry_t gdt[8192];
+static gdt_ptr_t gdtr;
+
+void init_gdt();
+void gdt_set_segment(int limit, int base, int access);
+void load_gdt();
+
+#endif
\ No newline at end of file
diff --git a/src/kernel/platform/interrupts/int.c b/old/src/kernel/platform/interrupts/int.c
similarity index 85%
rename from src/kernel/platform/interrupts/int.c
rename to old/src/kernel/platform/interrupts/int.c
index 3e63985..4b77162 100644
--- a/src/kernel/platform/interrupts/int.c
+++ b/old/src/kernel/platform/interrupts/int.c
@@ -1,8 +1,14 @@
 #include "int.h"
 #include "../../print.h"
 
-void exception_handler() {
+int count = 0;
+
+void exception_handler(registers_t r) {
     print_str("I");
+    count++;
+    if (count > 4) {
+        __asm__ __volatile__("cli; hlt");
+    }  
 }
 
 void idt_set_descriptor(u8 vector, void* isr, u8 flags) {
diff --git a/src/kernel/platform/interrupts/int.h b/old/src/kernel/platform/interrupts/int.h
similarity index 69%
rename from src/kernel/platform/interrupts/int.h
rename to old/src/kernel/platform/interrupts/int.h
index a58b890..3f36fc9 100644
--- a/src/kernel/platform/interrupts/int.h
+++ b/old/src/kernel/platform/interrupts/int.h
@@ -21,8 +21,15 @@ typedef struct {
 
 static idtr_t idtr;
 
+typedef struct {
+   u32 ds; /* Data segment selector */
+   u32 edi, esi, ebp, esp, ebx, edx, ecx, eax; /* Pushed by pusha. */
+   u32 int_no, err_code; /* Interrupt number and error code (if applicable) */
+   u32 eip, cs, eflags, useresp, ss; /* Pushed by the processor automatically */
+} registers_t;
+
 __attribute__((noreturn))
-void exception_handler(void);
+void exception_handler(registers_t r);
 
 void idt_set_descriptor(u8 vector, void* isr, u8 flags);
 
diff --git a/old/src/kernel/platform/interrupts/int_lowlevel.asm b/old/src/kernel/platform/interrupts/int_lowlevel.asm
new file mode 100644
index 0000000..0d2f397
--- /dev/null
+++ b/old/src/kernel/platform/interrupts/int_lowlevel.asm
@@ -0,0 +1,102 @@
+%macro isr_err_stub 1
+isr_stub_%+%1:
+    push byte %1 ; Push interrupt no to stack
+
+    ; 1. Save CPU state
+	pusha ; Pushes edi,esi,ebp,esp,ebx,edx,ecx,eax
+	mov ax, ds ; Lower 16-bits of eax = ds.
+	push eax ; save the data segment descriptor
+	mov ax, 0x10  ; kernel data segment descriptor
+	mov ds, ax
+	mov es, ax
+	mov fs, ax
+	mov gs, ax
+	
+    ; 2. Call C handler
+	call exception_handler
+	
+    ; 3. Restore state
+	pop eax 
+	mov ds, ax
+	mov es, ax
+	mov fs, ax
+	mov gs, ax
+	popa
+	add esp, 8 ; Cleans up the pushed error code and pushed ISR number
+	sti
+	iret ; pops 5 things at once: CS, EIP, EFLAGS, SS, and ESP
+%endmacro
+; if writing for 64-bit, use iretq instead
+%macro isr_no_err_stub 1
+isr_stub_%+%1:
+    push byte 0  ; No error occured
+    push byte %1 ; Push interrupt no to stack
+    
+    ; 1. Save CPU state
+	pusha ; Pushes edi,esi,ebp,esp,ebx,edx,ecx,eax
+	mov ax, ds ; Lower 16-bits of eax = ds.
+	push eax ; save the data segment descriptor
+	mov ax, 0x10  ; kernel data segment descriptor
+	mov ds, ax
+	mov es, ax
+	mov fs, ax
+	mov gs, ax
+	
+    ; 2. Call C handler
+	call exception_handler
+	
+    ; 3. Restore state
+	pop eax 
+	mov ds, ax
+	mov es, ax
+	mov fs, ax
+	mov gs, ax
+	popa
+	add esp, 8 ; Cleans up the pushed error code and pushed ISR number
+	sti
+	iret ; pops 5 things at once: CS, EIP, EFLAGS, SS, and ESP
+%endmacro
+
+extern exception_handler
+
+isr_no_err_stub 0
+isr_no_err_stub 1
+isr_no_err_stub 2
+isr_no_err_stub 3
+isr_no_err_stub 4
+isr_no_err_stub 5
+isr_no_err_stub 6
+isr_no_err_stub 7
+isr_err_stub    8
+isr_no_err_stub 9
+isr_err_stub    10
+isr_err_stub    11
+isr_err_stub    12
+isr_err_stub    13
+isr_err_stub    14
+isr_no_err_stub 15
+isr_no_err_stub 16
+isr_err_stub    17
+isr_no_err_stub 18
+isr_no_err_stub 19
+isr_no_err_stub 20
+isr_no_err_stub 21
+isr_no_err_stub 22
+isr_no_err_stub 23
+isr_no_err_stub 24
+isr_no_err_stub 25
+isr_no_err_stub 26
+isr_no_err_stub 27
+isr_no_err_stub 28
+isr_no_err_stub 29
+isr_err_stub    30
+isr_no_err_stub 31
+
+global isr_stub_table
+isr_stub_table:
+%assign i 0 
+%rep    32 
+    dd isr_stub_%+i ; use DQ instead if targeting 64-bit
+%assign i i+1 
+%endrep
+
diff --git a/src/kernel/platform/types.h b/old/src/kernel/platform/types.h
similarity index 100%
rename from src/kernel/platform/types.h
rename to old/src/kernel/platform/types.h
diff --git a/old/src/kernel/print.c b/old/src/kernel/print.c
new file mode 100644
index 0000000..014de03
--- /dev/null
+++ b/old/src/kernel/print.c
@@ -0,0 +1,110 @@
+#include "print.h"
+#include "./platform/drivers/ports.h"
+
+int row = 0;
+int col = 0;
+char color = PRINT_COLOR_WHITE | PRINT_COLOR_BLACK << 4;
+
+void clear_row(int row) {
+    struct Char* buffer = (struct Char*) 0xb8000;
+
+    struct Char empty = (struct Char) {
+        character: ' ',
+        color: color,
+    };
+
+    for (int x = 0; x < NUM_COLS; x++) {
+        buffer[x + NUM_COLS * row] = empty;
+    }
+    set_cursor_pos(col, row);
+}
+
+void clear_all() {
+    for (int i = 0; i < NUM_ROWS; i++) {
+        clear_row(i);
+    }
+    set_cursor_pos(col, row);
+}
+
+void print_newline() {
+    struct Char* buffer = (struct Char*) 0xb8000;
+
+    col = 0;
+
+    if (row < NUM_ROWS - 1) {
+        row++;
+        return;
+    }
+
+    for (int row = 1; row < NUM_ROWS; row++) {
+        for (int col = 0; col < NUM_COLS; col++) {
+            struct Char character = buffer[col + NUM_COLS * row];
+            buffer[col + NUM_COLS * (row - 1)] = character;
+        }
+    }
+
+    clear_row(NUM_COLS - 1);
+    set_cursor_pos(col, row);
+}
+
+void print_char(char character) {
+    struct Char* buffer = (struct Char*) 0xb8000;
+
+    if (character == '\n') {
+        print_newline();
+        return;
+    }
+
+    if (col > NUM_COLS) {
+        print_newline();
+    }
+
+    struct Char cr = (struct Char) {
+        character: character,
+        color: color,
+    };
+    buffer[col + NUM_COLS * row] = cr;
+
+    col++;
+    set_cursor_pos(col, row);
+}
+
+void print_str(char* str) {
+    for (int i = 0; 1; i++) {
+        char character = (char) str[i];
+
+        if (character == '\0') {
+            return;
+        }
+
+        print_char(character);
+    }
+}
+
+void print_set_color(char foreground, char background) {
+    color = foreground + (background << 4);
+}
+
+void set_cursor_pos(int col, int row) {
+   int offset = col + NUM_COLS * row;
+   port_byte_out(REG_SCREEN_CTRL, 14);
+   port_byte_out(REG_SCREEN_DATA, (unsigned char)(offset >> 8));
+   port_byte_out(REG_SCREEN_CTRL, 15);
+   port_byte_out(REG_SCREEN_DATA, (unsigned char)(offset & 0xff)); 
+}
+
+void kernel_msg_ok(char* msg) {
+	char ok_p1[] = "[ ";
+	char ok_p2[] = "OK ";
+	char ok_p3[] = "] ";
+	
+	print_set_color(PRINT_COLOR_WHITE, PRINT_COLOR_BLACK);
+	print_str(ok_p1);
+	
+	print_set_color(PRINT_COLOR_GREEN, PRINT_COLOR_BLACK);
+	print_str(ok_p2);
+	
+	print_set_color(PRINT_COLOR_WHITE, PRINT_COLOR_BLACK);
+	print_str(ok_p3);
+	print_str(msg);
+}
\ No newline at end of file
diff --git a/old/src/kernel/print.h b/old/src/kernel/print.h
new file mode 100644
index 0000000..edd8a9e
--- /dev/null
+++ b/old/src/kernel/print.h
@@ -0,0 +1,44 @@
+#ifndef PRINT_H
+#define PRINT_H
+#define REG_SCREEN_CTRL 0x3d4
+#define REG_SCREEN_DATA 0x3d5
+
+enum {
+    PRINT_COLOR_BLACK = 0,
+	PRINT_COLOR_BLUE = 1,
+	PRINT_COLOR_GREEN = 2,
+	PRINT_COLOR_CYAN = 3,
+	PRINT_COLOR_RED = 4,
+	PRINT_COLOR_MAGENTA = 5,
+	PRINT_COLOR_BROWN = 6,
+	PRINT_COLOR_LIGHT_GRAY = 7,
+	PRINT_COLOR_DARK_GRAY = 8,
+	PRINT_COLOR_LIGHT_BLUE = 9,
+	PRINT_COLOR_LIGHT_GREEN = 10,
+	PRINT_COLOR_LIGHT_CYAN = 11,
+	PRINT_COLOR_LIGHT_RED = 12,
+	PRINT_COLOR_PINK = 13,
+	PRINT_COLOR_YELLOW = 14,
+	PRINT_COLOR_WHITE = 15,
+};
+
+const static int NUM_COLS = 80;
+const static int NUM_ROWS = 25;
+
+struct Char {
+    char character;
+    char color;
+};
+
+void clear_row(int row);
+void clear_all();
+
+void print_newline();
+void print_char(char character);
+void print_set_color(char foreground, char background);
+void print_str(char* str);
+
+void set_cursor_pos(int col, int row);
+
+void kernel_msg_ok(char* msg);
+#endif
\ No newline at end of file
diff --git a/src/kernel/strings.c b/old/src/kernel/strings.c
similarity index 100%
rename from src/kernel/strings.c
rename to old/src/kernel/strings.c
diff --git a/old/src/kernel/strings.h b/old/src/kernel/strings.h
new file mode 100644
index 0000000..ee4402a
--- /dev/null
+++ b/old/src/kernel/strings.h
@@ -0,0 +1,10 @@
+#ifndef STRINGS_H
+#define STRINGS_H
+
+void itoa(int n, char str[]);
+void strrev(char s[]);
+int strlen(char s[]);
+char* strcpy(char* strDest, const char* strSrc);
+char* strcnc(char* str1, char* str2);
+
+#endif
\ No newline at end of file
diff --git a/old/src/kernel/util.c b/old/src/kernel/util.c
new file mode 100644
index 0000000..e945d94
--- /dev/null
+++ b/old/src/kernel/util.c
@@ -0,0 +1,25 @@
+#include "util.h"
+
+void memcpy(char *source, char *dest, int nbytes) {
+    int i;
+    for (i = 0; i < nbytes; i++) {
+        *(dest + i) = *(source + i);
+    }
+}
+
+void memset(char *dest, char val, int len) {
+    char *temp = (char *)dest;
+    for(; len !=0; len--) *temp++ = val;
+}
+
+void int_to_ascii(int n, char str[]) {
+    int i, sign;
+    if ((sign = n) < 0) n = -n;
+    i = 0;
+    do {
+        str[i++] = n % 10 + '0';
+    } while ((n /= 10) > 0);
+
+    if (sign < 0) str[i++] = '-';
+    str[i] = '\0';
+}
\ No newline at end of file
diff --git a/old/src/kernel/util.h b/old/src/kernel/util.h
new file mode 100644
index 0000000..889ccb0
--- /dev/null
+++ b/old/src/kernel/util.h
@@ -0,0 +1,8 @@
+#ifndef UTIL_H
+#define UTIL_H
+
+void memcpy(char *source, char *dest, int nbytes);
+void memset(char *dest, char val, int len);
+void int_to_ascii(int n, char str[]);
+
+#endif
\ No newline at end of file
diff --git a/os-image.bin b/os-image.bin
deleted file mode 100644
index 5d875f0b0ef0cca3d365542c89a4964b0875f422..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7539
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
WC?QZnpoBmPff52G1pdzvaQp}K@)_3v

diff --git a/src/boot/entry.asm b/src/boot/entry.asm
new file mode 100644
index 0000000..fe7a356
--- /dev/null
+++ b/src/boot/entry.asm
@@ -0,0 +1,141 @@
+
+  
+global entry_x86
+extern entry_x64
+
+section .text
+bits 32
+entry_x86:
+    mov esp, stack_top
+    
+    call check_mb2_boot
+    call check_cpuid
+    call check_x64_supported
+    
+    call setup_page_tables
+    call enable_paging
+    
+    lgdt [gdt64.pointer]
+    jmp gdt64.code_segment:entry_x64 ; Jump into 64 bit entry
+    
+    hlt
+
+check_mb2_boot:
+    cmp eax, 0x36d76289 ; compare eax to mb2 magic number
+    jne .mb2_not_booted
+    ret
+.mb2_not_booted:
+    mov al, "B" ; err code B - boot error
+    jmp error
+
+check_cpuid:
+    pushfd ; Put flags on stack so we can mess with them
+    pop eax ; then put the stack into EAX so we can easily modify it
+    mov ecx, eax ; Make a copy of eax in ecx for comparison
+    xor eax, 1 << 21 ; Attempt to flip the CPUID bit which is bit 21
+    push eax ; Put eax back onto stack
+    popfd ; Write flags back
+    pushfd ; Copy flags onto stack so we can check if the bit did flip
+    pop eax ; Put stack into EAX for comparison
+    push ecx ; Put original flags into stack so we can make sure they remain unchanged
+    popfd; Push original flags back onto the flags register
+    cmp eax, ecx ; Compare the modifided? flags to the original flags
+    je .cpuid_unsupported ; Flags were not changed, cpuid not supported
+    ret
+    
+.cpuid_unsupported:
+    mov al, "C" ; err code C - cpuid unsupported
+    jmp error
+    
+check_x64_supported:
+    mov eax, 0x80000000 ; Magic code that i dont understand
+	cpuid ; Magic code that i dont understand
+	cmp eax, 0x80000001 ; Magic code that i dont undetstand
+	jb .x64_unsupported ; Something went wrong so x64 isnt supported
+
+	mov eax, 0x80000001 ; Set magic value 0x80000001 into EAX for cpuid
+	cpuid ; Get "extended features list" from CPU info
+	test edx, 1 << 29 ; Check if x64 is supported by checking bit 29
+	jz .x64_unsupported ; If zero, x64 unsupported so jump to no x64
+    
+    ret
+.x64_unsupported:
+    mov al, "L" ; err code L, long mode/x64 unsupported
+    jmp error
+
+; Magic paging code that I don't understand
+setup_page_tables:
+	mov eax, page_table_l3
+	or eax, 0b11 ; present, writable
+	mov [page_table_l4], eax
+	
+	mov eax, page_table_l2
+	or eax, 0b11 ; present, writable
+	mov [page_table_l3], eax
+
+	mov ecx, 0 ; counter
+.loop:
+
+	mov eax, 0x200000 ; 2MiB
+	mul ecx
+	or eax, 0b10000011 ; present, writable, huge page
+	mov [page_table_l2 + ecx * 8], eax
+
+	inc ecx ; increment counter
+	cmp ecx, 512 ; checks if the whole table is mapped
+	jne .loop ; if not, continue
+
+	ret
+
+enable_paging:
+	; pass page table location to cpu
+	mov eax, page_table_l4
+	mov cr3, eax
+
+	; enable PAE
+	mov eax, cr4
+	or eax, 1 << 5
+	mov cr4, eax
+
+	; enable long mode
+	mov ecx, 0xC0000080
+	rdmsr
+	or eax, 1 << 8
+	wrmsr
+
+	; enable paging
+	mov eax, cr0
+	or eax, 1 << 31
+	mov cr0, eax
+
+	ret
+
+error:
+	; print "ERR: X" where X is the error code
+	mov dword [0xb8000], 0x4f524f45
+	mov dword [0xb8004], 0x4f3a4f52
+	mov dword [0xb8008], 0x4f204f20
+	mov byte  [0xb800a], al
+	hlt
+
+section .bss
+align 4096
+page_table_l4:
+	resb 4096
+page_table_l3:
+	resb 4096
+page_table_l2:
+	resb 4096
+stack_bottom:
+	resb 4096 * 4
+stack_top:
+
+section .rodata
+gdt64:
+	dd 0 ; zero entry
+	dd 0
+.code_segment: equ $ - gdt64
+	dq (1 << 43) | (1 << 44) | (1 << 47) | (1 << 53) ; code segment
+.pointer:
+	dw $ - gdt64 - 1 ; length
+	dq gdt64 ; address
\ No newline at end of file
diff --git a/src/boot/entry64.asm b/src/boot/entry64.asm
new file mode 100644
index 0000000..2d10b51
--- /dev/null
+++ b/src/boot/entry64.asm
@@ -0,0 +1,17 @@
+global entry_x64
+extern kmain
+
+section .text
+bits 64
+entry_x64:
+    ; Nullify all data registers
+    mov ax, 0
+    mov ss, ax
+    mov ds, ax
+    mov es, ax
+    mov fs, ax
+    mov gs, ax
+    
+    call kmain ; Jump into C kernel entry
+    
+    hlt
\ No newline at end of file
diff --git a/src/boot/mb2_header.asm b/src/boot/mb2_header.asm
new file mode 100644
index 0000000..5eabae1
--- /dev/null
+++ b/src/boot/mb2_header.asm
@@ -0,0 +1,16 @@
+section .mb2_header
+header_start:
+    ; https://www.gnu.org/software/grub/manual/multiboot2/multiboot.html for more information, section 3.1.1
+    dd 0xe85250d6 ; multiboot2 magic number
+    
+    dd 0 ; i386 protected 32 bit mode
+    
+    dd header_end - header_start ; Header length
+    
+    dd 0x100000000 - (0xe85250d6 + 0 + (header_end - header_start)) ; Checksum, total is 0
+    
+    ; Ending tag
+	  dw 0
+	  dw 0
+	  dd 8
+header_end:
\ No newline at end of file
diff --git a/src/iso/boot/grub/grub.cfg b/src/iso/boot/grub/grub.cfg
new file mode 100644
index 0000000..9c6aeb4
--- /dev/null
+++ b/src/iso/boot/grub/grub.cfg
@@ -0,0 +1,7 @@
+set timeout=5
+set default=0
+
+menuentry "shadeOS Development Build" {
+    multiboot2 /boot/shade.bin
+    boot
+}
\ No newline at end of file
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index a3f295a..84b5789 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -1,9 +1,5 @@
-#include "./platform/drivers/ports.h"
-#include "print.h"
-#include "./platform/types.h"
-#include "./platform/interrupts/int.h"
-
-void dummy_test_entrypoint() {}
+#include <shade/platform/ports.h>
+#include <shade/print.h>
 
 void kernel_welcome() {
     print_str("Welcome to ");
@@ -31,7 +27,7 @@ void kernel_welcome() {
 }
 
 // kMain
-void main() {
+void kmain() {
     // Initialize screen buffer
 	struct Char* buffer = (struct Char*) 0xb8000;
     
@@ -47,8 +43,4 @@ void main() {
     print_str("This program is provided \"as-is\" and no express or implied warranty is provided.\n");
     print_str("The full license can be found at /sys/LICENCE on this system or ./LICENCE in the source tree.\n");
 
-    idt_init();
-    kernel_msg_ok("Interrupts initialized");
-
-    __asm__ __volatile__("int $2");
 }
\ No newline at end of file
diff --git a/src/kernel/platform/interrupts/int_lowlevel.asm b/src/kernel/platform/interrupts/int_lowlevel.asm
deleted file mode 100644
index a38fd41..0000000
--- a/src/kernel/platform/interrupts/int_lowlevel.asm
+++ /dev/null
@@ -1,54 +0,0 @@
-%macro isr_err_stub 1
-isr_stub_%+%1:
-    call exception_handler
-    iret 
-%endmacro
-; if writing for 64-bit, use iretq instead
-%macro isr_no_err_stub 1
-isr_stub_%+%1:
-    call exception_handler
-    iret
-%endmacro
-
-extern exception_handler
-isr_no_err_stub 0
-isr_no_err_stub 1
-isr_no_err_stub 2
-isr_no_err_stub 3
-isr_no_err_stub 4
-isr_no_err_stub 5
-isr_no_err_stub 6
-isr_no_err_stub 7
-isr_err_stub    8
-isr_no_err_stub 9
-isr_err_stub    10
-isr_err_stub    11
-isr_err_stub    12
-isr_err_stub    13
-isr_err_stub    14
-isr_no_err_stub 15
-isr_no_err_stub 16
-isr_err_stub    17
-isr_no_err_stub 18
-isr_no_err_stub 19
-isr_no_err_stub 20
-isr_no_err_stub 21
-isr_no_err_stub 22
-isr_no_err_stub 23
-isr_no_err_stub 24
-isr_no_err_stub 25
-isr_no_err_stub 26
-isr_no_err_stub 27
-isr_no_err_stub 28
-isr_no_err_stub 29
-isr_err_stub    30
-isr_no_err_stub 31
-
-global isr_stub_table
-isr_stub_table:
-%assign i 0 
-%rep    32 
-    dd isr_stub_%+i ; use DQ instead if targeting 64-bit
-%assign i i+1 
-%endrep
-
diff --git a/src/kernel/platform/ports.c b/src/kernel/platform/ports.c
new file mode 100644
index 0000000..34a48db
--- /dev/null
+++ b/src/kernel/platform/ports.c
@@ -0,0 +1,26 @@
+/*
+ * Read 1 byte from specified port
+ */
+unsigned char port_byte_in(unsigned short port) {
+    unsigned char result;
+    // source and dest are backwards.
+    // "=a (result)" set the C variable to the value of register e'a'x
+    // '"d" (port) map the C variable port into e'd'x register
+    __asm__("in %%dx, %%al" : "=a" (result) : "d" (port));
+}
+
+void port_byte_out(unsigned short port, unsigned char data) {
+    // both regs are C vars, nothing is returned, so no '=' in asm syntax
+    // comma because two vars in input area and none in return area
+    __asm__("out %%al, %%dx" : : "a" (data), "d" (port));
+}
+
+unsigned short port_word_in(unsigned short port) {
+    unsigned short result;
+    __asm__("in %%dx, %%ax" : "=a" (result) : "d" (port));
+    return result;
+}
+
+void port_word_out(unsigned short port, unsigned short data) {
+    __asm__("out %%ax, %%dx" : : "a" (data), "d" (port));
+}
\ No newline at end of file
diff --git a/src/kernel/print.c b/src/kernel/print.c
index 014de03..0ee30b7 100644
--- a/src/kernel/print.c
+++ b/src/kernel/print.c
@@ -1,5 +1,5 @@
-#include "print.h"
-#include "./platform/drivers/ports.h"
+#include <shade/print.h>
+#include <shade/platform/ports.h>
 
 int row = 0;
 int col = 0;
diff --git a/src/kernel/util.c b/src/kernel/util.c
index e945d94..5063a05 100644
--- a/src/kernel/util.c
+++ b/src/kernel/util.c
@@ -1,4 +1,4 @@
-#include "util.h"
+#include <shade/util.h>
 
 void memcpy(char *source, char *dest, int nbytes) {
     int i;
diff --git a/src/libc/strings.c b/src/libc/strings.c
new file mode 100644
index 0000000..d148672
--- /dev/null
+++ b/src/libc/strings.c
@@ -0,0 +1,48 @@
+#include <strings.h>
+#include <stddef.h>
+
+void itoa(int n, char str[]) {
+    int i, sign;
+    if ((sign = n) < 0) n = -n;
+    i = 0;
+    do {
+        str[i++] = n % 10 + '0';
+    } while ((n /= 10) > 0);
+
+    if (sign < 0) str[i++] = '-';
+    str[i] = '\0';
+
+    strrev(str);
+}
+
+/* K&R */
+void strrev(char s[]) {
+    int c, i, j;
+    for (i = 0, j = strlen(s)-1; i < j; i++, j--) {
+        c = s[i];
+        s[i] = s[j];
+        s[j] = c;
+    }
+}
+
+/* K&R */
+int strlen(char s[]) {
+    int i = 0;
+    while (s[i] != '\0') ++i;
+    return i;
+}
+
+char* strcpy(char* strDest, const char* strSrc) {
+    if ( (strDest == NULL) || (strSrc == NULL) ) {
+        return NULL;
+    }
+    char* strDestCopy = strDest;
+    while ((*strDest++=*strSrc++)!='\0');
+    return strDestCopy;
+}
+
+char* strcnc(char* str1, char* str2) {
+    char* str_dest;
+    strcpy(str_dest, str1);
+    strcpy(str_dest, str2);
+}
\ No newline at end of file
diff --git a/src/linker.ld b/src/linker.ld
new file mode 100644
index 0000000..289a33b
--- /dev/null
+++ b/src/linker.ld
@@ -0,0 +1,30 @@
+ENTRY(entry_x86)
+
+SECTIONS {
+    . = 1M;
+
+    .text BLOCK(4K) : ALIGN(4K)
+    {
+        *(.mb2_header)
+        *(.text)
+    }
+
+    /* Read-only data. */
+	.rodata BLOCK(4K) : ALIGN(4K)
+	{
+		*(.rodata)
+	}
+ 
+	/* Read-write data (initialized) */
+	.data BLOCK(4K) : ALIGN(4K)
+	{
+		*(.data)
+	}
+ 
+	/* Read-write data (uninitialized) and stack */
+	.bss BLOCK(4K) : ALIGN(4K)
+	{
+		*(COMMON)
+		*(.bss)
+	}
+}
\ No newline at end of file