thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Address Unknown's feedback

Browse source 
https://github.com/hrydgard/ppsspp/pull/7965/files
This commit is contained in:
Henrik Rydgård 2019-08-08 17:13:47 +02:00
parent 3604a92bee
commit bf73d3d663
14 changed files with 147 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -1590,6 +1590,8 @@ add_library(${CoreLibName} ${CoreLinkType}
Core/HLE/sceKernelAlarm.h
Core/HLE/sceKernelEventFlag.cpp
Core/HLE/sceKernelEventFlag.h
Core/HLE/sceKernelHeap.cpp
Core/HLE/sceKernelHeap.h
Core/HLE/sceKernelInterrupt.cpp
Core/HLE/sceKernelInterrupt.h
Core/HLE/sceKernelMbx.cpp

2
Core/Core.vcxproj
View file

@ -371,6 +371,7 @@
<ClCompile Include="Debugger\WebSocket\WebSocketUtils.cpp" />
<ClCompile Include="FileSystems\BlobFileSystem.cpp" />
<ClCompile Include="HLE\KUBridge.cpp" />
<ClCompile Include="HLE\sceKernelHeap.cpp" />
<ClCompile Include="HLE\sceUsbAcc.cpp" />
<ClCompile Include="HLE\sceUsbCam.cpp" />
<ClCompile Include="HLE\sceUsbMic.cpp" />
@ -899,6 +900,7 @@
<ClInclude Include="FileSystems\BlobFileSystem.h" />
<ClInclude Include="HLE\KernelThreadDebugInterface.h" />
<ClInclude Include="HLE\KUBridge.h" />
<ClInclude Include="HLE\sceKernelHeap.h" />
<ClInclude Include="HLE\sceUsbAcc.h" />
<ClInclude Include="HLE\sceUsbCam.h" />
<ClInclude Include="HLE\sceUsbMic.h" />

6
Core/Core.vcxproj.filters
View file

@ -740,6 +740,9 @@
<ClCompile Include="HW\Camera.cpp">
<Filter>HW</Filter>
</ClCompile>
<ClCompile Include="HLE\sceKernelHeap.cpp">
<Filter>HLE\Kernel</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="ELF\ElfReader.h">
@ -1373,6 +1376,9 @@
<ClInclude Include="HW\Camera.h">
<Filter>HW</Filter>
</ClInclude>
<ClInclude Include="HLE\sceKernelHeap.h">
<Filter>HLE\Kernel</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="CMakeLists.txt" />

27
Core/HLE/sceKernel.cpp
View file

@ -904,28 +904,6 @@ void Register_LoadExecForKernel()
RegisterModule("LoadExecForKernel", ARRAY_SIZE(LoadExecForKernel), LoadExecForKernel);
}
static int sceKernelCreateHeap(int partitionId, int size, int flags, const char *Name)
{
return hleLogError(SCEKERNEL, 0, "");
}
static int sceKernelAllocHeapMemory(int heapId, int size)
{
return hleLogError(SCEKERNEL, 0, "");
}
static int sceKernelDeleteHeap(int heapId)
{
return hleLogError(SCEKERNEL, 0, "");
}
const HLEFunction SysMemForKernel[] =
{
{0X636C953B, &WrapI_II<sceKernelAllocHeapMemory>, "sceKernelAllocHeapMemory", 'I', "ii" },
{0XC9805775, &WrapI_I<sceKernelDeleteHeap>, "sceKernelDeleteHeap", 'I', "i" },
{0X1C1FBFE7, &WrapI_IIIC<sceKernelCreateHeap>, "sceKernelCreateHeap", 'I', "iiis" },
};
const HLEFunction ExceptionManagerForKernel[] =
{
{0X3FB264FC, nullptr, "sceKernelRegisterExceptionHandler", '?', "" },
@ -976,8 +954,3 @@ void Register_ThreadManForKernel()
{
RegisterModule("ThreadManForKernel", ARRAY_SIZE(ThreadManForKernel), ThreadManForKernel);
}
void Register_LoadExecForKernel()
{
RegisterModule("LoadExecForKernel", ARRAY_SIZE(LoadExecForKernel), LoadExecForKernel);
}

1
Core/HLE/sceKernel.h
View file

@ -340,6 +340,7 @@ enum TMIDPurpose
PPSSPP_KERNEL_TMID_PMB = 0x100002,
PPSSPP_KERNEL_TMID_File = 0x100003,
PPSSPP_KERNEL_TMID_DirList = 0x100004,
PPSSPP_KERNEL_TMID_Heap = 0x100005,
};
typedef int SceUID;

