Remove libcxx stub library and move operator new to mammoth.

lib/CMakeLists.txt

@@ -1,4 +1,3 @@
 add_subdirectory(glacier)
 add_subdirectory(libc)
-add_subdirectory(libcxx)
 add_subdirectory(mammoth)

lib/libcxx/CMakeLists.txt

@@ -1,15 +0,0 @@
-add_library(cxx STATIC
-  src/new.cpp
-  )
-
-target_include_directories(cxx
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
-  PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
-
-target_link_libraries(cxx
-  c
-  zion_lib
-  )
-
-set_target_properties(cxx PROPERTIES
-  COMPILE_FLAGS "${CMAKE_CXX_FLAGS} ${BASE_COMPILE_FLAGS}")

lib/libcxx/include/cstddef

@@ -1,34 +0,0 @@
-/* vim: syntax=cpp */
-
-#pragma once
-
-#include "cstdint"
-
-namespace std {
-  using ptrdiff_t = uint64_t;
-  using size_t = uint64_t;
-  // FIXME: I don't understand what this does.
-  using max_align_t = uint64_t;
-  using nullptr_t = decltype(nullptr);
- 
-  enum class byte : unsigned char {};
- 
-  // byte type operations
-  template<class IntType>
-    constexpr byte& operator<<=(byte& b, IntType shift) noexcept;
-  template<class IntType>
-    constexpr byte operator<<(byte b, IntType shift) noexcept;
-  template<class IntType>
-    constexpr byte& operator>>=(byte& b, IntType shift) noexcept;
-  template<class IntType>
-    constexpr byte operator>>(byte b, IntType shift) noexcept;
-  constexpr byte& operator|=(byte& l, byte r) noexcept;
-  constexpr byte operator|(byte l, byte r) noexcept;
-  constexpr byte& operator&=(byte& l, byte r) noexcept;
-  constexpr byte operator&(byte l, byte r) noexcept;
-  constexpr byte& operator^=(byte& l, byte r) noexcept;
-  constexpr byte operator^(byte l, byte r) noexcept;
-  constexpr byte operator~(byte b) noexcept;
-  template<class IntType>
-    constexpr IntType to_integer(byte b) noexcept;
-}

lib/libcxx/include/cstdint

@@ -1,5 +0,0 @@
-/* vim: syntax=cpp */
-
-#pragma once
-
-#include <stdint.h>

lib/libcxx/include/new

@@ -1,69 +0,0 @@
-/* vim: syntax=cpp */
-
-#pragma once
-
-#include "cstddef"
-
-namespace std {
-  // storage allocation errors
-  class bad_alloc;
-  class bad_array_new_length;
- 
-  struct destroying_delete_t {
-    explicit destroying_delete_t() = default;
-  };
-  inline constexpr destroying_delete_t destroying_delete{};
- 
-  // global operator new control
-  enum class align_val_t : size_t {};
- 
-  struct nothrow_t { explicit nothrow_t() = default; };
-  extern const nothrow_t nothrow;
- 
-  using new_handler = void (*)();
-  new_handler get_new_handler() noexcept;
-  new_handler set_new_handler(new_handler new_p) noexcept;
- 
-  // pointer optimization barrier
-  template<class T> [[nodiscard]] constexpr T* launder(T* p) noexcept;
- 
-  // hardware interference size
-  // inline constexpr size_t hardware_destructive_interference_size =
-  //   /* implementation-defined */;
-  // inline constexpr size_t hardware_constructive_interference_size =
-  //   /* implementation-defined */;
-}
- 
-// storage allocation and deallocation
-[[nodiscard]] void* operator new(std::size_t size);
-[[nodiscard]] void* operator new(std::size_t size, std::align_val_t alignment);
-[[nodiscard]] void* operator new(std::size_t size, const std::nothrow_t&) noexcept;
-[[nodiscard]] void* operator new(std::size_t size, std::align_val_t alignment,
-                                 const std::nothrow_t&) noexcept;
- 
-void  operator delete(void* ptr) noexcept;
-void  operator delete(void* ptr, std::size_t size) noexcept;
-void  operator delete(void* ptr, std::align_val_t alignment) noexcept;
-void  operator delete(void* ptr, std::size_t size, std::align_val_t alignment) noexcept;
-void  operator delete(void* ptr, const std::nothrow_t&) noexcept;
-void  operator delete(void* ptr, std::align_val_t alignment,
-                      const std::nothrow_t&) noexcept;
- 
-[[nodiscard]] void* operator new[](std::size_t size);
-[[nodiscard]] void* operator new[](std::size_t size, std::align_val_t alignment);
-[[nodiscard]] void* operator new[](std::size_t size, const std::nothrow_t&) noexcept;
-[[nodiscard]] void* operator new[](std::size_t size, std::align_val_t alignment,
-                                   const std::nothrow_t&) noexcept;
- 
-void  operator delete[](void* ptr) noexcept;
-void  operator delete[](void* ptr, std::size_t size) noexcept;
-void  operator delete[](void* ptr, std::align_val_t alignment) noexcept;
-void  operator delete[](void* ptr, std::size_t size, std::align_val_t alignment) noexcept;
-void  operator delete[](void* ptr, const std::nothrow_t&) noexcept;
-void  operator delete[](void* ptr, std::align_val_t alignment,
-                        const std::nothrow_t&) noexcept;
- 
-[[nodiscard]] void* operator new  (std::size_t size, void* ptr) noexcept;
-[[nodiscard]] void* operator new[](std::size_t size, void* ptr) noexcept;
-void  operator delete  (void* ptr, void*) noexcept;
-void  operator delete[](void* ptr, void*) noexcept;

lib/libcxx/src/new.cpp

@@ -1,8 +0,0 @@
-#include "new"
-
-#include <stdlib.h>
-
-[[nodiscard]] void* operator new(std::size_t size) { return malloc(size); }
-[[nodiscard]] void* operator new[](std::size_t size) { return malloc(size); }
-
-void operator delete(void*, std::size_t) {}

lib/mammoth/CMakeLists.txt

@@ -5,6 +5,7 @@ add_library(mammoth_lib STATIC
   src/endpoint_server.cpp
   src/init.cpp
   src/memory_region.cpp
+  src/new.cpp
   src/process.cpp
   src/port.cpp
   src/thread.cpp

lib/mammoth/src/new.cpp

@@ -0,0 +1,7 @@
+#include <stdint.h>
+#include <stdlib.h>
+
+[[nodiscard]] void* operator new(uint64_t size) { return malloc(size); }
+[[nodiscard]] void* operator new[](uint64_t size) { return malloc(size); }
+
+void operator delete(void*, uint64_t) {}

scripts/build_image.sh

@@ -26,14 +26,14 @@ parted -s $dev mklabel gpt mkpart EFI fat32 1MiB 10MiB mkpart ext2 10MiB 100% se
 mkfs.fat -F 12 "${dev}p1"
 mke2fs "${dev}p2"
 
-limine-deploy "${dev}"
+limine bios-install "${dev}"
 
 mkdir -p efi/
 mount "${dev}p1" efi/
 
 mkdir -p efi/EFI/BOOT
 cp /usr/share/limine/BOOTX64.EFI efi/EFI/BOOT
-cp /usr/share/limine/limine.sys efi/
+cp /usr/share/limine/limine-bios.sys efi/
 cp ../zion/boot/limine.cfg efi/
 cp zion/zion efi/
 mkdir -p efi/sys

sys/denali/CMakeLists.txt

@@ -12,7 +12,6 @@ target_include_directories(denali
    "${CMAKE_CURRENT_SOURCE_DIR}/include")
 
 target_link_libraries(denali
-  cxx
   glacier
   mammoth_lib
   yellowstonestub

sys/yellowstone/CMakeLists.txt

@@ -8,7 +8,6 @@ add_executable(yellowstone
    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(yellowstone
-  cxx
   mammoth_lib
   glacier
   libdenali

sys/yellowstone/yellowstone_server.cpp

@@ -8,8 +8,6 @@
 #include "hw/gpt.h"
 #include "include/yellowstone.h"
 
-// FIXME: This linkage was missing :(
-void* operator new[](uint64_t size) { return malloc(size); }
 namespace {
 
 void ServerThreadBootstrap(void* yellowstone) {