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

Use more hleLog* functionality to simplify code.

Browse source
This commit is contained in:
Henrik Rydgård 2025-01-27 00:30:55 +01:00
parent ba6a9119fc
commit eb0102d781
3 changed files with 20 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Core/HLE/HLE.cpp
View file

@ -774,8 +774,7 @@ static void CallSyscallWithoutFlags(const HLEFunction *info) {
g_stackSize = 0;
}
const HLEFunction *GetSyscallFuncPointer(MIPSOpcode op)
{
const HLEFunction *GetSyscallFuncPointer(MIPSOpcode op) {
u32 callno = (op >> 6) & 0xFFFFF; //20 bits
int funcnum = callno & 0xFFF;
int modulenum = (callno & 0xFF000) >> 12;

41
Core/HLE/sceImpose.cpp
View file

@ -38,8 +38,7 @@ static u32 buttonValue = PSP_SYSTEMPARAM_BUTTON_CIRCLE;
static u32 umdPopup = PSP_UMD_POPUP_DISABLE;
static u32 backlightOffTime;
void __ImposeInit()
{
void __ImposeInit() {
language = g_Config.GetPSPLanguage();
if (PSP_CoreParameter().compat.flags().EnglishOrJapaneseOnly) {
if (language != PSP_SYSTEMPARAM_LANGUAGE_ENGLISH && language != PSP_SYSTEMPARAM_LANGUAGE_JAPANESE) {
@ -51,8 +50,7 @@ void __ImposeInit()
backlightOffTime = 0;
}
void __ImposeDoState(PointerWrap &p)
{
void __ImposeDoState(PointerWrap &p) {
auto s = p.Section("sceImpose", 1);
if (!s)
return;
@ -65,12 +63,11 @@ void __ImposeDoState(PointerWrap &p)
static u32 sceImposeGetBatteryIconStatus(u32 chargingPtr, u32 iconStatusPtr)
{
DEBUG_LOG(Log::sceUtility, "sceImposeGetBatteryIconStatus(%08x, %08x)", chargingPtr, iconStatusPtr);
if (Memory::IsValidAddress(chargingPtr))
Memory::Write_U32(PSP_IMPOSE_BATTICON_NONE, chargingPtr);
Memory::WriteUnchecked_U32(PSP_IMPOSE_BATTICON_NONE, chargingPtr);
if (Memory::IsValidAddress(iconStatusPtr))
Memory::Write_U32(3, iconStatusPtr);
return 0;
Memory::WriteUnchecked_U32(3, iconStatusPtr);
return hleLogDebug(Log::sceUtility, 0);
}
static u32 sceImposeSetLanguageMode(u32 languageVal, u32 buttonVal) {
@ -82,41 +79,34 @@ static u32 sceImposeSetLanguageMode(u32 languageVal, u32 buttonVal) {
return hleLogSuccessI(Log::sceUtility, 0);
}
static u32 sceImposeGetLanguageMode(u32 languagePtr, u32 btnPtr)
{
DEBUG_LOG(Log::sceUtility, "sceImposeGetLanguageMode(%08x, %08x)", languagePtr, btnPtr);
static u32 sceImposeGetLanguageMode(u32 languagePtr, u32 btnPtr) {
if (Memory::IsValidAddress(languagePtr))
Memory::Write_U32(language, languagePtr);
Memory::WriteUnchecked_U32(language, languagePtr);
if (Memory::IsValidAddress(btnPtr))
Memory::Write_U32(buttonValue, btnPtr);
return 0;
Memory::WriteUnchecked_U32(buttonValue, btnPtr);
return hleLogDebug(Log::sceUtility, 0);
}
static u32 sceImposeSetUMDPopup(int mode) {
DEBUG_LOG(Log::sceUtility, "sceImposeSetUMDPopup(%i)", mode);
umdPopup = mode;
return 0;
return hleLogDebug(Log::sceUtility, 0);
}
static u32 sceImposeGetUMDPopup() {
DEBUG_LOG(Log::sceUtility, "sceImposeGetUMDPopup()");
return umdPopup;
return hleLogDebug(Log::sceUtility, umdPopup);
}
static u32 sceImposeSetBacklightOffTime(int time) {
DEBUG_LOG(Log::sceUtility, "sceImposeSetBacklightOffTime(%i)", time);
backlightOffTime = time;
return 0;
return hleLogDebug(Log::sceUtility, 0);
}
static u32 sceImposeGetBacklightOffTime() {
DEBUG_LOG(Log::sceUtility, "sceImposeGetBacklightOffTime()");
return backlightOffTime;
return hleLogDebug(Log::sceUtility, backlightOffTime);
}
//OSD stuff? home button?
const HLEFunction sceImpose[] =
{
const HLEFunction sceImpose[] = {
{0X36AA6E91, &WrapU_UU<sceImposeSetLanguageMode>, "sceImposeSetLanguageMode", 'i', "ii"},
{0X381BD9E7, nullptr, "sceImposeHomeButton", '?', "" },
{0X0F341BE4, nullptr, "sceImposeGetHomePopup", '?', "" },
@ -134,7 +124,6 @@ const HLEFunction sceImpose[] =
{0XFF1A2F07, nullptr, "sceImpose_FF1A2F07", '?', "" },
};
void Register_sceImpose()
{
void Register_sceImpose() {
RegisterModule("sceImpose", ARRAY_SIZE(sceImpose), sceImpose);
}

12
Core/HLE/sceIo.cpp
View file

@ -871,23 +871,19 @@ static u32 sceIoAssign(u32 alias_addr, u32 physical_addr, u32 filesystem_addr, i
static u32 sceIoUnassign(const char *alias)
{
WARN_LOG_REPORT(Log::sceIo, "sceIoUnassign(%s)", alias);
return 0;
return hleLogWarning(Log::sceIo, 0, "UNIMPL");
}
static u32 sceKernelStdin() {
DEBUG_LOG(Log::sceIo, "%d=sceKernelStdin()", PSP_STDIN);
return PSP_STDIN;
return hleLogDebug(Log::sceIo, PSP_STDIN);
}
static u32 sceKernelStdout() {
DEBUG_LOG(Log::sceIo, "%d=sceKernelStdout()", PSP_STDOUT);
return PSP_STDOUT;
return hleLogDebug(Log::sceIo, PSP_STDOUT);
}
static u32 sceKernelStderr() {
DEBUG_LOG(Log::sceIo, "%d=sceKernelStderr()", PSP_STDERR);
return PSP_STDERR;
return hleLogDebug(Log::sceIo, PSP_STDERR);
}
u64 __IoCompleteAsyncIO(FileNode *f) {