Compare commits

..

No commits in common. "1d7b9260c315f25a1cc960447b70515e8d18df41" and "9c9cb6a05a20eb71919f6322d294c7a474ead95d" have entirely different histories.

5 changed files with 2 additions and 15 deletions

View File

@ -5,7 +5,7 @@ set(CMAKE_CXX_COMPILER_WORKS 1)
set(CMAKE_CROSSCOMPILING true) set(CMAKE_CROSSCOMPILING true)
project(Luna LANGUAGES C CXX ASM_NASM VERSION 0.1.0) project(Luna LANGUAGES C CXX ASM_NASM)
set(LUNA_ROOT ${CMAKE_CURRENT_LIST_DIR}) set(LUNA_ROOT ${CMAKE_CURRENT_LIST_DIR})

View File

@ -58,10 +58,6 @@ set_target_properties(moon PROPERTIES CXX_STANDARD 20)
target_include_directories(moon PRIVATE ${CMAKE_CURRENT_LIST_DIR}/src) target_include_directories(moon PRIVATE ${CMAKE_CURRENT_LIST_DIR}/src)
configure_file(src/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/gen/config.h @ONLY)
target_include_directories(moon PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/gen)
target_link_options(moon PRIVATE LINKER:-T ${CMAKE_CURRENT_LIST_DIR}/moon.ld -nostdlib -nodefaultlibs) target_link_options(moon PRIVATE LINKER:-T ${CMAKE_CURRENT_LIST_DIR}/moon.ld -nostdlib -nodefaultlibs)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/moon" DESTINATION ${LUNA_ROOT}/initrd/boot) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/moon" DESTINATION ${LUNA_ROOT}/initrd/boot)

View File

@ -1,6 +0,0 @@
#pragma once
#define MOON_VERSION "@CMAKE_PROJECT_VERSION@"
#define MOON_VERSION_MAJOR "@CMAKE_PROJECT_VERSION_MAJOR@"
#define MOON_VERSION_MINOR "@CMAKE_PROJECT_VERSION_MINOR@"
#define MOON_VERSION_PATCH "@CMAKE_PROJECT_VERSION_PATCH@"

View File

@ -4,7 +4,6 @@
#include "arch/Serial.h" #include "arch/Serial.h"
#include "arch/Timer.h" #include "arch/Timer.h"
#include "boot/Init.h" #include "boot/Init.h"
#include "config.h"
#include "memory/Heap.h" #include "memory/Heap.h"
#include "memory/MemoryManager.h" #include "memory/MemoryManager.h"
#include "video/TextConsole.h" #include "video/TextConsole.h"
@ -12,7 +11,7 @@
Result<void> init() Result<void> init()
{ {
kinfoln("Starting Moon %s", MOON_VERSION); kinfoln("Hello, world!");
kinfoln("Current platform: %s", CPU::platform_string()); kinfoln("Current platform: %s", CPU::platform_string());

View File

@ -3,9 +3,7 @@
extern _noreturn bool __check_failed(const char* file, const char* line, const char* func, const char* expr); extern _noreturn bool __check_failed(const char* file, const char* line, const char* func, const char* expr);
#ifndef STRINGIZE_VALUE_OF
#define STRINGIZE(x) #x #define STRINGIZE(x) #x
#define STRINGIZE_VALUE_OF(x) STRINGIZE(x) #define STRINGIZE_VALUE_OF(x) STRINGIZE(x)
#endif
#define check(expr) (expr) || __check_failed(__FILE__, STRINGIZE_VALUE_OF(__LINE__), __PRETTY_FUNCTION__, #expr) #define check(expr) (expr) || __check_failed(__FILE__, STRINGIZE_VALUE_OF(__LINE__), __PRETTY_FUNCTION__, #expr)