Bit o a refactah

6 files changed, 372 insertions, 146 deletions

diff --git a/Makefile b/Makefile
index 7c41b4d..e44eb1b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,37 +1,55 @@
-.DEFAULT_GOAL := macaroni.iso
+CC      := i686-elf-gcc
+AS      := nasm
+QEMU    := qemu-system-x86_64
+LIMINE  ?= /opt/homebrew/share/limine
 
-LIMINE_SHARE = /opt/homebrew/share/limine/
+CFLAGS  := -std=c11 -ffreestanding -O0 -g -Wall -Wextra -Iinclude -MMD -MP
+ASFLAGS := -felf32
+LDFLAGS := -T linker.ld -ffreestanding -O0 -nostdlib
+LDLIBS  := -lgcc
 
-BUILD_OUT = build
-ASM       = nasm
-ASM_FLAGS = -felf32
-CFLAG     = -std=c11 -ffreestanding -O0 -Wall -Wextra
-CC        = i686-elf-gcc 
-BINFLAG   = -T linker.ld -ffreestanding -O0 -nostdlib
+BUILD := build
+OBJ   := $(BUILD)/obj
+ISO   := $(BUILD)/iso
+BIN   := $(BUILD)/macaroni.bin
+IMAGE := $(BUILD)/macaroni.iso
 
-boot.o: src/boot.asm
-	${ASM} ${ASM_FLAGS} src/boot.asm -o ${BUILD_OUT}/boot.o
+SRCS := $(shell find src -name '*.c' -o -name '*.asm')
+OBJS := $(SRCS:src/%=$(OBJ)/%.o)
 
-kernel.o: src/kernel.c
-	${CC} -c src/kernel.c -o ${BUILD_OUT}/kernel.o ${CFLAG}
+LIMINE_FILES := limine-bios-cd.bin limine-bios.sys limine-uefi-cd.bin
 
