etc/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1304 from lioncash/str

Browse source 
svc: Do nothing in svcOutputDebugString() if given a length of zero
This commit is contained in:
bunnei 2018-09-12 12:10:14 -04:00 committed by GitHub
commit 0821a210c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/hle/kernel/svc.cpp
View file

@ -273,7 +273,11 @@ static void Break(u64 reason, u64 info1, u64 info2) {
} }
/// 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(VAddr address, s32 len) { static void OutputDebugString(VAddr address, u64 len) {
if (len == 0) {
return;
}
std::string str(len, '\0'); std::string str(len, '\0');
Memory::ReadBlock(address, str.data(), str.size()); Memory::ReadBlock(address, str.data(), str.size());
LOG_DEBUG(Debug_Emulated, "{}", str); LOG_DEBUG(Debug_Emulated, "{}", str);

4
src/core/hle/kernel/svc_wrap.h
View file

@ -222,9 +222,9 @@ void SvcWrap() {
func((s64)PARAM(0)); func((s64)PARAM(0));
} }
template <void func(u64, s32 len)> template <void func(u64, u64 len)>
void SvcWrap() { void SvcWrap() {
func(PARAM(0), (s32)(PARAM(1) & 0xFFFFFFFF)); func(PARAM(0), PARAM(1));
} }
template <void func(u64, u64, u64)> template <void func(u64, u64, u64)>