mirror of
https://github.com/Atmosphere-NX/Atmosphere.git
synced 2024-12-05 01:52:19 +00:00
496adb0018
* Work around Clang's incomplete C++20 support for omitting typename * vapours: fix Clang error about missing return in constexpr function * stratosphere: fix call to non-constexpr strlen in constexpr function strlen being constexpr is a non-compliant GCC extension; Clang explicitly rejects it: https://reviews.llvm.org/D23692 * stratosphere: add a bunch of missing override specifiers * stratosphere: work around Clang consteval bug Minimal example: https://godbolt.org/z/MoM64v93M The issue seems to be that Clang does not consider f(x) to be a constant expression if x comes from a template argument that isn't a non-type auto template argument (???) We can work around this by relaxing GetMessageHeaderForCheck (by using constexpr instead of consteval). This produces no functional changes because the result of GetMessageHeaderForCheck() is assigned to a constexpr variable, so the result is guaranteed to be computed at compile-time. * stratosphere: fix missing require clauses in definitions GCC not requiring the require clauses to be repeated for member definitions is actually a compiler bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96830 Clang rejects declarations with missing require clauses. * Fix ALWAYS_INLINE_LAMBDA and parameter list relative order While GCC doesn't seem to care about the position of the always_inline attribute relative to the parameter list, Clang is very picky and requires the attribute to appear after the parameter list (and before a trailing return type) * stratosphere: fix static constexpr member variable with incomplete type GCC accepts this for some reason (because of the lambda?) but Clang correctly rejects this.
84 lines
3.1 KiB
C++
84 lines
3.1 KiB
C++
/*
|
|
* Copyright (c) Atmosphère-NX
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#pragma once
|
|
#include <stratosphere/sf/sf_common.hpp>
|
|
#include <stratosphere/lmem.hpp>
|
|
|
|
namespace ams::sf {
|
|
|
|
class ExpHeapMemoryResource : public MemoryResource {
|
|
private:
|
|
lmem::HeapHandle m_handle;
|
|
public:
|
|
constexpr ExpHeapMemoryResource() : m_handle() { /* ... */ }
|
|
constexpr explicit ExpHeapMemoryResource(lmem::HeapHandle h) : m_handle(h) { /* ... */ }
|
|
|
|
void Attach(lmem::HeapHandle h) {
|
|
AMS_ABORT_UNLESS(m_handle == lmem::HeapHandle());
|
|
m_handle = h;
|
|
}
|
|
|
|
lmem::HeapHandle GetHandle() const { return m_handle; }
|
|
private:
|
|
virtual void *AllocateImpl(size_t size, size_t alignment) override {
|
|
return lmem::AllocateFromExpHeap(m_handle, size, static_cast<int>(alignment));
|
|
}
|
|
|
|
virtual void DeallocateImpl(void *buffer, size_t size, size_t alignment) override {
|
|
AMS_UNUSED(size, alignment);
|
|
return lmem::FreeToExpHeap(m_handle, buffer);
|
|
}
|
|
|
|
virtual bool IsEqualImpl(const MemoryResource &resource) const override {
|
|
return this == std::addressof(resource);
|
|
}
|
|
};
|
|
|
|
class UnitHeapMemoryResource : public MemoryResource {
|
|
private:
|
|
lmem::HeapHandle m_handle;
|
|
public:
|
|
constexpr UnitHeapMemoryResource() : m_handle() { /* ... */ }
|
|
constexpr explicit UnitHeapMemoryResource(lmem::HeapHandle h) : m_handle(h) { /* ... */ }
|
|
|
|
void Attach(lmem::HeapHandle h) {
|
|
AMS_ABORT_UNLESS(m_handle == lmem::HeapHandle());
|
|
m_handle = h;
|
|
}
|
|
|
|
lmem::HeapHandle GetHandle() const { return m_handle; }
|
|
private:
|
|
virtual void *AllocateImpl(size_t size, size_t alignment) override {
|
|
AMS_ASSERT(size <= lmem::GetUnitHeapUnitSize(m_handle));
|
|
AMS_ASSERT(alignment <= static_cast<size_t>(lmem::GetUnitHeapAlignment(m_handle)));
|
|
AMS_UNUSED(size, alignment);
|
|
|
|
return lmem::AllocateFromUnitHeap(m_handle);
|
|
}
|
|
|
|
virtual void DeallocateImpl(void *buffer, size_t size, size_t alignment) override {
|
|
AMS_UNUSED(size, alignment);
|
|
|
|
return lmem::FreeToUnitHeap(m_handle, buffer);
|
|
}
|
|
|
|
virtual bool IsEqualImpl(const MemoryResource &resource) const override {
|
|
return this == std::addressof(resource);
|
|
}
|
|
};
|
|
|
|
}
|