diff options
| author | Subv <subv2112@gmail.com> | 2017-10-04 18:52:39 +0200 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2017-10-04 19:30:33 +0200 |
| commit | 3c0113632dc4fb4e55b5dad9278a5b766dcaec14 (patch) | |
| tree | 5f78f0f8a334a1dbe8e407ed5ef8809241a6b639 /src/core/hle | |
| parent | SVC: Replace GetPointer usage with Read32 in ReplyAndReceive. (diff) | |
| download | yuzu-3c0113632dc4fb4e55b5dad9278a5b766dcaec14.tar yuzu-3c0113632dc4fb4e55b5dad9278a5b766dcaec14.tar.gz yuzu-3c0113632dc4fb4e55b5dad9278a5b766dcaec14.tar.bz2 yuzu-3c0113632dc4fb4e55b5dad9278a5b766dcaec14.tar.lz yuzu-3c0113632dc4fb4e55b5dad9278a5b766dcaec14.tar.xz yuzu-3c0113632dc4fb4e55b5dad9278a5b766dcaec14.tar.zst yuzu-3c0113632dc4fb4e55b5dad9278a5b766dcaec14.zip | |
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/function_wrappers.h | 4 | ||||
| -rw-r--r-- | src/core/hle/svc.cpp | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/core/hle/function_wrappers.h b/src/core/hle/function_wrappers.h index cd500e83d..cb0b430ee 100644 --- a/src/core/hle/function_wrappers.h +++ b/src/core/hle/function_wrappers.h @@ -267,9 +267,9 @@ void Wrap() { func(((s64)PARAM(1) << 32) | PARAM(0)); } -template <void func(const char*, int len)> +template <void func(VAddr, int len)> void Wrap() { - func((char*)Memory::GetPointer(PARAM(0)), PARAM(1)); + func(PARAM(0), PARAM(1)); } template <void func(u8)> diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 61360bede..37eeeb860 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp @@ -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 -static void OutputDebugString(const char* string, int len) { - LOG_DEBUG(Debug_Emulated, "%.*s", len, string); +static void OutputDebugString(VAddr address, int len) { + std::vector<char> string(len); + Memory::ReadBlock(address, string.data(), len); + LOG_DEBUG(Debug_Emulated, "%.*s", len, string.data()); } /// Get resource limit |