Moved some source files to a `lib` directory.

diff --git a/kernel/module.mk b/kernel/module.mk
index 9c1ed2083d6028a7450bb96652cdfde70b68bbc3..d503c39aef2d44075d66348dc7f9ac2002761159 100644 (file)
--- a/kernel/module.mk
+++ b/kernel/module.mk
@@ -24,10 +24,10 @@ LDFLAGS := $(OLD_LDFLAGS) -T kernel/linker.ld -z max-page-size=0x1000 \
 
 CPPOBJS      := $(patsubst $(SRC_DIR)%,$(OUT_DIR)%.o,$(shell find $(SRC_DIR) -name '*.cpp'))
 ASMOBJS      := $(patsubst $(SRC_DIR)%,$(OUT_DIR)%.o,$(shell find $(SRC_DIR) -name '*.S' | grep -v crt))
-CRTI_OBJ     := $(OUT_DIR)crti.S.o
+CRTI_OBJ     := $(OUT_DIR)/lib/crti.S.o
 CRTBEGIN_OBJ := $(shell $(CXX) $(LDFLAGS) -print-file-name=crtbegin.o)
 CRTEND_OBJ   := $(shell $(CXX) $(LDFLAGS) -print-file-name=crtend.o)
-CRTN_OBJ     := $(OUT_DIR)crtn.S.o
+CRTN_OBJ     := $(OUT_DIR)/lib/crtn.S.o
 OBJS := $(CRTI_OBJ) $(CRTBEGIN_OBJ) $(CPPOBJS) $(ASMOBJS) $(CRTEND_OBJ) $(CRTN_OBJ)
 
 isodir/boot/$(EXEC_NAME): $(OUT_DIR)$(EXEC_NAME)

diff --git a/kernel/src/boot.S b/kernel/src/boot.S
index cd329afc84d4781f2f141a420d45c01d674e3097..9b91c171f750098e5f7797d4d7c8e44e9732b7cb 100644 (file)
--- a/kernel/src/boot.S
+++ b/kernel/src/boot.S
@@ -1,4 +1,4 @@
-#include "multiboot2.hpp"
+#include "lib/multiboot2.hpp"
 
 .set KERNEL_VMA, 0xFFFFFFFF80000000
 

diff --git a/kernel/src/interrupts.hpp b/kernel/src/interrupts.hpp
index af4cb6db3f46943dbb8383fc6d7115d8f8d68edb..c405e26ac536eeef86c9e4b5b770bbdc4015d605 100644 (file)
--- a/kernel/src/interrupts.hpp
+++ b/kernel/src/interrupts.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include "phys_ptr.hpp"
+#include "lib/phys_ptr.hpp"
 #include "serial.hpp"
 
 namespace os {

diff --git a/kernel/src/kernel.cpp b/kernel/src/kernel.cpp
index e786124d01d4c80f71a41cb5f0c742e99856f9af..998357f54dbbbf45e51009fa0d5712b360d970b2 100644 (file)
--- a/kernel/src/kernel.cpp
+++ b/kernel/src/kernel.cpp
@@ -1,4 +1,4 @@
-#include "multiboot2.hpp"
+#include "lib/multiboot2.hpp"
 #include "paging.hpp"
 #include "utils.hpp"
 #include "serial.hpp"

diff --git a/kernel/src/crti.S b/kernel/src/lib/crti.S
similarity index 100%
rename from kernel/src/crti.S
rename to kernel/src/lib/crti.S

diff --git a/kernel/src/crtn.S b/kernel/src/lib/crtn.S
similarity index 100%
rename from kernel/src/crtn.S
rename to kernel/src/lib/crtn.S

diff --git a/kernel/src/multiboot2.hpp b/kernel/src/lib/multiboot2.hpp
similarity index 100%
rename from kernel/src/multiboot2.hpp
rename to kernel/src/lib/multiboot2.hpp

diff --git a/kernel/src/phys_ptr.hpp b/kernel/src/lib/phys_ptr.hpp
similarity index 100%
rename from kernel/src/phys_ptr.hpp
rename to kernel/src/lib/phys_ptr.hpp

diff --git a/kernel/src/paging.hpp b/kernel/src/paging.hpp
index ade4bcb27784cb13e8b7a453d386adb0a0f2e642..5a2c809040a8e0a7ec800532368d8b689d010d87 100644 (file)
--- a/kernel/src/paging.hpp
+++ b/kernel/src/paging.hpp
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include "serial.hpp"
 #include "utils.hpp"
-#include "phys_ptr.hpp"
+#include "lib/phys_ptr.hpp"
 
 namespace os { namespace paging {