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

IPC_HLE: Replace (const char *)GetPointer(x) with GetString(x)

Browse Source 
Removes 20 instances of GetPointer.
This commit is contained in:
Scott Mansell
2014-10-20 00:32:43 +13:00
committed by Scott Mansell
parent f65bb10c93
commit d77e01e6c4
8 changed files with 60 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -291,18 +291,18 @@ void DMA_MemoryToLC(const u32 _CacheAddr, const u32 _MemAddr, const u32 _iNumBlo
}
}
std::string GetString(u32 em_address)
std::string GetString(u32 em_address, size_t size)
{
std::string str;
char c;
while ((c = Read_U8(em_address)) != '\0')
const char* ptr = reinterpret_cast<const char*>(GetPointer(em_address));
if (size == 0) // Null terminated string.
{
str += c;
em_address++;
return std::string(ptr);
}
else // Fixed size string, potentially null terminated or null padded.
{
size_t length = strnlen(ptr, size);
return std::string(ptr, length);
}
return str;
}
// GetPointer must always return an address in the bottom 32 bits of address space, so that 64-bit
@ -358,7 +358,6 @@ u8 *GetPointer(const u32 _Address)
return nullptr;
}
bool IsRAMAddress(const u32 addr, bool allow_locked_cache, bool allow_fake_vmem)
{
switch ((addr >> 24) & 0xFC)