diff options
| author | 2018-09-30 15:32:27 -0400 | |
|---|---|---|
| committer | 2018-09-30 15:32:27 -0400 | |
| commit | 5e2f23e2b185475c3ce7ae1750ec14daefcd3e08 (patch) | |
| tree | ac2c341c94976552acd507359e8853105193d288 /src/core/hle/service | |
| parent | Merge pull request #1418 from FearlessTobi/port-4269 (diff) | |
| parent | kernel/svc: Implement svcGetThreadContext() (diff) | |
| download | yuzu-5e2f23e2b185475c3ce7ae1750ec14daefcd3e08.tar.gz yuzu-5e2f23e2b185475c3ce7ae1750ec14daefcd3e08.tar.xz yuzu-5e2f23e2b185475c3ce7ae1750ec14daefcd3e08.zip | |
Merge pull request #1417 from lioncash/context
svc: Implement svcGetThreadContext
Diffstat (limited to 'src/core/hle/service')
| -rw-r--r-- | src/core/hle/service/fatal/fatal.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/ns/pl_u.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/fatal/fatal.cpp b/src/core/hle/service/fatal/fatal.cpp index 2212b2cdd..2f15ac2a6 100644 --- a/src/core/hle/service/fatal/fatal.cpp +++ b/src/core/hle/service/fatal/fatal.cpp | |||
| @@ -51,7 +51,7 @@ enum class FatalType : u32 { | |||
| 51 | }; | 51 | }; |
| 52 | 52 | ||
| 53 | static void GenerateErrorReport(ResultCode error_code, const FatalInfo& info) { | 53 | static void GenerateErrorReport(ResultCode error_code, const FatalInfo& info) { |
| 54 | const auto title_id = Core::CurrentProcess()->program_id; | 54 | const auto title_id = Core::CurrentProcess()->GetTitleID(); |
| 55 | std::string crash_report = | 55 | std::string crash_report = |
| 56 | fmt::format("Yuzu {}-{} crash report\n" | 56 | fmt::format("Yuzu {}-{} crash report\n" |
| 57 | "Title ID: {:016x}\n" | 57 | "Title ID: {:016x}\n" |
diff --git a/src/core/hle/service/ns/pl_u.cpp b/src/core/hle/service/ns/pl_u.cpp index 1069d103f..4b2f758a8 100644 --- a/src/core/hle/service/ns/pl_u.cpp +++ b/src/core/hle/service/ns/pl_u.cpp | |||
| @@ -317,9 +317,9 @@ void PL_U::GetSharedMemoryAddressOffset(Kernel::HLERequestContext& ctx) { | |||
| 317 | 317 | ||
| 318 | void PL_U::GetSharedMemoryNativeHandle(Kernel::HLERequestContext& ctx) { | 318 | void PL_U::GetSharedMemoryNativeHandle(Kernel::HLERequestContext& ctx) { |
| 319 | // Map backing memory for the font data | 319 | // Map backing memory for the font data |
| 320 | Core::CurrentProcess()->vm_manager.MapMemoryBlock(SHARED_FONT_MEM_VADDR, impl->shared_font, 0, | 320 | Core::CurrentProcess()->VMManager().MapMemoryBlock(SHARED_FONT_MEM_VADDR, impl->shared_font, 0, |
| 321 | SHARED_FONT_MEM_SIZE, | 321 | SHARED_FONT_MEM_SIZE, |
| 322 | Kernel::MemoryState::Shared); | 322 | Kernel::MemoryState::Shared); |
| 323 | 323 | ||
| 324 | // Create shared font memory object | 324 | // Create shared font memory object |
| 325 | auto& kernel = Core::System::GetInstance().Kernel(); | 325 | auto& kernel = Core::System::GetInstance().Kernel(); |