catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Started implementing Ult library

This commit is contained in:
Nokk 2024-07-09 14:04:40 +10:00
parent ab6a1fb5f0
commit 4b18660452
7 changed files with 234 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -214,6 +214,8 @@ set(NP_LIBS src/core/libraries/np_manager/np_manager.cpp
)
set(MISC_LIBS src/core/libraries/screenshot/screenshot.cpp
src/core/libraries/screenshot/screenshot.h
src/core/libraries/ult/ult.cpp
src/core/libraries/ult/ult.h
)
set(COMMON src/common/logging/backend.cpp

1
src/common/logging/filter.cpp
View File

@ -100,6 +100,7 @@ bool ParseFilterRule(Filter& instance, Iterator begin, Iterator end) {
SUB(Lib, NpScore) \
SUB(Lib, NpTrophy) \
SUB(Lib, Screenshot) \
SUB(Lib, Ult) \
SUB(Lib, LibCInternal) \
SUB(Lib, AppContent) \
SUB(Lib, Rtc) \

1
src/common/logging/types.h
View File

@ -67,6 +67,7 @@ enum class Class : u8 {
Lib_NpScore, ///< The LibSceNpScore implementation
Lib_NpTrophy, ///< The LibSceNpTrophy implementation
Lib_Screenshot, ///< The LibSceScreenshot implementation
Lib_Ult, ///< The LibSceUlt implementation
Lib_LibCInternal, ///< The LibCInternal implementation.
Lib_AppContent, ///< The LibSceAppContent implementation.
Lib_Rtc, ///< The LibSceRtc implementation.

7
src/core/libraries/error_codes.h
View File

@ -456,3 +456,10 @@ constexpr int ORBIS_NP_TROPHY_ERROR_CONTEXT_EXCEEDS_MAX = 0x80551622;
// AppContent library
constexpr int ORBIS_APP_CONTENT_ERROR_PARAMETER = 0x80D90002;
// Ult Library
constexpr int ORBIS_ULT_ERROR_STATE = 0x80810006;
constexpr int ORBIS_ULT_ERROR_NULL = 0x80810001;
constexpr int ORBIS_ULT_ERROR_ALIGNMENT = 0x80810002;
constexpr int ORBIS_ULT_ERROR_INVALID = 0x80810004;
constexpr int ORBIS_ULT_ERROR_NOT_INITIALIZE = 0x8081000A;

2
src/core/libraries/libs.cpp
View File

@ -23,6 +23,7 @@
#include "core/libraries/rtc/rtc.h"
#include "core/libraries/save_data/savedata.h"
#include "core/libraries/screenshot/screenshot.h"
#include "core/libraries/ult/ult.h"
#include "core/libraries/system/commondialog.h"
#include "core/libraries/system/msgdialog.h"
#include "core/libraries/system/posix.h"
@ -65,6 +66,7 @@ void InitHLELibs(Core::Loader::SymbolsResolver* sym) {
Libraries::NpScore::RegisterlibSceNpScore(sym);
Libraries::NpTrophy::RegisterlibSceNpTrophy(sym);
Libraries::ScreenShot::RegisterlibSceScreenShot(sym);
Libraries::Ult::RegisterlibSceUlt(sym);
Libraries::AppContent::RegisterlibSceAppContent(sym);
Libraries::PngDec::RegisterlibScePngDec(sym);
Libraries::PlayGo::RegisterlibScePlayGo(sym);

127
src/core/libraries/ult/ult.cpp Normal file
View File

@ -0,0 +1,127 @@
// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#include "common/logging/log.h"
#include "core/libraries/error_codes.h"
#include "core/libraries/libs.h"
#include "ult.h"
namespace Libraries::Ult {
bool isUltInitialized = false;
int PS4_SYSV_ABI sceUltInitialize() {
LOG_INFO(Lib_Ult, "called");
if (isUltInitialized) {
return ORBIS_ULT_ERROR_STATE;
}
isUltInitialized = true;
return ORBIS_OK;
}
int PS4_SYSV_ABI _sceUltUlthreadRuntimeCreate(OrbisUltUlthreadRuntime* runtime, const char* name,
uint32_t maxNumUlthread, uint32_t numWorkerThread,
void* workArea,
OrbisUltUlthreadRuntimeOptParam* optParam) {
LOG_ERROR(Lib_Ult, "(STUBBED) called");
return ORBIS_OK;
}
int PS4_SYSV_ABI _sceUltUlthreadCreate(OrbisUltUlthread* ulthread, const char* name,
OrbisUltUlthreadEntry entry, uint64_t arg, void* context,
uint64_t sizeContext, OrbisUltUlthreadRuntime* runtime,
OrbisUltUlthreadOptParam* optParam) {
LOG_ERROR(Lib_Ult, "(STUBBED) called");
return ORBIS_OK;
}
int PS4_SYSV_ABI _sceUltWaitingQueueResourcePoolCreate(
OrbisUltWaitingQueueResourcePool* pool, const char* name,
uint32_t numThreads, uint32_t numSyncObjects,
void* workArea,
OrbisUltWaitingQueueResourcePoolOptParam* optParam)
{
LOG_ERROR(Lib_Ult, "(STUBBED) called");
if (pool == nullptr)
return ORBIS_ULT_ERROR_NULL;
if (name != nullptr)
LOG_INFO(Lib_Ult, "Creating WaitingQueueResourcePool for {}", name);
// TODO: Check memory alignment
// TODO: Set ORBIS_ULT_ERROR_NOT_INITIALIZE
if (optParam != nullptr)
{
// TODO: Check memory alignment
// TODO: FUN_0100678(optParam)
}
// TODO: FUN_01011b10(&pool->field41_0x30,numThreads,numSyncObjects,(long)workArea);
if (numThreads > 0 && numSyncObjects > 0 && workArea != nullptr)
{
pool->workArea = workArea;
void* w = (void*)((long)workArea + 0x20);
}
// IF NO ERROR
//FUN_0101e800((char *)pool,name)
pool->field32_0x20 = 0x100; // ??
pool->field33_0x22 = '\x06'; // ??
pool->numThreads = numThreads * 2;
pool->numSyncObjects = numSyncObjects;
//BG26hBGiNlw(pool, 0x16, &pool->field178_0xc0);
// ENDIF
return ORBIS_OK;
}
int PS4_SYSV_ABI _sceUltQueueDataResourcePoolCreate(
OrbisUltQueueDataResourcePool* pool, const char* name,
uint32_t numData, uint64_t dataSize,
uint32_t numQueueObjects,
OrbisUltWaitingQueueResourcePool* waitingQueueResourcePool,
void* workArea,
OrbisUltQueueDataResourcePoolOptParam* optParam)
{
LOG_ERROR(Lib_Ult, "(STUBBED) called");
return ORBIS_OK;
}
int PS4_SYSV_ABI sceUltQueueTryPush(OrbisUltQueue* queue, void* data) {
LOG_ERROR(Lib_Ult, "(STUBBED) called");
return ORBIS_OK;
}
int PS4_SYSV_ABI sceUltQueuePush(OrbisUltQueue* queue, void* data) {
LOG_ERROR(Lib_Ult, "(STUBBED) called");
return ORBIS_OK;
}
int PS4_SYSV_ABI sceUltQueueTryPop(OrbisUltQueue* queue, void* data) {
LOG_ERROR(Lib_Ult, "(STUBBED) called");
return ORBIS_OK;
}
int PS4_SYSV_ABI sceUltQueuePop(OrbisUltQueue* queue, void* data) {
LOG_ERROR(Lib_Ult, "(STUBBED) called");
return ORBIS_OK;
}
void RegisterlibSceUlt(Core::Loader::SymbolsResolver* sym) {
LIB_FUNCTION("hZIg1EWGsHM", "libSceUlt", 1, "libSceUlt", 1, 1, sceUltInitialize);
LIB_FUNCTION("jw9FkZBXo-g", "libSceUlt", 1, "libSceUlt", 1, 1, _sceUltUlthreadRuntimeCreate);
LIB_FUNCTION("uZz3ci7XYqc", "libSceUlt", 1, "libSceUlt", 1, 1, sceUltQueueTryPop);
LIB_FUNCTION("RVSq2tsm2yw", "libSceUlt", 1, "libSceUlt", 1, 1, sceUltQueuePop);
LIB_FUNCTION("znI3q8S7KQ4", "libSceUlt", 1, "libSceUlt", 1, 1, _sceUltUlthreadCreate);
LIB_FUNCTION("6Mc2Xs7pI1I", "libSceUlt", 1, "libSceUlt", 1, 1, sceUltQueueTryPush);
LIB_FUNCTION("dUwpX3e5NDE", "libSceUlt", 1, "libSceUlt", 1, 1, sceUltQueuePush);
LIB_FUNCTION("YiHujOG9vXY", "libSceUlt", 1, "libSceUlt", 1, 1,
_sceUltWaitingQueueResourcePoolCreate);
LIB_FUNCTION("TFHm6-N6vks", "libSceUlt", 1, "libSceUlt", 1, 1,
_sceUltQueueDataResourcePoolCreate);
};
}

94
src/core/libraries/ult/ult.h Normal file
View File

@ -0,0 +1,94 @@
// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include "common/types.h"
namespace Core::Loader {
class SymbolsResolver;
}
namespace Libraries::Ult {
typedef int32_t (*OrbisUltUlthreadEntry)(uint64_t arg);
struct OrbisUltQueue {
//private
};
struct OrbisUltUlthreadRuntimeOptParam {
uint64_t oneShotThreadStackSize;
u64 workerThreadCpuAffinityMask;
int32_t workerThreadPriority;
int inheritSched;
/* other members are private */
};
struct OrbisUltUlthreadRuntime {
// private
};
struct OrbisUltUlthread {
// private
};
struct OrbisUltUlthreadOptParam {
uint32_t attribute;
// rest private
};
struct OrbisUltWaitingQueueResourcePool {
char unknown_padding1[30];
char unknown_char;
u16 field32_0x20;
char field33_0x22;
char unknkown_char3;
u32 numThreads;
u32 numSyncObjects;
char unkown_padding2[4];
void* workArea;
// More unkowns...
};
struct OrbisUltWaitingQueueResourcePoolOptParam {
// private
};
struct OrbisUltQueueDataResourcePool {
// private
};
struct OrbisUltQueueDataResourcePoolOptParam {
// private
};
int PS4_SYSV_ABI sceUltInitialize();
int PS4_SYSV_ABI _sceUltUlthreadRuntimeCreate(OrbisUltUlthreadRuntime* runtime, const char* name,
uint32_t maxNumUlthread, uint32_t numWorkerThread,
void* workArea,
OrbisUltUlthreadRuntimeOptParam* optParam);
int PS4_SYSV_ABI _sceUltUlthreadCreate(OrbisUltUlthread* ulthread, const char* name,
OrbisUltUlthreadEntry entry, uint64_t arg, void* context,
uint64_t sizeContext, OrbisUltUlthreadRuntime* runtime,
OrbisUltUlthreadOptParam* optParam);
int PS4_SYSV_ABI _sceUltWaitingQueueResourcePoolCreate(
OrbisUltWaitingQueueResourcePool* pool, const char* name, uint32_t numThreads,
uint32_t numSyncObjects, void* workArea, OrbisUltWaitingQueueResourcePoolOptParam* optParam);
int PS4_SYSV_ABI _sceUltQueueDataResourcePoolCreate(
OrbisUltQueueDataResourcePool* pool, const char* name, uint32_t numData, uint64_t dataSize,
uint32_t numQueueObjects, OrbisUltWaitingQueueResourcePool* waitingQueueResourcePool,
void* workArea, OrbisUltQueueDataResourcePoolOptParam* optParam);
int PS4_SYSV_ABI sceUltQueueTryPush(OrbisUltQueue* queue, void* data);
int PS4_SYSV_ABI sceUltQueuePush(OrbisUltQueue* queue, void* data);
int PS4_SYSV_ABI sceUltQueueTryPop(OrbisUltQueue* queue, void* data);
int PS4_SYSV_ABI sceUltQueuePop(OrbisUltQueue* queue, void* data);
void RegisterlibSceUlt(Core::Loader::SymbolsResolver* sym);
} // namespace Libraries::Ult