Add a libcxx with a new operator
This commit is contained in:
parent
dcc05f2741
commit
010e261dc7
|
@ -1,2 +1,3 @@
|
||||||
add_subdirectory(libc)
|
add_subdirectory(libc)
|
||||||
|
add_subdirectory(libcxx)
|
||||||
add_subdirectory(mammoth)
|
add_subdirectory(mammoth)
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
add_library(libcxx STATIC
|
||||||
|
src/new.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
target_include_directories(libcxx
|
||||||
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
|
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
|
||||||
|
|
||||||
|
target_link_libraries(libcxx
|
||||||
|
libc
|
||||||
|
zion_lib
|
||||||
|
)
|
||||||
|
|
||||||
|
set_target_properties(libcxx PROPERTIES
|
||||||
|
COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -ffreestanding -mgeneral-regs-only")
|
|
@ -0,0 +1,34 @@
|
||||||
|
/* 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;
|
||||||
|
}
|
|
@ -0,0 +1,5 @@
|
||||||
|
/* vim: syntax=cpp */
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <stdint.h>
|
|
@ -0,0 +1,69 @@
|
||||||
|
/* 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;
|
|
@ -0,0 +1,6 @@
|
||||||
|
#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); }
|
|
@ -20,7 +20,7 @@ add_executable(test2
|
||||||
test2.cpp)
|
test2.cpp)
|
||||||
|
|
||||||
target_link_libraries(test2
|
target_link_libraries(test2
|
||||||
libc
|
libcxx
|
||||||
mammoth_lib)
|
mammoth_lib)
|
||||||
|
|
||||||
set_target_properties(test2
|
set_target_properties(test2
|
||||||
|
|
|
@ -19,7 +19,7 @@ int main(uint64_t bootstrap_cap) {
|
||||||
Thread t2(thread_entry, b);
|
Thread t2(thread_entry, b);
|
||||||
|
|
||||||
uint64_t size = 10;
|
uint64_t size = 10;
|
||||||
char* buff = (char*)malloc(size);
|
char* buff = new char[size];
|
||||||
Channel c1;
|
Channel c1;
|
||||||
c1.adopt_cap(bootstrap_cap);
|
c1.adopt_cap(bootstrap_cap);
|
||||||
check(c1.ReadStr(buff, &size));
|
check(c1.ReadStr(buff, &size));
|
||||||
|
|
Loading…
Reference in New Issue