Move kernel memory location to a header file from Makefile

Author: scopeInfinity

Makefile

@@ -55,8 +55,6 @@ MINIMAL_DISK = $(BUILD_DIR)/minimal_disk
 SRC_APP = $(SRC_DIR)/usr/local/src
 BUILD_APP = $(BUILD_DIR)/usr/local/bin
 
-MEMORY_LOCATION_KERNEL = 0xC000
-
 SOURCE_SNAPSHOT="\"$$(git rev-parse --short HEAD)$$(git diff --quiet || echo '_unstaged')\""
 
 # General Assumptions

include/fuzzy/memmgr/layout.h

@@ -0,0 +1,15 @@
+#pragma once
+
+// Most of the memory layout relies on the fact the kernel is first app
+// and kernel's pid is 0.
+#define PID_KERNEL 0
+
+#define MEMORY_KERNEL_LOCATION 0xC000
+#define MEMORY_KERNEL_SIZE     0xFFFF
+
+#define MEMORY_APPBASE_LOCATION 0x20000
+#define MEMORY_APP_SIZE         0x0FFFF
+
+// pid starts from 1
+#define memmgr_app_abs_location(pid) ((pid)!=0?(MEMORY_APPBASE_LOCATION+((pid)-1)*MEMORY_APP_SIZE):MEMORY_KERNEL_LOCATION)
+#define memmgr_app_size(pid) (MEMORY_APP_SIZE)

src/bootloader/Makefile.mk

