OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-12-20 16:00:08 +00:00
Code Issues Projects Releases Wiki Activity

SVC: Replace GetPointer usage with ReadBlock in OutputDebugString.

Browse Source
This commit is contained in:
Subv 2017-10-04 11:52:39 -05:00
parent 0cfb231e00
commit 3c0113632d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/hle/function_wrappers.h
View File

@ -267,9 +267,9 @@ void Wrap() {
func(((s64)PARAM(1) << 32) | PARAM(0)); func(((s64)PARAM(1) << 32) | PARAM(0));
} }
template <void func(const char*, int len)> template <void func(VAddr, int len)>
void Wrap() { void Wrap() {
func((char*)Memory::GetPointer(PARAM(0)), PARAM(1)); func(PARAM(0), PARAM(1));
} }
template <void func(u8)> template <void func(u8)>

6
src/core/hle/svc.cpp
View File

@ -619,8 +619,10 @@ static void Break(u8 break_reason) {
} }
/// Used to output a message on a debug hardware unit - does nothing on a retail unit /// Used to output a message on a debug hardware unit - does nothing on a retail unit
static void OutputDebugString(const char* string, int len) { static void OutputDebugString(VAddr address, int len) {
LOG_DEBUG(Debug_Emulated, "%.*s", len, string); std::vector<char> string(len);
Memory::ReadBlock(address, string.data(), len);
LOG_DEBUG(Debug_Emulated, "%.*s", len, string.data());
} }
/// Get resource limit /// Get resource limit