mirror/pineapple
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

early-access version 1776

Browse source
This commit is contained in:
pineappleEA 2021-06-10 22:22:25 +02:00
parent b878f2517c
commit 29215c945d
4 changed files with 19 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,7 +1,7 @@
yuzu emulator early access yuzu emulator early access
============= =============
This is the source code for early-access 1775. This is the source code for early-access 1776.
## Legal Notice ## Legal Notice

7
src/common/host_memory.cpp
View file

@ -59,10 +59,9 @@ using PFN_VirtualAlloc2 = _Ret_maybenull_ PVOID(WINAPI*)(
_Inout_updates_opt_(ParameterCount) MEM_EXTENDED_PARAMETER* ExtendedParameters, _Inout_updates_opt_(ParameterCount) MEM_EXTENDED_PARAMETER* ExtendedParameters,
_In_ ULONG ParameterCount); _In_ ULONG ParameterCount);
using PFN_MapViewOfFile3 = _Ret_maybenull_ __out_data_source(FILE) using PFN_MapViewOfFile3 = _Ret_maybenull_ PVOID(WINAPI*)(
PVOID(WINAPI*)(_In_ HANDLE FileMapping, _In_opt_ HANDLE Process, _In_opt_ PVOID BaseAddress, _In_ HANDLE FileMapping, _In_opt_ HANDLE Process, _In_opt_ PVOID BaseAddress,
_In_ ULONG64 Offset, _In_ SIZE_T ViewSize, _In_ ULONG AllocationType, _In_ ULONG64 Offset, _In_ SIZE_T ViewSize, _In_ ULONG AllocationType, _In_ ULONG PageProtection,
_In_ ULONG PageProtection,
_Inout_updates_opt_(ParameterCount) MEM_EXTENDED_PARAMETER* ExtendedParameters, _Inout_updates_opt_(ParameterCount) MEM_EXTENDED_PARAMETER* ExtendedParameters,
_In_ ULONG ParameterCount); _In_ ULONG ParameterCount);

5
src/core/hle/service/service.h
View file

@ -41,7 +41,10 @@ class ServiceManager;
} }
/// Default number of maximum connections to a server session. /// Default number of maximum connections to a server session.
static constexpr u32 ServerSessionCountMax = 0x10000; static constexpr u32 ServerSessionCountMax = 0x40;
static_assert(ServerSessionCountMax == 0x40,
"ServerSessionCountMax isn't 0x40 somehow, this assert is a reminder that this will "
"break lots of things");
/** /**
* This is an non-templated base of ServiceFramework to reduce code bloat and compilation times, it * This is an non-templated base of ServiceFramework to reduce code bloat and compilation times, it

26
src/core/hle/service/sm/sm.cpp
View file

@ -151,27 +151,19 @@ ResultVal<Kernel::KClientSession*> SM::GetServiceImpl(Kernel::HLERequestContext&
std::string name(PopServiceName(rp)); std::string name(PopServiceName(rp));
// Find the named port. // Find the named port.
auto result = service_manager.GetServicePort(name); auto port_result = service_manager.GetServicePort(name);
if (result.Failed()) { if (port_result.Failed()) {
LOG_ERROR(Service_SM, "called service={} -> error 0x{:08X}", name, result.Code().raw); LOG_ERROR(Service_SM, "called service={} -> error 0x{:08X}", name, port_result.Code().raw);
return result.Code(); return port_result.Code();
} }
auto* port = result.Unwrap(); auto& port = port_result.Unwrap()->GetClientPort();
// Reserve a new session from the process resource limit.
Kernel::KScopedResourceReservation session_reservation(
kernel.CurrentProcess()->GetResourceLimit(), Kernel::LimitableResource::Sessions);
R_UNLESS(session_reservation.Succeeded(), Kernel::ResultLimitReached);
// Create a new session. // Create a new session.
Kernel::KClientSession* session{}; Kernel::KClientSession* session{};
port->GetClientPort().CreateSession(std::addressof(session)); if (const auto result = port.CreateSession(std::addressof(session)); result.IsError()) {
LOG_ERROR(Service_SM, "called service={} -> error 0x{:08X}", name, result.raw);
// Commit the session reservation. return result;
session_reservation.Commit(); }
// Enqueue the session with the named port.
port->EnqueueSession(&session->GetParent()->GetServerSession());
LOG_DEBUG(Service_SM, "called service={} -> session={}", name, session->GetId()); LOG_DEBUG(Service_SM, "called service={} -> session={}", name, session->GetId());