115
Core/HLE/sceKernelHeap.cpp Normal file
View file

@ -0,0 +1,115 @@
#pragma once
#include <string>
#include "Common/ChunkFile.h"
#include "Core/HLE/HLE.h"
#include "Core/HLE/FunctionWrappers.h"
#include "Core/HLE/sceKernel.h"
#include "Core/HLE/sceKernelHeap.h"
#include "Core/HLE/sceKernelMemory.h"
#include "Core/Util/BlockAllocator.h"
struct HeapInformation : public KernelObject {
int uid = 0;
int partitionId = 0;
u32 size = 0;
int flags = 0;
u32 address = 0;
std::string name;
BlockAllocator alloc;
static u32 GetMissingErrorCode() { return SCE_KERNEL_ERROR_UNKNOWN_UID; }
static int GetStaticIDType() { return PPSSPP_KERNEL_TMID_Heap; }
int GetIDType() const override { return PPSSPP_KERNEL_TMID_Heap; }
void DoState(PointerWrap &p) {
p.Do(uid);
p.Do(partitionId);
p.Do(size);
p.Do(flags);
p.Do(address);
p.Do(name);
p.Do(alloc);
}
};
std::map<u32, HeapInformation *> heapInformationList;
void __HeapInformationDoState(PointerWrap &p) {
auto s = p.Section("kernelHeap", 1);
if (!s)
return;
if (s >= 1) {
p.Do(heapInformationList);
}
}
static HeapInformation *getHeap(u32 heapId) {
auto found = heapInformationList.find(heapId);
if (found == heapInformationList.end()) {
return NULL;
}
return found->second;
}
const u32 HEAP_BLOCK_HEADER_SIZE = 8;
const bool frombottom = false;
static int sceKernelCreateHeap(int partitionId, int size, int flags, const char *Name) {
HeapInformation *heap = new HeapInformation;
heap->partitionId = partitionId;
heap->flags = flags;
heap->name = *Name;
int allocSize = (size + 3) & ~3;
heap->size = allocSize;
u32 addr = userMemory.Alloc(heap->size, frombottom, "SysMemForKernel-Heap");
if (addr == (u32)-1) {
ERROR_LOG(HLE, "sceKernelCreateHeap(): Failed to allocate %i bytes memory", size);
heap->uid = -1;
delete heap;
}
heap->address = addr;
heap->alloc.Init(heap->address + 128, heap->size - 128);
SceUID uid = kernelObjects.Create(heap);
heap->uid = uid;
heapInformationList[uid] = heap;
return hleLogSuccessInfoX(SCEKERNEL, uid, "");
}
static int sceKernelAllocHeapMemory(int heapId, int size) {
HeapInformation *heap = getHeap(heapId);
if (!heap) {
ERROR_LOG(HLE, "sceKernelAllocHeapMemory cannot find heapId", heapId);
return 0;
}
// There's 8 bytes at the end of every block, reserved.
u32 memSize = HEAP_BLOCK_HEADER_SIZE + size;
u32 addr = heap->alloc.Alloc(memSize, true);
return hleLogSuccessInfoX(SCEKERNEL, addr, "");
}
static int sceKernelDeleteHeap(int heapId) {
HeapInformation *heap = getHeap(heapId);
if (!heap) {
ERROR_LOG(HLE, "sceKernelDeleteHeap(%i): invalid heapId", heapId);
return -1;
}
userMemory.Free(heap->address);
kernelObjects.Destroy<HeapInformation>(heap->uid);
heapInformationList.erase(heapId);
return hleLogSuccessInfoX(SCEKERNEL, 0, "");
}
const HLEFunction SysMemForKernel[] =
{
{ 0X636C953B, &WrapI_II<sceKernelAllocHeapMemory>, "sceKernelAllocHeapMemory", 'I', "ii" },
{ 0XC9805775, &WrapI_I<sceKernelDeleteHeap>, "sceKernelDeleteHeap", 'I', "i" },
{ 0X1C1FBFE7, &WrapI_IIIC<sceKernelCreateHeap>, "sceKernelCreateHeap", 'I', "iiis" },
};
void Register_SysMemForKernel() {
RegisterModule("SysMemForKernel", ARRAY_SIZE(SysMemForKernel), SysMemForKernel);
}

5
Core/HLE/sceKernelHeap.h Normal file
View file

@ -0,0 +1,5 @@
#pragma once
int sceKernelCreateHeap(int partitionId, int size, int flags, const char *Name);
int sceKernelAllocHeapMemory(int heapId, int size);
int sceKernelDeleteHeap(int heapId);

