kernel/CMakeLists.txt

@@ -1,8 +1,8 @@
 set(SOURCES 
     src/main.cpp
-    src/video/Framebuffer.cpp
+    src/Framebuffer.cpp
-    src/memory/MemoryManager.cpp
+    src/MemoryManager.cpp
-    src/boot/Init.cpp
+    src/Init.cpp
     src/arch/Serial.cpp
 )
 
@@ -16,14 +16,21 @@ set(SOURCES
 )
 endif()
 
+set(ASM_SOURCES)
+
+if("${ARCH}" MATCHES "x86_64")
+set(ASM_SOURCES
+    ${ASM_SOURCES}
+    src/arch/x86_64/CPU.asm
+)
+
+add_library(moon-asm STATIC ${ASM_SOURCES})
+endif()
+
 add_executable(moon ${SOURCES})
 
 if("${ARCH}" MATCHES "x86_64")
-    set(ASM_SOURCES
+target_link_libraries(moon moon-asm)
-        src/arch/x86_64/CPU.asm
-    )
-    add_library(moon-asm STATIC ${ASM_SOURCES})
-    target_link_libraries(moon moon-asm)
 endif()
 
 target_link_libraries(moon luna-freestanding)
@@ -41,13 +48,16 @@ target_compile_options(moon PRIVATE -fno-asynchronous-unwind-tables -fno-omit-fr
 target_compile_options(moon PRIVATE -nostdlib -mcmodel=kernel)
 
 if("${ARCH}" MATCHES "x86_64")
-    target_compile_options(moon PRIVATE -mno-red-zone)
+target_compile_options(moon PRIVATE -mno-red-zone)
-    target_compile_options(moon PRIVATE -mno-80387 -mno-mmx -mno-sse -mno-sse2)
+target_compile_options(moon PRIVATE -mno-80387 -mno-mmx -mno-sse -mno-sse2)
-    target_link_options(moon PRIVATE -mno-red-zone)
 endif()
 
 target_link_options(moon PRIVATE -lgcc -Wl,--build-id=none -z max-page-size=0x1000 -mcmodel=kernel)
 
+if("${ARCH}" MATCHES "x86_64")
+target_link_options(moon PRIVATE -mno-red-zone)
+endif()
+
 set_target_properties(moon PROPERTIES CXX_STANDARD 20)
 
 target_include_directories(moon PRIVATE ${CMAKE_CURRENT_LIST_DIR}/src)

kernel/src/Framebuffer.cpp

@@ -1,5 +1,5 @@
-#include "video/Framebuffer.h"
+#include "Framebuffer.h"
-#include "boot/bootboot.h"
+#include "bootboot.h"
 
 static u8* g_fb_ptr = nullptr;
 static u32 g_fb_size;

kernel/src/Init.cpp

@@ -1,9 +1,9 @@
-#include "boot/Init.h"
+#include "Init.h"
+#include "Framebuffer.h"
+#include "MemoryManager.h"
 #include "arch/CPU.h"
 #include "arch/Serial.h"
-#include "boot/bootboot.h"
+#include "bootboot.h"
-#include "memory/MemoryManager.h"
-#include "video/Framebuffer.h"
 #include <String.h>
 
 extern BOOTBOOT bootboot;

kernel/src/MemoryManager.cpp

@@ -1,7 +1,7 @@
-#include "memory/MemoryManager.h"
+#include "MemoryManager.h"
 #include "arch/MMU.h"
 #include "arch/Serial.h"
-#include "boot/bootboot.h"
+#include "bootboot.h"
 #include <Alignment.h>
 #include <String.h>
 #include <Types.h>

kernel/src/arch/x86_64/MMU.cpp

@@ -1,5 +1,5 @@
 #include "arch/MMU.h"
-#include "memory/MemoryManager.h"
+#include "MemoryManager.h"
 #include <String.h>
 
 #define PAGE_SIZE 4096

kernel/src/bootboot.h

@@ -1,5 +1,5 @@
 /*
- * boot/bootboot.h
+ * bootboot.h
  * https://gitlab.com/bztsrc/bootboot
  *
  * Copyright (C) 2017 - 2021 bzt (bztsrc@gitlab)

kernel/src/main.cpp

@@ -1,9 +1,9 @@
+#include "Framebuffer.h"
+#include "Init.h"
+#include "MemoryManager.h"
 #include "arch/CPU.h"
 #include "arch/MMU.h"
 #include "arch/Serial.h"
-#include "boot/Init.h"
-#include "memory/MemoryManager.h"
-#include "video/Framebuffer.h"
 
 extern u8 fb[1];