OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libstrat: fix compilation without pre-compiled header/without lto

Browse Source
This commit is contained in:
Michael Scire
2021-10-06 17:58:42 -07:00
parent 7ca83c9d3b
commit e8f1efd01b
37 changed files with 89 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/libstratosphere/source/htc/server/rpc/htc_rpc_client.cpp
View File

@@ -412,6 +412,9 @@ namespace ams::htc::server::rpc {
}
s32 RpcClient::GetTaskHandle(u32 task_id) {
/* TODO: Why is this necessary to avoid a bogus array-bounds warning? */
AMS_ASSUME(task_id < MaxRpcCount);
/* Check pre-conditions. */
AMS_ASSERT(m_task_active[task_id]);
AMS_ASSERT(m_is_htcs_task[task_id]);

2
libraries/libstratosphere/source/lm/lm_remote_log_service.cpp
View File

@@ -40,7 +40,7 @@ namespace ams::lm {
/* Send libnx command. */
::Service logger_srv;
{
u64 pid_placeholder;
u64 pid_placeholder = 0;
#define NX_SERVICE_ASSUME_NON_DOMAIN
R_TRY(serviceDispatchIn(&m_srv, 0, pid_placeholder,

5
libraries/libstratosphere/source/mem/impl/mem_impl_platform.os.horizon.cpp
View File

@@ -70,15 +70,18 @@ namespace ams::mem::impl {
uintptr_t addr;
if (IsVirtualAddressMemoryEnabled()) {
/* TODO: Support virtual address memory. */
AMS_UNUSED(ptr);
AMS_ABORT("Virtual address memory not supported yet");
} else {
if (auto err = ConvertResult(os::AllocateMemoryBlock(std::addressof(addr), util::AlignUp(size, os::MemoryBlockUnitSize))); err != 0) {
return err;
}
os::SetMemoryPermission(addr, size, os::MemoryPermission_None);
}
/* Set the output pointer. */
*ptr = reinterpret_cast<void *>(addr);
return 0;
}

2
libraries/libstratosphere/source/ncm/ncm_install_task_base.cpp
View File

@@ -648,7 +648,7 @@ namespace ams::ncm {
/* Automatically choose a suitable storage id. */
auto reader = content_meta.GetReader();
StorageId storage_id;
StorageId storage_id = StorageId::None;
if (reader.GetStorageId() != StorageId::None) {
storage_id = reader.GetStorageId();
} else {

2
libraries/libstratosphere/source/os/impl/os_address_space_allocator.cpp
View File

@@ -20,7 +20,7 @@
namespace ams::os::impl {
template<std::unsigned_integral AddressType, std::unsigned_integral SizeType>
AddressSpaceAllocatorBase<AddressType, SizeType>::AddressSpaceAllocatorBase(u64 start_address, u64 end_address, SizeType guard_size, const AddressSpaceAllocatorForbiddenRegion *forbidden_regions, size_t num_forbidden_regions) : m_critical_section() {
AddressSpaceAllocatorBase<AddressType, SizeType>::AddressSpaceAllocatorBase(u64 start_address, u64 end_address, SizeType guard_size, const AddressSpaceAllocatorForbiddenRegion *forbidden_regions, size_t num_forbidden_regions) : m_critical_section(), m_forbidden_region_count(0) {
/* Check pre-conditions. */
AMS_ASSERT(start_address >= guard_size);
AMS_ASSERT(end_address + guard_size >= end_address);