mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-17 11:24:27 +01:00
Merge branch 'master' into mediaengine
Conflicts: Common/LogManager.cpp Core/CMakeLists.txt Core/Core.vcxproj Core/Core.vcxproj.filters Core/CoreParameter.h Core/HLE/sceAudio.cpp Core/HLE/sceKernel.cpp Core/HLE/sceKernelThread.cpp Core/HLE/sceMpeg.cpp android/jni/Android.mk
This commit is contained in:
commit
bc214dcf37
266 files changed
+19234
-7495
No files matched your search
@@ -515,13 +515,12 @@ void sceKernelAllocateVpl()
|
||||
if (vpl)
|
||||
{
|
||||
u32 size = PARAM(1);
|
||||
u32 *blockPtrPtr = (u32 *)Memory::GetPointer(PARAM(2));
|
||||
int timeOut = PARAM(2);
|
||||
int timeOut = PARAM(3);
|
||||
DEBUG_LOG(HLE,"sceKernelAllocateVpl(vpl=%i, size=%i, ptrout= %08x , timeout=%i)", id, size, PARAM(2), timeOut);
|
||||
u32 addr = vpl->alloc.Alloc(size);
|
||||
if (addr != (u32)-1)
|
||||
{
|
||||
*blockPtrPtr = addr;
|
||||
Memory::Write_U32(addr, PARAM(2));
|
||||
RETURN(0);
|
||||
}
|
||||
else
|
||||
@@ -545,13 +544,12 @@ void sceKernelAllocateVplCB()
|
||||
if (vpl)
|
||||
{
|
||||
u32 size = PARAM(1);
|
||||
u32 *blockPtrPtr = (u32 *)Memory::GetPointer(PARAM(2));
|
||||
int timeOut = PARAM(2);
|
||||
int timeOut = PARAM(3);
|
||||
DEBUG_LOG(HLE,"sceKernelAllocateVplCB(vpl=%i, size=%i, ptrout= %08x , timeout=%i)", id, size, PARAM(2), timeOut);
|
||||
u32 addr = vpl->alloc.Alloc(size);
|
||||
if (addr != (u32)-1)
|
||||
{
|
||||
*blockPtrPtr = addr;
|
||||
Memory::Write_U32(addr, PARAM(2));
|
||||
RETURN(0);
|
||||
}
|
||||
else
|
||||
@@ -576,13 +574,12 @@ void sceKernelTryAllocateVpl()
|
||||
if (vpl)
|
||||
{
|
||||
u32 size = PARAM(1);
|
||||
u32 *blockPtrPtr = (u32 *)Memory::GetPointer(PARAM(2));
|
||||
int timeOut = PARAM(2);
|
||||
int timeOut = PARAM(3);
|
||||
DEBUG_LOG(HLE,"sceKernelAllocateVplCB(vpl=%i, size=%i, ptrout= %08x , timeout=%i)", id, size, PARAM(2), timeOut);
|
||||
u32 addr = vpl->alloc.Alloc(size);
|
||||
if (addr != (u32)-1)
|
||||
{
|
||||
*blockPtrPtr = addr;
|
||||
Memory::Write_U32(addr, PARAM(2));
|
||||
RETURN(0);
|
||||
}
|
||||
else
|
||||
@@ -634,9 +631,8 @@ void sceKernelReferVplStatus()
|
||||
if (v)
|
||||
{
|
||||
DEBUG_LOG(HLE,"sceKernelReferVplStatus(%i, %08x)", id, PARAM(1));
|
||||
SceKernelVplInfo *info = (SceKernelVplInfo*)Memory::GetPointer(PARAM(1));
|
||||
v->nv.freeSize = v->alloc.GetTotalFreeBytes();
|
||||
*info = v->nv;
|
||||
Memory::WriteStruct(PARAM(1), &v->nv);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -692,7 +688,7 @@ const HLEFunction SysMemUserForUser[] =
|
||||
{0xf77d77cb,sceKernelSetCompilerVersion,"sceKernelSetCompilerVersion"},
|
||||
{0x35669d4c,0,"sceKernelSetCompiledSdkVersion600_602"}, //??
|
||||
{0x1b4217bc,0,"sceKernelSetCompiledSdkVersion603_605"},
|
||||
|
||||
{0x358ca1bb,0,"sceKernelSetCompiledSdkVersion606"},
|
||||
// Obscure raw block API
|
||||
{0xDB83A952,GetMemoryBlockPtr,"SysMemUserForUser_DB83A952"}, // GetMemoryBlockAddr
|
||||
{0x91DE343C,0,"SysMemUserForUser_91DE343C"},
|
||||
|
||||
Reference in new issue
Block a user