@@ -28,7 +28,6 @@ $(bt_stage2).elf: $(SRC_BOOTLOADER)/stage2.asm $(SRC_BOOTLOADER)/stage2.c $(INCL
 		-D SECTOR_START_KERNEL=$(SECTOR_START_KERNEL) \
 		-D SECTOR_COUNT_KERNEL=$(SECTOR_COUNT_KERNEL) \
 		-D MEMORY_STATIC_LIBRARY=$(MEMORY_STATIC_LIBRARY) \
-		-D MEMORY_LOCATION_KERNEL=$(MEMORY_LOCATION_KERNEL) \
 		-o $(BUILD_BOOTLOADER)/stage2_c.o $(SRC_BOOTLOADER)/stage2.c
 	$(LD) -m elf_i386 -Ttext 0x8000 -T linker.ld -o $@ $(BUILD_BOOTLOADER)/stage2_asm.o $(BUILD_BOOTLOADER)/stage2_c.o  $(BUILD_LIB_UTILS)/libutils_16 $(BUILD_DRIVERS)/display/libtm_bios $(BUILD_DRIVERS)/disk/libdisk_16
 	truncate --size=%512 $@

src/bootloader/stage2.c

@@ -1,3 +1,5 @@
+#include <fuzzy/memmgr/layout.h>
+
 #include <lib/utils/color.h>
 #include <drivers/disk/disk.h>
 #include <lib/utils/output.h>
@@ -29,12 +31,12 @@ char *get_memdump_8byte(void *address) {
 
 void load_kernel() {
     print_log("Loading Kernel");
-    int err = load_sectors(MEMORY_LOCATION_KERNEL, 0x80, SECTOR_START_KERNEL, SECTOR_COUNT_KERNEL);
+    int err = load_sectors(MEMORY_KERNEL_LOCATION, 0x80, SECTOR_START_KERNEL, SECTOR_COUNT_KERNEL);
     if(err) {
         print_log("Failed to load kernel in memory: %d", err);
         label_exit();
     } else {
-        print_log("Kernel loaded at 0x%x: %s...", MEMORY_LOCATION_KERNEL, get_memdump_8byte(MEMORY_LOCATION_KERNEL));
+        print_log("Kernel loaded at 0x%x: %s...", MEMORY_KERNEL_LOCATION, get_memdump_8byte(MEMORY_KERNEL_LOCATION));
     }
 }
 

src/drivers/keyboard/Makefile.mk

@@ -2,7 +2,6 @@
 $(SELF_BUILD_DIR)/%.o: $(SELF_SRC_DIR)/%.c $(BUILD_USR_INCLUDE_ALL)
 	mkdir -p $(dir $@)
 	$(KERNEL_CC) -c -o $@ \
-		-D MEMORY_LOCATION_KERNEL=$(MEMORY_LOCATION_KERNEL) \
 		$<
 
 $(SELF_BUILD_DIR)/%_asm.o: $(SELF_SRC_DIR)/%.asm

src/fs/Makefile.mk

@@ -1,7 +1,6 @@
 $(SELF_BUILD_DIR)/%.o: $(SELF_SRC_DIR)/%.c $(SELF_INCLUDE_DIR)/%.h
 	mkdir -p $(dir $@)
 	$(KERNEL_CC) -c \
-		-D MEMORY_LOCATION_KERNEL=$(MEMORY_LOCATION_KERNEL) \
 		-o $@ $<
 
 $(SELF_BUILD_DIR)/libffs:	$(patsubst $(SELF_SRC_DIR)/%.c,$(SELF_BUILD_DIR)/%.o,$(wildcard $(SELF_SRC_DIR)/*.c))

src/fs/ffs.c

@@ -1,5 +1,6 @@
 #include <fuzzy/fs/ffs.h>
 #include <fuzzy/fs/mbr.h>
+#include <fuzzy/memmgr/layout.h>
 #include <string.h>
 #include <drivers/disk/disk.h>
 #include <lib/utils/logging.h>
@@ -8,7 +9,7 @@
 // TODO: verify partition metadata
 
 int partition_read_block(int lba, void *wr_buffer) {
-    int memory_location = ((int)wr_buffer)+MEMORY_LOCATION_KERNEL;
+    int memory_location = ((int)wr_buffer)+MEMORY_KERNEL_LOCATION;
     int err = load_sectors(memory_location, 0x80, lba, 1);
     return err;
 }

src/fs/mbr.c

@@ -1,15 +1,17 @@
 #include <fuzzy/fs/ffs.h>
 #include <fuzzy/fs/mbr.h>
+#include <fuzzy/kernel/panic.h>
+#include <fuzzy/memmgr/layout.h>
+
 #include <drivers/disk/disk.h>
 #include <lib/utils/logging.h>
-#include <fuzzy/kernel/panic.h>
 
 char _cache_mbrblock[FS_BLOCK_SIZE];
 int _cache_mbrblock_ready = 0;
 
 char *get_mbrblock() {
     if(!_cache_mbrblock_ready) {
-        int memory_location = ((int)_cache_mbrblock)+MEMORY_LOCATION_KERNEL;
+        int memory_location = ((int)_cache_mbrblock)+MEMORY_KERNEL_LOCATION;
         int lba = 0;
         int err = load_sectors(memory_location, 0x80, lba, 1);
         if (err) {

src/kernel/Makefile.mk

@@ -1,5 +1,3 @@
-MEMORY_LOCATION_APP = 0x20000
-
 debug_kernel: $(kernel_core)
 	objdump -b binary -mi386 -Maddr32,data32 -D $<
 	xxd $<
@@ -9,8 +7,6 @@ $(SELF_BUILD_DIR)/%.o: $(SELF_SRC_DIR)/%.c $(BUILD_USR_INCLUDE_ALL)
 	$(KERNEL_CC) -c -o $@ \
 		-D INIT_APPNAME=\"$(INIT_APPNAME)\" \
 		-D __SOURCE_SNAPSHOT__=$(SOURCE_SNAPSHOT) \
-		-D MEMORY_LOCATION_KERNEL=$(MEMORY_LOCATION_KERNEL) \
-		-D MEMORY_LOCATION_APP=$(MEMORY_LOCATION_APP) \
 		$<
 
 $(SELF_BUILD_DIR)/%_asm.o: $(SELF_SRC_DIR)/%.asm

src/kernel/interrupts/Makefile.mk

@@ -2,7 +2,6 @@
 $(SELF_BUILD_DIR)/%.o: $(SELF_SRC_DIR)/%.c $(BUILD_USR_INCLUDE_ALL)
 	mkdir -p $(dir $@)
 	$(KERNEL_CC) -c -o $@ \
-		-D MEMORY_LOCATION_KERNEL=$(MEMORY_LOCATION_KERNEL) \
 		$<
 
 $(SELF_BUILD_DIR)/%_asm.o: $(SELF_SRC_DIR)/%.asm