122
Core/HLE/sceKernelMemory.cpp
View file

@ -2287,128 +2287,6 @@ const HLEFunction SysMemUserForUser[] = {
{0XD8DE5C1E, &WrapU_V<SysMemUserForUser_D8DE5C1E>, "SysMemUserForUser_D8DE5C1E", 'x', "" },
};
const HLEFunction SysMemForKernel[] = {
{0x636C953B, nullptr, "SysMemForKernel_636c953b", '?', "" },
{0xC9805775, nullptr, "SysMemForKernel_c9805775", '?', "" },
{0x1C1FBFE7, nullptr, "SysMemForKernel_1c1fbfe7", '?', "" },
};
void Register_SysMemForKernel() {
RegisterModule("SysMemForKernel", ARRAY_SIZE(SysMemForKernel), SysMemForKernel);
}
void Register_SysMemUserForUser() {
RegisterModule("SysMemUserForUser", ARRAY_SIZE(SysMemUserForUser), SysMemUserForUser);
}
struct HeapInformation : public KernelObject {
HeapInformation() {}
int uid;
int partitionId;
u32 size;
int flags;
u32 address;
std::string name;
BlockAllocator alloc;
static int GetStaticIDType() { return SCE_KERNEL_TMID_Fpl; }// wrong
int GetIDType() const override { return SCE_KERNEL_TMID_Fpl; }// wrong
void DoState(PointerWrap &p) {
p.Do(uid);
p.Do(partitionId);
p.Do(size);
p.Do(flags);
p.Do(address);
p.Do(name);
p.Do(alloc);
}
};
std::map<u32, HeapInformation *> heapInformationList;
void __HeapInformationDoState(PointerWrap &p) {
auto s = p.Section("kernelHeap", 1);
if (!s)
return;
if (s >= 1) {
p.Do(heapInformationList);
}
}
static HeapInformation *getHeap(u32 heapId) {
auto found = heapInformationList.find(heapId);
if (found == heapInformationList.end()) {
return NULL;
}
return found->second;
}
const u32 HEAP_BLOCK_HEADER_SIZE = 8;
const bool frombottom = false;
static int sceKernelCreateHeap(int partitionId, int size, int flags, const char *Name)
{
HeapInformation *heap = new HeapInformation;
heap->partitionId = partitionId;
heap->flags = flags;
heap->name = *Name;
int allocSize = (size + 3) & ~3;
heap->size = allocSize;
u32 addr = userMemory.Alloc(heap->size, frombottom, "SysMemForKernel-Heap");
if (addr == (u32)-1) {
ERROR_LOG(HLE, "sceKernelCreateHeap(): Failed to allocate %i bytes memory", size);
heap->uid = -1;
delete heap;
}
heap->address = addr;
heap->alloc.Init(heap->address + 128, heap->size - 128);
SceUID uid = kernelObjects.Create(heap);
heap->uid = uid;
heapInformationList[uid] = heap;
return hleLogSuccessInfoX(SCEKERNEL, uid, "");
}
static int sceKernelAllocHeapMemory(int heapId, int size)
{
HeapInformation *heap = getHeap(heapId);
if (!heap) {
ERROR_LOG(HLE, "sceKernelAllocHeapMemory cannot find heapId", heapId);
return 0;
}
// There's 8 bytes at the end of every block, reserved.
u32 memSize = HEAP_BLOCK_HEADER_SIZE + size;
u32 addr = heap->alloc.Alloc(memSize, true);
return hleLogSuccessInfoX(SCEKERNEL, addr, "");
}
static int sceKernelDeleteHeap(int heapId)
{
HeapInformation *heap = getHeap(heapId);
if (!heap) {
ERROR_LOG(HLE, "sceKernelDeleteHeap(%i): invalid heapId", heapId);
return -1;
}
userMemory.Free(heap->address);
kernelObjects.Destroy<FPL>(heap->uid);
heapInformationList.erase(heapId);
return hleLogSuccessInfoX(SCEKERNEL, 0, "");
}
const HLEFunction SysMemForKernel[] =
{
{ 0X636C953B, &WrapI_II<sceKernelAllocHeapMemory>, "sceKernelAllocHeapMemory", 'I', "ii" },
{ 0XC9805775, &WrapI_I<sceKernelDeleteHeap>, "sceKernelDeleteHeap", 'I', "i" },
{ 0X1C1FBFE7, &WrapI_IIIC<sceKernelCreateHeap>, "sceKernelCreateHeap", 'I', "iiis" },
};
void Register_SysMemForKernel()
{
RegisterModule("SysMemForKernel", ARRAY_SIZE(SysMemForKernel), SysMemForKernel);
}