-macaroni.bin: boot.o kernel.o
-	${CC} -o ${BUILD_OUT}/macaroni.bin ${BINFLAG} ${BUILD_OUT}/*.o
+.PHONY: all bin demo clean
+all: $(IMAGE)
+bin: $(BIN)
 
-macaroni.iso: macaroni.bin
-	mkdir -p ${BUILD_OUT}/iso
-	cp ${BUILD_OUT}/macaroni.bin ${BUILD_OUT}/iso/macaroni.bin
-	printf "timeout: 0\n/macaroni\n    protocol: multiboot1\n    kernel_path: boot():/macaroni.bin\n" > ${BUILD_OUT}/iso/limine.conf
-	cp ${LIMINE_SHARE}/limine-bios-cd.bin ${LIMINE_SHARE}/limine-bios.sys ${LIMINE_SHARE}/limine-uefi-cd.bin ${BUILD_OUT}/iso/
-	xorriso -as mkisofs -R -r -J -b limine-bios-cd.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
-		--efi-boot limine-uefi-cd.bin -efi-boot-part --efi-boot-image --protective-msdos-label \
-		${BUILD_OUT}/iso -o ${BUILD_OUT}/macaroni.iso
-	limine bios-install ${BUILD_OUT}/macaroni.iso
+demo: $(IMAGE)
+	$(QEMU) -cdrom $<
 
-.PHONY: demo
-demo: macaroni.iso
-	qemu-system-x86_64 -cdrom ${BUILD_OUT}/macaroni.iso
-
-.PHONY: clean
 clean:
-	rm -rf ${BUILD_OUT}/**
+	rm -rf $(OBJ) $(ISO) $(BIN) $(IMAGE)
+
+$(OBJ)/%.c.o: src/%.c
+	@mkdir -p $(@D)
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(OBJ)/%.asm.o: src/%.asm
+	@mkdir -p $(@D)
+	$(AS) $(ASFLAGS) $< -o $@
+
+$(BIN): $(OBJS) linker.ld
+	$(CC) $(LDFLAGS) $(OBJS) -o $@ $(LDLIBS)
+
+$(ISO)/limine.conf:
+	@mkdir -p $(@D)
+	printf 'timeout: 0\n/macaroni\n    protocol: multiboot1\n    kernel_path: boot():/macaroni.bin\n' > $@
+
+$(IMAGE): $(BIN) $(ISO)/limine.conf
+	cp $(BIN) $(addprefix $(LIMINE)/,$(LIMINE_FILES)) $(ISO)/
+	xorriso -as mkisofs -R -r -J -b limine-bios-cd.bin -no-emul-boot \
+		-boot-load-size 4 -boot-info-table --efi-boot limine-uefi-cd.bin \
+		-efi-boot-part --efi-boot-image --protective-msdos-label \
+		$(ISO) -o $@
+	limine bios-install $@
+
+-include $(OBJS:.o=.d)
diff --git a/include/multiboot.h b/include/multiboot.h
new file mode 100644
index 0000000..f95f717
--- /dev/null
+++ b/include/multiboot.h
@@ -0,0 +1,274 @@
+/* multiboot.h - Multiboot header file. */
+/* Copyright (C) 1999,2003,2007,2008,2009,2010  Free Software Foundation, Inc.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to
+ *  deal in the Software without restriction, including without limitation the
+ *  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ *  sell copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL ANY
+ *  DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+ *  IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef MULTIBOOT_HEADER
+#define MULTIBOOT_HEADER 1
+
+/* How many bytes from the start of the file we search for the header. */
+#define MULTIBOOT_SEARCH                        8192
+#define MULTIBOOT_HEADER_ALIGN                  4
+
+/* The magic field should contain this. */
+#define MULTIBOOT_HEADER_MAGIC                  0x1BADB002
+
+/* This should be in %eax. */
+#define MULTIBOOT_BOOTLOADER_MAGIC              0x2BADB002
+
+/* Alignment of multiboot modules. */
+#define MULTIBOOT_MOD_ALIGN                     0x00001000
+
+/* Alignment of the multiboot info structure. */
+#define MULTIBOOT_INFO_ALIGN                    0x00000004
+
+/* Flags set in the ’flags’ member of the multiboot header. */
+
+/* Align all boot modules on i386 page (4KB) boundaries. */
+#define MULTIBOOT_PAGE_ALIGN                    0x00000001
+
+/* Must pass memory information to OS. */
+#define MULTIBOOT_MEMORY_INFO                   0x00000002
+
+/* Must pass video information to OS. */
+#define MULTIBOOT_VIDEO_MODE                    0x00000004
+
+/* This flag indicates the use of the address fields in the header. */
+#define MULTIBOOT_AOUT_KLUDGE                   0x00010000
+
+/* Flags to be set in the ’flags’ member of the multiboot info structure. */
+
+/* is there basic lower/upper memory information? */
+#define MULTIBOOT_INFO_MEMORY                   0x00000001
+/* is there a boot device set? */
+#define MULTIBOOT_INFO_BOOTDEV                  0x00000002
+/* is the command-line defined? */
+#define MULTIBOOT_INFO_CMDLINE                  0x00000004
+/* are there modules to do something with? */
+#define MULTIBOOT_INFO_MODS                     0x00000008
+
+/* These next two are mutually exclusive */
+
+/* is there a symbol table loaded? */
+#define MULTIBOOT_INFO_AOUT_SYMS                0x00000010
+/* is there an ELF section header table? */
+#define MULTIBOOT_INFO_ELF_SHDR                 0X00000020
+
+/* is there a full memory map? */
+#define MULTIBOOT_INFO_MEM_MAP                  0x00000040
+
+/* Is there drive info? */
+#define MULTIBOOT_INFO_DRIVE_INFO               0x00000080
+
+/* Is there a config table? */
+#define MULTIBOOT_INFO_CONFIG_TABLE             0x00000100
+
+/* Is there a boot loader name? */
+#define MULTIBOOT_INFO_BOOT_LOADER_NAME         0x00000200
+
+/* Is there a APM table? */
+#define MULTIBOOT_INFO_APM_TABLE                0x00000400
+
+/* Is there video information? */
+#define MULTIBOOT_INFO_VBE_INFO                 0x00000800
+#define MULTIBOOT_INFO_FRAMEBUFFER_INFO         0x00001000
+
+#ifndef ASM_FILE
+
+typedef unsigned char           multiboot_uint8_t;
+typedef unsigned short          multiboot_uint16_t;
+typedef unsigned int            multiboot_uint32_t;
+typedef unsigned long long      multiboot_uint64_t;
+
+struct __attribute__((packed)) multiboot_header
+{
+  /* Must be MULTIBOOT_MAGIC - see above. */
+  multiboot_uint32_t magic;
+
+  /* Feature flags. */
+  multiboot_uint32_t flags;
+
+  /* The above fields plus this one must equal 0 mod 2^32. */
+  multiboot_uint32_t checksum;
+
+  /* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */
+  multiboot_uint32_t header_addr;
+  multiboot_uint32_t load_addr;
+  multiboot_uint32_t load_end_addr;
+  multiboot_uint32_t bss_end_addr;
+  multiboot_uint32_t entry_addr;
+
+  /* These are only valid if MULTIBOOT_VIDEO_MODE is set. */
+  multiboot_uint32_t mode_type;
+  multiboot_uint32_t width;
+  multiboot_uint32_t height;
+  multiboot_uint32_t depth;
+};
+
+/* The symbol table for a.out. */
+struct __attribute__((packed)) multiboot_aout_symbol_table
+{
+  multiboot_uint32_t tabsize;
+  multiboot_uint32_t strsize;
+  multiboot_uint32_t addr;
+  multiboot_uint32_t reserved;
+};
+typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t;
+
+/* The section header table for ELF. */
+struct __attribute__((packed)) multiboot_elf_section_header_table
+{
+  multiboot_uint32_t num;
+  multiboot_uint32_t size;
+  multiboot_uint32_t addr;
+  multiboot_uint32_t shndx;
+};
+typedef struct multiboot_elf_section_header_table multiboot_elf_section_header_table_t;
+
+struct __attribute__((packed)) multiboot_info
+{
+  /* Multiboot info version number */
+  multiboot_uint32_t flags;
+
+  /* Available memory from BIOS */
+  multiboot_uint32_t mem_lower;
+  multiboot_uint32_t mem_upper;
+
+  /* "root" partition */
+  multiboot_uint32_t boot_device;
+
+  /* Kernel command line */
+  multiboot_uint32_t cmdline;
+
+  /* Boot-Module list */
+  multiboot_uint32_t mods_count;
+  multiboot_uint32_t mods_addr;
+
+  union
+  {
+    multiboot_aout_symbol_table_t aout_sym;
+    multiboot_elf_section_header_table_t elf_sec;
+  } u;
+
+  /* Memory Mapping buffer */
+  multiboot_uint32_t mmap_length;
+  multiboot_uint32_t mmap_addr;
+
+  /* Drive Info buffer */
+  multiboot_uint32_t drives_length;
+  multiboot_uint32_t drives_addr;
+
+  /* ROM configuration table */
+  multiboot_uint32_t config_table;
+
+  /* Boot Loader Name */
+  multiboot_uint32_t boot_loader_name;
+
+  /* APM table */
+  multiboot_uint32_t apm_table;
+
+  /* Video */
+  multiboot_uint32_t vbe_control_info;
+  multiboot_uint32_t vbe_mode_info;
+  multiboot_uint16_t vbe_mode;
+  multiboot_uint16_t vbe_interface_seg;
+  multiboot_uint16_t vbe_interface_off;
+  multiboot_uint16_t vbe_interface_len;
+
+  multiboot_uint64_t framebuffer_addr;
+  multiboot_uint32_t framebuffer_pitch;
+  multiboot_uint32_t framebuffer_width;
+  multiboot_uint32_t framebuffer_height;
+  multiboot_uint8_t framebuffer_bpp;
+#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0
+#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB     1
+#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT     2
+  multiboot_uint8_t framebuffer_type;
+  union
+  {
+    struct __attribute__((packed))
+    {
+      multiboot_uint32_t framebuffer_palette_addr;
+      multiboot_uint16_t framebuffer_palette_num_colors;
+    };
+    struct __attribute__((packed))
+    {
+      multiboot_uint8_t framebuffer_red_field_position;
+      multiboot_uint8_t framebuffer_red_mask_size;
+      multiboot_uint8_t framebuffer_green_field_position;
+      multiboot_uint8_t framebuffer_green_mask_size;
+      multiboot_uint8_t framebuffer_blue_field_position;
+      multiboot_uint8_t framebuffer_blue_mask_size;
+    };
+  };
+};
+typedef struct multiboot_info multiboot_info_t;
+
+struct __attribute__((packed)) multiboot_color
+{
+  multiboot_uint8_t red;
+  multiboot_uint8_t green;
+  multiboot_uint8_t blue;
+};
+
+struct __attribute__((packed)) multiboot_mmap_entry
+{
+  multiboot_uint32_t size;
+  multiboot_uint64_t addr;
+  multiboot_uint64_t len;
+#define MULTIBOOT_MEMORY_AVAILABLE              1
+#define MULTIBOOT_MEMORY_RESERVED               2
+#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE       3
+#define MULTIBOOT_MEMORY_NVS                    4
+#define MULTIBOOT_MEMORY_BADRAM                 5
+  multiboot_uint32_t type;
+} __attribute__((packed));
+typedef struct multiboot_mmap_entry multiboot_memory_map_t;
+
+struct __attribute__((packed)) multiboot_mod_list
+{
+  /* the memory used goes from bytes ’mod_start’ to ’mod_end-1’ inclusive */
+  multiboot_uint32_t mod_start;
+  multiboot_uint32_t mod_end;
+
+  /* Module command line */
+  multiboot_uint32_t cmdline;
+
+  /* padding to take it to 16 bytes (must be zero) */
+  multiboot_uint32_t pad;
+};
+typedef struct multiboot_mod_list multiboot_module_t;
+
+/* APM BIOS info. */
+struct __attribute__((packed)) multiboot_apm_info
+{
+  multiboot_uint16_t version;
+  multiboot_uint16_t cseg;
+  multiboot_uint32_t offset;
+  multiboot_uint16_t cseg_16;
+  multiboot_uint16_t dseg;
+  multiboot_uint16_t flags;
+  multiboot_uint16_t cseg_len;
+  multiboot_uint16_t cseg_16_len;
+  multiboot_uint16_t dseg_len;
+};
+
+#endif /* ! ASM_FILE */
+
+#endif /* ! MULTIBOOT_HEADER */
\ No newline at end of file
diff --git a/include/utils.h b/include/utils.h
new file mode 100644
index 0000000..9ea1f09
--- /dev/null
+++ b/include/utils.h
@@ -0,0 +1,13 @@
+#include <stdbool.h>
+
+#ifndef UTILS_H
+#define UTILS_H
+
+#ifndef asm
+#define asm __asm__ volatile
+#endif
+
+void macaroni_panic(char* msg);
+void macaroni_assert(bool condition, char* msg);
+
+#endif // UTILS_H
\ No newline at end of file
diff --git a/src/io.c b/src/io.c
new file mode 100644
index 0000000..1d9db60
--- /dev/null
+++ b/src/io.c
@@ -0,0 +1,12 @@
+#include <stdint.h>
+#include "utils.h"
+
+uint8_t inportb(uint16_t port) {
+    uint8_t r;
+    asm("inb %1, %0" : "=a" (r) : "dN" (port));
+    return r;
+}
+
+void outportb(uint16_t port, uint8_t data) {
+    asm("outb %1, %0" : : "dN" (port), "a" (data));
+}
\ No newline at end of file
diff --git a/src/kernel.c b/src/kernel.c
index 952eac2..2c2afcc 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -1,133 +1,28 @@
+#include "utils.h"
+#include "multiboot.h"
 #include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>
 
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned int u32;
-typedef unsigned long long u64;
-
-#ifndef asm
-#define asm __asm__ volatile
-#endif
-
-struct __attribute__((packed)) multiboot_info
-{
-  /* Multiboot info version number */
-  u32 flags;
-
-  /* Available memory from BIOS */
-  u32 mem_lower;
-  u32 mem_upper;
-
-  /* "root" partition */
-  u32 boot_device;
-
-  /* Kernel command line */
-  u32 cmdline;
-
-  /* Boot-Module list */
-  u32 mods_count;
-  u32 mods_addr;
-
-//   union
-//   {
-//     multiboot_aout_symbol_table_t aout_sym;
-//     multiboot_elf_section_header_table_t elf_sec;
-//   } u;
-  u32 unused_1;
-  u32 unused_2;
-  u32 unused_3;
-  u32 unused_4;
-
-  /* Memory Mapping buffer */
-  u32 mmap_length;
-  u32 mmap_addr;
-
-  /* Drive Info buffer */
-  u32 drives_length;
-  u32 drives_addr;
-
-  /* ROM configuration table */
-  u32 config_table;
-
-  /* Boot Loader Name */
-  u32 boot_loader_name;
-
-  /* APM table */
-  u32 apm_table;
-
-  /* Video */
-  u32 vbe_control_info;
-  u32 vbe_mode_info;
-  u16 vbe_mode;
-  u16 vbe_interface_seg;
-  u16 vbe_interface_off;
-  u16 vbe_interface_len;
-
-  u64 framebuffer_addr;
-  u32 framebuffer_pitch;
-  u32 framebuffer_width;
-  u32 framebuffer_height;
-  u8 framebuffer_bpp;
-#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0
-#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB     1
-#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT     2
-  u8 framebuffer_type;
-  union
-  {
-    struct
-    {
-      u32 framebuffer_palette_addr;
-      u16 framebuffer_palette_num_colors;
-    };
-    struct
-    {
-      u8 framebuffer_red_field_position;
-      u8 framebuffer_red_mask_size;
-      u8 framebuffer_green_field_position;
-      u8 framebuffer_green_mask_size;
-      u8 framebuffer_blue_field_position;
-      u8 framebuffer_blue_mask_size;
-    };
-  };
-};
-typedef struct multiboot_info multiboot_info_t;
-
-u8 inportb(u16 port) {
-    u8 r;
-    asm("inb %1, %0" : "=a" (r) : "dN" (port));
-    return r;
-}
-
-void outportb(u16 port, u8 data) {
-    asm("outb %1, %0" : : "dN" (port), "a" (data));
-}
-
-void macaroni_panic(char* msg) {
-    // we'll do something with msg later.
-    while(true){ asm("nop\n\t"); }
-}
-
-void macaroni_assert(bool condition) {
-    if (condition) {
-        return;
-    }
-    macaroni_panic("thisisatest");
-}
+void validate_multiboot
 
 void cmain(void) {
-    u32 magic_response = 0x1;
+    uint32_t magic_response;
     multiboot_info_t* p_multiboot_info;
     asm("\t movl %%eax,%0" : "=r"(magic_response));
     asm("\t movl %%ebx,%0" : "=r"(p_multiboot_info));
 
+    macaroni_assert(magic_response == 0x2BADB002, "im not a bad boo twooo");
+    macaroni_assert(p_multiboot_info->framebuffer_width == 640, "not gods width");
+    macaroni_assert(p_multiboot_info->framebuffer_height == 480, "not gods height");
+    macaroni_assert(p_multiboot_info->framebuffer_bpp == 16, "not gods bpp");
+    macaroni_assert(p_multiboot_info->framebuffer_type == MULTIBOOT_FRAMEBUFFER_TYPE_RGB, "not gods fbtype");
+    macaroni_assert(p_multiboot_info->framebuffer_red_field_position == 1, "bpp not formatted correctly");
+
     void *fb = (void *) (unsigned long) p_multiboot_info->framebuffer_addr;
-    u8* pixel = fb;
+    uint8_t* pixel = fb;
     for (int i = 0; i < 10000; i++) {
         *(pixel + i) = i * 2;
     }
 
-    macaroni_assert(magic_response == 0x2BADB002);
-    //asm("int $0x13");
 }
diff --git a/src/utils.c b/src/utils.c
new file mode 100644
index 0000000..63b0b56
--- /dev/null
+++ b/src/utils.c
@@ -0,0 +1,14 @@
+#include "utils.h"
+
+void macaroni_panic(char* msg) {
+    // we'll do something with msg later.
+    // while(true){ asm("nop\n\t"); }
+    asm("int $0x13");
+}
+
+void macaroni_assert(bool condition, char* msg) {
+    if (condition) {
+        return;
+    }
+    macaroni_panic("thisisatest");
+}
\ No newline at end of file