Compare commits

..

6 Commits

8 changed files with 18 additions and 18 deletions

View File

@ -117,9 +117,7 @@ def hostname() -> int:
def host_env() -> int:
os_name = platform.system().lower()
arch = platform.machine()
if arch == 'amd64':
arch = 'x86_64'
arch = util.get_arch()
print(f'{os_name}-{arch}')
return 0

View File

@ -363,8 +363,8 @@ constexpr Result<DescriptorType*> buildTypeDef(TypeStore *typeStore) noexcept {
oxReturnError(model(&handler, t));
a.deallocate(t, 1);
} else {
T *t = reinterpret_cast<T*>(ox_alloca(sizeof(T)));
oxReturnError(model(&handler, t));
auto t = ox_malloca(sizeof(T), T);
oxReturnError(model(&handler, t.get()));
}
return writer.definition();
}

View File

@ -33,7 +33,7 @@ class ModelHandlerInterface {
template<typename T = std::nullptr_t>
constexpr ox::Error setTypeInfo(
const char* name,
const char *name,
int version,
const Vector<String>& typeParams,
std::size_t fields) noexcept {
@ -46,7 +46,7 @@ class ModelHandlerInterface {
}
template<std::size_t len>
constexpr Error fieldCString(const char *name, const char val[len]) noexcept {
constexpr Error fieldCString(const char *name, const char val[len]) noexcept requires(Handler::opType() != OpType::Read) {
return m_handler->fieldCString(name, &val[0], len);
}
@ -54,11 +54,11 @@ class ModelHandlerInterface {
return m_handler->fieldCString(name, val);
}
constexpr Error fieldCString(const char *name, const char *const*val) noexcept {
constexpr Error fieldCString(const char *name, const char *const*val) noexcept requires(Handler::opType() != OpType::Read) {
return m_handler->fieldCString(name, val);
}
constexpr Error fieldCString(const char *name, const char **val) noexcept {
constexpr Error fieldCString(const char *name, const char **val) noexcept requires(Handler::opType() != OpType::Read) {
return m_handler->fieldCString(name, val);
}
@ -66,7 +66,7 @@ class ModelHandlerInterface {
return m_handler->fieldCString(name, val, buffLen);
}
constexpr Error fieldCString(const char *name, const char **val, std::size_t buffLen) noexcept {
constexpr Error fieldCString(const char *name, const char **val, std::size_t buffLen) noexcept requires(Handler::opType() != OpType::Read) {
return m_handler->fieldCString(name, val, buffLen);
}

View File

@ -41,7 +41,7 @@ class HashMap {
constexpr HashMap &operator=(const HashMap &other);
constexpr HashMap &operator=(HashMap &&other);
constexpr HashMap &operator=(HashMap &&other) noexcept;
/**
* K is assumed to be a null terminated string.
@ -135,7 +135,7 @@ constexpr HashMap<K, T> &HashMap<K, T>::operator=(const HashMap<K, T> &other) {
}
template<typename K, typename T>
constexpr HashMap<K, T> &HashMap<K, T>::operator=(HashMap<K, T> &&other) {
constexpr HashMap<K, T> &HashMap<K, T>::operator=(HashMap<K, T> &&other) noexcept {
if (this != &other) {
clear();
m_keys = std::move(other.m_keys);

View File

@ -222,13 +222,13 @@ class UniquePtr {
template<typename U>
constexpr UniquePtr &operator=(const UniquePtr<U> &other) = delete;
constexpr UniquePtr &operator=(UniquePtr<T> &&other) {
constexpr UniquePtr &operator=(UniquePtr<T> &&other) noexcept {
reset(std::move(other));
return *this;
}
template<typename U>
constexpr UniquePtr &operator=(UniquePtr<U> &&other) {
constexpr UniquePtr &operator=(UniquePtr<U> &&other) noexcept {
reset(std::move(other));
return *this;
}

View File

@ -49,7 +49,7 @@ using BgCtl = uint16_t;
#define REG_BG3CTL *reinterpret_cast<volatile BgCtl*>(0x0400'000e)
[[nodiscard]]
inline auto &regBgCtl(auto bgIdx) noexcept {
inline auto &regBgCtl(uintptr_t bgIdx) noexcept {
return *reinterpret_cast<volatile BgCtl*>(0x0400'0008 + 2 * bgIdx);
}

View File

@ -20,7 +20,7 @@ constexpr std::size_t ptToIdx(int x, int y, int c, int scale = 1) noexcept {
const auto colStart = static_cast<std::size_t>(colLength * static_cast<std::size_t>(x / tileWidth));
const auto rowStart = static_cast<std::size_t>(rowLength * static_cast<std::size_t>(y / tileHeight));
const auto colOffset = static_cast<std::size_t>(x % tileWidth);
const auto rowOffset = static_cast<std::size_t>(static_cast<std::size_t>((y % tileHeight) * tileHeight));
const auto rowOffset = static_cast<std::size_t>((y % tileHeight) * tileHeight);
return static_cast<std::size_t>(colStart + colOffset + rowStart + rowOffset);
}

View File

@ -45,8 +45,10 @@ struct TileSheetV2 {
ox::Vector<uint8_t> pixels;
constexpr SubSheet() noexcept = default;
constexpr SubSheet(ox::CRStringView pName, int pColumns, int pRows, int bpp) noexcept:
name(pName), columns(pColumns), rows(pRows),
pixels(static_cast<std::size_t>(columns * rows * PixelsPerTile) / (bpp == 4 ? 2u : 1u)) {
name(pName),
columns(pColumns),
rows(pRows),
pixels(static_cast<size_t>(columns * rows * PixelsPerTile) / (bpp == 4 ? 2u : 1u)) {
}
};