2
Core/HLE/sceKernelMemory.h
View file

@ -68,5 +68,3 @@ int sceKernelReferTlsplStatus(SceUID uid, u32 infoPtr);
void Register_SysMemForKernel();
void Register_SysMemUserForUser();
void Register_SysMemForKernel();

4
Core/HLE/sceKernelThread.h
View file

@ -330,3 +330,7 @@ KernelObject *__KernelThreadEventHandlerObject();
SceUID sceKernelRegisterThreadEventHandler(const char *name, SceUID threadID, u32 mask, u32 handlerPtr, u32 commonArg);
int sceKernelReleaseThreadEventHandler(SceUID uid);
int sceKernelReferThreadEventHandlerStatus(SceUID uid, u32 infoPtr);
int sceKernelCreateHeap(int partitionId, int size, int flags, const char *Name);
int sceKernelAllocHeapMemory(int heapId, int size);
int sceKernelDeleteHeap(int heapId);

2
UWP/CoreUWP/CoreUWP.vcxproj
View file

@ -466,6 +466,7 @@
<ClInclude Include="..\..\Core\HLE\sceKernelAlarm.h" />
<ClInclude Include="..\..\Core\HLE\sceKernelEventFlag.h" />
<ClInclude Include="..\..\Core\HLE\sceKernelInterrupt.h" />
<ClInclude Include="..\..\Core\HLE\sceKernelHeap.h" />
<ClInclude Include="..\..\Core\HLE\sceKernelMbx.h" />
<ClInclude Include="..\..\Core\HLE\sceKernelMemory.h" />
<ClInclude Include="..\..\Core\HLE\sceKernelModule.h" />
@ -678,6 +679,7 @@
<ClCompile Include="..\..\Core\HLE\sceKernelAlarm.cpp" />
<ClCompile Include="..\..\Core\HLE\sceKernelEventFlag.cpp" />
<ClCompile Include="..\..\Core\HLE\sceKernelInterrupt.cpp" />
<ClCompile Include="..\..\Core\HLE\sceKernelHeap.cpp" />
<ClCompile Include="..\..\Core\HLE\sceKernelMbx.cpp" />
<ClCompile Include="..\..\Core\HLE\sceKernelMemory.cpp" />
<ClCompile Include="..\..\Core\HLE\sceKernelModule.cpp" />

6
UWP/CoreUWP/CoreUWP.vcxproj.filters
View file

@ -368,6 +368,9 @@
<ClCompile Include="..\..\Core\HLE\sceKernelInterrupt.cpp">
<Filter>HLE</Filter>
</ClCompile>
<ClCompile Include="..\..\Core\HLE\sceKernelHeap.cpp">
<Filter>HLE</Filter>
</ClCompile>
<ClCompile Include="..\..\Core\HLE\sceKernelMbx.cpp">
<Filter>HLE</Filter>
</ClCompile>
@ -968,6 +971,9 @@
<ClInclude Include="..\..\Core\HLE\sceKernelInterrupt.h">
<Filter>HLE</Filter>
</ClInclude>
<ClInclude Include="..\..\Core\HLE\sceKernelHeap.h">
<Filter>HLE</Filter>
</ClInclude>
<ClInclude Include="..\..\Core\HLE\sceKernelMbx.h">
<Filter>HLE</Filter>
</ClInclude>

1
android/jni/Android.mk
View file

@ -360,6 +360,7 @@ EXEC_AND_LIB_FILES := \
$(SRC)/Core/HLE/sceKernel.cpp \
$(SRC)/Core/HLE/sceKernelAlarm.cpp \
$(SRC)/Core/HLE/sceKernelEventFlag.cpp \
$(SRC)/Core/HLE/sceKernelHeap.cpp \
$(SRC)/Core/HLE/sceKernelInterrupt.cpp \
$(SRC)/Core/HLE/sceKernelMemory.cpp \
$(SRC)/Core/HLE/sceKernelModule.cpp \

1
libretro/Makefile.common
View file

@ -389,6 +389,7 @@ SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \
$(COREDIR)/HLE/sceKernel.cpp \
$(COREDIR)/HLE/sceKernelAlarm.cpp \
$(COREDIR)/HLE/sceKernelEventFlag.cpp \
$(COREDIR)/HLE/sceKernelHeap.cpp \
$(COREDIR)/HLE/sceKernelInterrupt.cpp \
$(COREDIR)/HLE/sceKernelMbx.cpp \
$(COREDIR)/HLE/sceKernelMemory.cpp \