diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/svc.cpp | 5 | ||||
| -rw-r--r-- | src/core/mem_map_funcs.cpp | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 19f717bd2..8720bed31 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp @@ -5,6 +5,7 @@ #include <map> #include <string> +#include "common/string_util.h" #include "common/symbols.h" #include "core/mem_map.h" @@ -220,9 +221,7 @@ Result CreateThread(u32 priority, u32 entry_point, u32 arg, u32 stack_top, u32 p TSymbol symbol = Symbols::GetSymbol(entry_point); name = symbol.name; } else { - char buff[100]; - sprintf(buff, "%s", "unknown-%08X", entry_point); - name = buff; + name = StringFromFormat("unknown-%08x", entry_point); } Handle thread = Kernel::CreateThread(name.c_str(), entry_point, priority, arg, processor_id, diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp index 5772cca52..ecdaa06d7 100644 --- a/src/core/mem_map_funcs.cpp +++ b/src/core/mem_map_funcs.cpp @@ -289,11 +289,15 @@ void Write64(const u32 addr, const u64 data) { void WriteBlock(const u32 addr, const u8* data, const int size) { int offset = 0; - while (offset < (size & ~3)) - Write32(addr + offset, *(u32*)&data[offset += 4]); + while (offset < (size & ~3)) { + Write32(addr + offset, *(u32*)&data[offset]); + offset += 4; + } - if (size & 2) - Write16(addr + offset, *(u16*)&data[offset += 2]); + if (size & 2) { + Write16(addr + offset, *(u16*)&data[offset]); + offset += 2; + } if (size & 1) Write8(addr + offset, data[offset]); |