Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

PSPPointer<>: Replace some fiddly memsets with use of a new FillWithZero function.

Browse source
This commit is contained in:
Henrik Rydgård 2025-01-05 22:49:17 +01:00
parent cf0c0dab0a
commit 2edc3085a5
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Core/HLE/sceNp.cpp
View file

@ -158,7 +158,7 @@ static int sceNpGetOnlineId(u32 idPtr)
if (!id.IsValid())
return hleLogError(Log::sceNet, SCE_NP_ERROR_INVALID_ARGUMENT, "invalid arg");
memset((SceNpOnlineId *)id, 0, sizeof(SceNpOnlineId));
id.FillWithZero();
truncate_cpy(id->data, sizeof(id->data), npOnlineId.c_str());
id.NotifyWrite("NpGetOnlineId");
@ -182,7 +182,7 @@ static int sceNpGetNpId(u32 idPtr)
return hleLogError(Log::sceNet, SCE_NP_ERROR_INVALID_ARGUMENT, "invalid arg");
SceNpId dummyNpId{};
memset((SceNpId *)id, 0, sizeof(SceNpId));
id.FillWithZero();
int retval = NpGetNpId(id);
if (retval < 0)
return hleLogError(Log::sceNet, retval);
@ -205,9 +205,9 @@ static int sceNpGetAccountRegion(u32 countryCodePtr, u32 regionCodePtr)
if (!countryCode.IsValid() || !regionCode.IsValid())
return hleLogError(Log::sceNet, SCE_NP_ERROR_INVALID_ARGUMENT, "invalid arg");
memset((SceNpCountryCode *)countryCode, 0, sizeof(SceNpCountryCode));
countryCode.FillWithZero();
memcpy(countryCode->data, npCountryCode, sizeof(countryCode->data));
memset((SceNpCountryCode *)regionCode, 0, sizeof(SceNpCountryCode));
regionCode.FillWithZero();
memcpy(regionCode->data, npRegionCode, sizeof(regionCode->data));
INFO_LOG(Log::sceNet, "%s - Country Code: %s", __FUNCTION__, countryCode->data);
@ -245,7 +245,7 @@ static int sceNpGetUserProfile(u32 profilePtr)
if (!Memory::IsValidAddress(profilePtr))
return hleLogError(Log::sceNet, SCE_NP_ERROR_INVALID_ARGUMENT, "invalid arg");
memset((SceNpUserInformation *)profile, 0, sizeof(SceNpUserInformation));
profile.FillWithZero();
truncate_cpy(profile->userId.handle.data, sizeof(profile->userId.handle.data), npOnlineId.c_str());
truncate_cpy(profile->icon.data, sizeof(profile->icon.data), npAvatarUrl.c_str());

4
Core/MemMap.cpp
View file

@ -497,7 +497,9 @@ void Memset(const u32 _Address, const u8 _iValue, const u32 _iLength, const char
Write_U8(_iValue, (u32)(_Address + i));
}
NotifyMemInfo(MemBlockFlags::WRITE, _Address, _iLength, tag, strlen(tag));
if (tag) {
NotifyMemInfo(MemBlockFlags::WRITE, _Address, _iLength, tag, strlen(tag));
}
}
} // namespace

4
Core/MemMap.h
View file

@ -499,6 +499,10 @@ struct PSPPointer
return Memory::IsValidRange(ptr, (u32)sizeof(T));
}
void FillWithZero() {
memset(Memory::GetPointerWrite(ptr), 0, sizeof(T));
}
T *PtrOrNull() {
if (IsValid())
return (T *)*this;