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

Implement sceHeapIsAllocatedHeapMemory().

Browse source
This commit is contained in:
Unknown W. Brackets 2013-10-13 19:01:16 -07:00
parent 8ffcc26f89
commit ba5dd0084b
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Core/HLE/sceHeap.cpp
View file

@ -82,8 +82,11 @@ int sceHeapFreeHeapMemory(u32 heapAddr, u32 memAddr) {
if (!Memory::IsValidAddress(memAddr))
return SCE_KERNEL_ERROR_ILLEGAL_ADDR;
Heap *heap = getHeap(heapAddr);
if (!heap)
if (!heap) {
ERROR_LOG(HLE, "sceHeapFreeHeapMemory(%08x, %08x): invalid heap", heapAddr, memAddr);
return SCE_KERNEL_ERROR_INVALID_ID;
}
if(!heap->alloc.FreeExact(memAddr))
return SCE_KERNEL_ERROR_INVALID_POINTER;
@ -99,8 +102,11 @@ int sceHeapGetMallinfo(u32 heapAddr, u32 infoPtr) {
int sceHeapAllocHeapMemoryWithOption(u32 heapAddr, u32 memSize, u32 paramsPtr) {
Heap *heap = getHeap(heapAddr);
u32 grain = 4;
if (!heap)
if (!heap) {
ERROR_LOG(HLE, "sceHeapAllocHeapMemoryWithOption(%08x, %08x, %08x): invalid heap", heapAddr, memSize, paramsPtr);
return SCE_KERNEL_ERROR_INVALID_ID;
}
if (Memory::Read_U32(paramsPtr) == 8)
grain = Memory::Read_U32(paramsPtr + 4);
u32 addr = heap->alloc.AllocAligned(memSize,grain,grain,heap->fromtop);
@ -125,7 +131,18 @@ int sceHeapGetTotalFreeSize(u32 heapAddr) {
}
int sceHeapIsAllocatedHeapMemory(u32 heapPtr, u32 memPtr) {
ERROR_LOG_REPORT(HLE,"UNIMPL sceHeapIsAllocatedHeapMemory(%08x, %08x)", heapPtr, memPtr);
if (!Memory::IsValidAddress(memPtr)) {
ERROR_LOG(HLE, "sceHeapIsAllocatedHeapMemory(%08x, %08x): invalid address", heapPtr, memPtr);
return SCE_KERNEL_ERROR_INVALID_POINTER;
}
DEBUG_LOG(HLE, "sceHeapIsAllocatedHeapMemory(%08x, %08x)", heapPtr, memPtr);
Heap *heap = getHeap(heapPtr);
// An invalid heap is fine, it's not a member of this heap one way or another.
// Only an exact address matches. Off by one crashes, and off by 4 says no.
if (heap && heap->alloc.GetBlockStartFromAddress(memPtr) == memPtr) {
return 1;
}
return 0;
}