piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 00:59:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Core: Simplify Memory::GetString

Browse Source
This commit is contained in:
Lioncash
2014-08-22 01:02:04 -04:00
parent 48f52b9662
commit 130f57df91
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/Core/HW/Memmap.cpp
View File

@ -279,19 +279,18 @@ void ReadBigEData(u8 *data, const u32 em_address, const u32 size)
memcpy(data, src, size);
}
void GetString(std::string& _string, const u32 em_address)
std::string GetString(u32 em_address)
{
char stringBuffer[2048];
char *string = stringBuffer;
std::string str;
char c;
u32 addr = em_address;
while ((c = Read_U8(addr)))
while ((c = Read_U8(em_address)) != '\0')
{
*string++ = c;
addr++;
str += c;
em_address++;
}
*string++ = '\0';
_string = stringBuffer;
return str;
}
// GetPointer must always return an address in the bottom 32 bits of address space, so that 64-bit