Logging migration (forceLogDebug_printf) (#780)

* script changes - no arguments

* script changes with 2 arguments

* script changes with > 2 arguments

* script conversions with 1 argument - pt. 1

* script conversions with 1 argument - pt. 2

* script conversions with 1 argument - pt. 3

* script conversions with 1 argument - pt. 4

* script conversions with 1 argument - pt. 5

Pointer format hunting

* Fixed pointer format

* script conversions with 1 argument - final

* fixed conversion in non utf-8 file

* fixed conversion with capital letter

* actually fixed conversion with capital letter

* fixed another capital lettering issue

* Added conversions with LR removed

* removed LR from logs

* Converted logs that previously contained LR

* converted log that originally specified string length

* fixed log with commas in main text

* fixed multi-line log

* Fixed more logs with commas in main text

* Fixed unformatted pointer

* added conversion with float value

* converted lines with double parameters

* converted missed line

* corrected argument formatting

Co-authored-by: Crementif <26669564+Crementif@users.noreply.github.com>

* Fixed misspellings of "unhandled"

unhandeled -> unhandled

Co-authored-by: Crementif <26669564+Crementif@users.noreply.github.com>

---------

Co-authored-by: Crementif <26669564+Crementif@users.noreply.github.com>
This commit is contained in:
why-keith 2023-04-25 07:43:31 +01:00 committed by GitHub
parent f48ad6a1ca
commit caa57a3cfd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
98 changed files with 469 additions and 469 deletions

View file

@ -124,20 +124,20 @@ namespace act
void nnActExport_CreateConsoleAccount(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("CreateConsoleAccount(...) LR %08x", hCPU->spr.LR);
cemuLog_logDebug(LogType::Force, "CreateConsoleAccount(...)");
//numAccounts++;
osLib_returnFromFunction(hCPU, 0);
}
void nnActExport_GetNumOfAccounts(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("nn_act.GetNumOfAccounts()\n");
cemuLog_logDebug(LogType::Force, "nn_act.GetNumOfAccounts()");
osLib_returnFromFunction(hCPU, numAccounts); // account count
}
void nnActExport_IsSlotOccupied(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("nn_act.IsSlotOccupied(%d)\n", hCPU->gpr[3]);
cemuLog_logDebug(LogType::Force, "nn_act.IsSlotOccupied({})", hCPU->gpr[3]);
ppcDefineParamU8(slot, 0);
osLib_returnFromFunction(hCPU, nn::act::GetPersistentIdEx(slot) != 0 ? 1 : 0);
@ -213,7 +213,7 @@ uint32 IsNetworkAccount(uint8* isNetworkAccount, uint8 slot)
void nnActExport_IsNetworkAccount(PPCInterpreter_t* hCPU)
{
//forceLogDebug_printf("nn_act.IsNetworkAccount()\n");
//cemuLog_logDebug(LogType::Force, "nn_act.IsNetworkAccount()");
uint8 isNetAcc = 0;
IsNetworkAccount(&isNetAcc, 0xFE);
osLib_returnFromFunction(hCPU, isNetAcc);
@ -222,7 +222,7 @@ void nnActExport_IsNetworkAccount(PPCInterpreter_t* hCPU)
void nnActExport_IsNetworkAccountEx(PPCInterpreter_t* hCPU)
{
ppcDefineParamU8(slot, 0);
forceLogDebug_printf("nn_act.IsNetworkAccountEx(%d)\n", slot);
cemuLog_logDebug(LogType::Force, "nn_act.IsNetworkAccountEx({})", slot);
uint8 isNetAcc = 0;
IsNetworkAccount(&isNetAcc, slot);
osLib_returnFromFunction(hCPU, isNetAcc);
@ -230,7 +230,7 @@ void nnActExport_IsNetworkAccountEx(PPCInterpreter_t* hCPU)
void nnActExport_GetSimpleAddressId(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("nn_act.GetSimpleAddressId()\n");
cemuLog_logDebug(LogType::Force, "nn_act.GetSimpleAddressId()");
uint32be simpleAddressId;
nn::act::GetSimpleAddressIdEx(&simpleAddressId, iosu::act::ACT_SLOT_CURRENT);
@ -240,7 +240,7 @@ void nnActExport_GetSimpleAddressId(PPCInterpreter_t* hCPU)
void nnActExport_GetSimpleAddressIdEx(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("nn_act.GetSimpleAddressIdEx(0x%08x, %d)\n", hCPU->gpr[3], hCPU->gpr[4] & 0xFF);
cemuLog_logDebug(LogType::Force, "nn_act.GetSimpleAddressIdEx(0x{:08x}, {})", hCPU->gpr[3], hCPU->gpr[4] & 0xFF);
ppcDefineParamU32BEPtr(simpleAddressId, 0);
ppcDefineParamU8(slot, 1);
@ -253,7 +253,7 @@ void nnActExport_GetSimpleAddressIdEx(PPCInterpreter_t* hCPU)
void nnActExport_GetPrincipalId(PPCInterpreter_t* hCPU)
{
// return error for non-nnid accounts?
forceLogDebug_printf("nn_act.GetPrincipalId()\n");
cemuLog_logDebug(LogType::Force, "nn_act.GetPrincipalId()");
uint32be principalId;
GetPrincipalIdEx(&principalId, iosu::act::ACT_SLOT_CURRENT);
osLib_returnFromFunction(hCPU, (uint32)principalId);
@ -262,7 +262,7 @@ void nnActExport_GetPrincipalId(PPCInterpreter_t* hCPU)
void nnActExport_GetPrincipalIdEx(PPCInterpreter_t* hCPU)
{
// return error for non-nnid accounts?
forceLogDebug_printf("nn_act.GetPrincipalIdEx(0x%08x, %d)\n", hCPU->gpr[3], hCPU->gpr[4]&0xFF);
cemuLog_logDebug(LogType::Force, "nn_act.GetPrincipalIdEx(0x{:08x}, {})", hCPU->gpr[3], hCPU->gpr[4]&0xFF);
ppcDefineParamU32BEPtr(principalId, 0);
ppcDefineParamU8(slot, 1);
GetPrincipalIdEx(principalId, slot);
@ -276,7 +276,7 @@ void nnActExport_GetTransferableIdEx(PPCInterpreter_t* hCPU)
ppcDefineParamU32(unique, 1);
ppcDefineParamU8(slot, 2);
forceLogDebug_printf("nn_act.GetTransferableIdEx(0x%08x, 0x%08x, %d)", hCPU->gpr[3], hCPU->gpr[4], hCPU->gpr[5] & 0xFF);
cemuLog_logDebug(LogType::Force, "nn_act.GetTransferableIdEx(0x{:08x}, 0x{:08x}, {})", hCPU->gpr[3], hCPU->gpr[4], hCPU->gpr[5] & 0xFF);
uint32 r = GetTransferableIdEx(transferableId, unique, slot);
@ -285,7 +285,7 @@ void nnActExport_GetTransferableIdEx(PPCInterpreter_t* hCPU)
void nnActExport_GetPersistentId(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("nn_act.GetPersistentId()");
cemuLog_logDebug(LogType::Force, "nn_act.GetPersistentId()");
uint32 persistentId = nn::act::GetPersistentIdEx(iosu::act::ACT_SLOT_CURRENT);
osLib_returnFromFunction(hCPU, persistentId);
}
@ -293,7 +293,7 @@ void nnActExport_GetPersistentId(PPCInterpreter_t* hCPU)
void nnActExport_GetPersistentIdEx(PPCInterpreter_t* hCPU)
{
ppcDefineParamU8(slot, 0);
forceLogDebug_printf("nn_act.GetPersistentIdEx(%d)", slot);
cemuLog_logDebug(LogType::Force, "nn_act.GetPersistentIdEx({})", slot);
uint32 persistentId = nn::act::GetPersistentIdEx(slot);
@ -302,7 +302,7 @@ void nnActExport_GetPersistentIdEx(PPCInterpreter_t* hCPU)
void nnActExport_GetCountry(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("nn_act.GetCountry(0x%08x)", hCPU->gpr[3]);
cemuLog_logDebug(LogType::Force, "nn_act.GetCountry(0x{:08x})", hCPU->gpr[3]);
ppcDefineParamStr(country, 0);
uint32 r = GetCountryEx(country, iosu::act::ACT_SLOT_CURRENT);
osLib_returnFromFunction(hCPU, r);
@ -311,7 +311,7 @@ void nnActExport_GetCountry(PPCInterpreter_t* hCPU)
bool g_isParentalControlCheckEnabled = false;
void nnActExport_EnableParentalControlCheck(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("nn_act.EnableParentalControlCheck(%d)", hCPU->gpr[3]);
cemuLog_logDebug(LogType::Force, "nn_act.EnableParentalControlCheck({})", hCPU->gpr[3]);
ppcDefineParamU8(isEnabled, 0);
g_isParentalControlCheckEnabled = isEnabled != 0;
osLib_returnFromFunction(hCPU, 0);
@ -319,13 +319,13 @@ void nnActExport_EnableParentalControlCheck(PPCInterpreter_t* hCPU)
void nnActExport_IsParentalControlCheckEnabled(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("nn_act.IsParentalControlCheckEnabled() -> %d", g_isParentalControlCheckEnabled);
cemuLog_logDebug(LogType::Force, "nn_act.IsParentalControlCheckEnabled() -> {}", g_isParentalControlCheckEnabled);
osLib_returnFromFunction(hCPU, g_isParentalControlCheckEnabled);
}
void nnActExport_GetHostServerSettings(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("GetHostServerSettings() - stub");
cemuLog_logDebug(LogType::Force, "GetHostServerSettings() - stub");
ppcDefineParamStr(ukn, 1);
strcpy(ukn, "");
osLib_returnFromFunction(hCPU, 0x00000000);
@ -333,7 +333,7 @@ void nnActExport_GetHostServerSettings(PPCInterpreter_t* hCPU)
void nnActExport_GetMii(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("nn_act.GetMii(...)\n");
cemuLog_logDebug(LogType::Force, "nn_act.GetMii(...)");
ppcDefineParamUStr(miiData, 0);
uint32 r = nn::act::GetMiiEx(miiData, iosu::act::ACT_SLOT_CURRENT);
osLib_returnFromFunction(hCPU, r);
@ -341,7 +341,7 @@ void nnActExport_GetMii(PPCInterpreter_t* hCPU)
void nnActExport_GetMiiEx(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("nn_act.GetMiiEx(...)\n");
cemuLog_logDebug(LogType::Force, "nn_act.GetMiiEx(...)");
ppcDefineParamUStr(miiData, 0);
ppcDefineParamU8(slot, 1);
uint32 r = nn::act::GetMiiEx(miiData, slot);
@ -350,14 +350,14 @@ void nnActExport_GetMiiEx(PPCInterpreter_t* hCPU)
void nnActExport_GetMiiImageEx(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("GetMiiImageEx unimplemented LR %08x", hCPU->spr.LR);
cemuLog_logDebug(LogType::Force, "GetMiiImageEx unimplemented");
osLib_returnFromFunction(hCPU, 0);
}
void nnActExport_GetMiiName(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("GetMiiName(0x%08x)", hCPU->gpr[3]);
cemuLog_logDebug(LogType::Force, "GetMiiName(0x{:08x})", hCPU->gpr[3]);
ppcDefineParamWStrBE(miiName, 0);
StackAllocator<FFLData_t> miiData;
@ -379,7 +379,7 @@ void nnActExport_GetMiiName(PPCInterpreter_t* hCPU)
void nnActExport_GetMiiNameEx(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("GetMiiNameEx(0x%08x, %d)", hCPU->gpr[3], hCPU->gpr[4] & 0xFF);
cemuLog_logDebug(LogType::Force, "GetMiiNameEx(0x{:08x}, {})", hCPU->gpr[3], hCPU->gpr[4] & 0xFF);
ppcDefineParamWStrBE(miiName, 0);
ppcDefineParamU8(slot, 1);
@ -452,7 +452,7 @@ void nnActExport_UpdateMii(PPCInterpreter_t* hCPU)
void nnActExport_GetUuid(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("nn_act.GetUuid(0x%08x)", hCPU->gpr[3]);
cemuLog_logDebug(LogType::Force, "nn_act.GetUuid(0x{:08x})", hCPU->gpr[3]);
ppcDefineParamUStr(uuid, 0);
nn::act::GetUuidEx(uuid, iosu::act::ACT_SLOT_CURRENT);
osLib_returnFromFunction(hCPU, 0); // 0 -> result ok
@ -460,7 +460,7 @@ void nnActExport_GetUuid(PPCInterpreter_t* hCPU)
void nnActExport_GetUuidEx(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("nn_act.GetUuidEx(0x%08x,0x%02x)", hCPU->gpr[3], hCPU->gpr[3]&0xFF);
cemuLog_logDebug(LogType::Force, "nn_act.GetUuidEx(0x{:08x},0x{:02x})", hCPU->gpr[3], hCPU->gpr[3]&0xFF);
ppcDefineParamUStr(uuid, 0);
ppcDefineParamU8(slot, 1);
nn::act::GetUuidEx(uuid, slot);
@ -469,7 +469,7 @@ void nnActExport_GetUuidEx(PPCInterpreter_t* hCPU)
void nnActExport_GetUuidEx2(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("nn_act.GetUuidEx(0x%08x,0x%02x,0x%08x)", hCPU->gpr[3], hCPU->gpr[4], hCPU->gpr[5]);
cemuLog_logDebug(LogType::Force, "nn_act.GetUuidEx(0x{:08x},0x{:02x},0x{:08x})", hCPU->gpr[3], hCPU->gpr[4], hCPU->gpr[5]);
ppcDefineParamUStr(uuid, 0);
ppcDefineParamU8(slot, 1);
ppcDefineParamS32(name, 2);
@ -479,7 +479,7 @@ void nnActExport_GetUuidEx2(PPCInterpreter_t* hCPU)
void nnActExport_GetAccountId(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("nn_act.GetAccountId(0x%08x)", hCPU->gpr[3]);
cemuLog_logDebug(LogType::Force, "nn_act.GetAccountId(0x{:08x})", hCPU->gpr[3]);
ppcDefineParamUStr(accId, 0);
GetAccountIdEx((char*)accId, iosu::act::ACT_SLOT_CURRENT);
osLib_returnFromFunction(hCPU, 0);
@ -487,7 +487,7 @@ void nnActExport_GetAccountId(PPCInterpreter_t* hCPU)
void nnActExport_GetAccountIdEx(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("nn_act.GetAccountIdEx(0x%08x, 0x%02x)", hCPU->gpr[3], hCPU->gpr[3] & 0xFF);
cemuLog_logDebug(LogType::Force, "nn_act.GetAccountIdEx(0x{:08x}, 0x{:02x})", hCPU->gpr[3], hCPU->gpr[3] & 0xFF);
ppcDefineParamUStr(accId, 0);
ppcDefineParamU8(slot, 1);
GetAccountIdEx((char*)accId, slot);
@ -497,7 +497,7 @@ void nnActExport_GetAccountIdEx(PPCInterpreter_t* hCPU)
void nnActExport_GetParentalControlSlotNoEx(PPCInterpreter_t* hCPU)
{
// GetParentalControlSlotNoEx(uint8* output, uint8 slot)
forceLogDebug_printf("nn_act.GetParentalControlSlotNoEx(0x%08x, 0x%02x)", hCPU->gpr[3], hCPU->gpr[4]);
cemuLog_logDebug(LogType::Force, "nn_act.GetParentalControlSlotNoEx(0x{:08x}, 0x{:02x})", hCPU->gpr[3], hCPU->gpr[4]);
//memory_writeU8(hCPU->gpr[3], 0x01); // returned slot no (slot indices start at 1)
memory_writeU8(hCPU->gpr[3], 1); // 0 -> No parental control for slot?
//memory_writeU8(hCPU->gpr[3], 0); // 0 -> No parental control for slot?
@ -507,7 +507,7 @@ void nnActExport_GetParentalControlSlotNoEx(PPCInterpreter_t* hCPU)
void nnActExport_GetDefaultAccount(PPCInterpreter_t* hCPU)
{
// todo
forceLogDebug_printf("GetDefaultAccount(): Return 1?");
cemuLog_logDebug(LogType::Force, "GetDefaultAccount(): Return 1?");
osLib_returnFromFunction(hCPU, 1);
}
@ -515,13 +515,13 @@ void nnActExport_GetSlotNo(PPCInterpreter_t* hCPU)
{
// id of active account
// uint8 GetSlotNo(void);
forceLogDebug_printf("nn_act.GetSlotNo()");
cemuLog_logDebug(LogType::Force, "nn_act.GetSlotNo()");
osLib_returnFromFunction(hCPU, 1); // 1 is the first slot (0 is invalid)
}
void nnActExport_GetSlotNoEx(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("nn_act.GetSlotNoEx(...)");
cemuLog_logDebug(LogType::Force, "nn_act.GetSlotNoEx(...)");
// get slot no by uuid
ppcDefineParamUStr(uuid, 0);
@ -544,7 +544,7 @@ void nnActExport_GetSlotNoEx(PPCInterpreter_t* hCPU)
void nnActExport_Initialize(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("nn_act.Initialize()");
cemuLog_logDebug(LogType::Force, "nn_act.Initialize()");
nn::act::Initialize();
@ -553,7 +553,7 @@ void nnActExport_Initialize(PPCInterpreter_t* hCPU)
void nnActExport_HasNfsAccount(PPCInterpreter_t* hCPU)
{
forceLogDebug_printf("Called nn_act.HasNfsAccount LR %08x", hCPU->spr.LR);
cemuLog_logDebug(LogType::Force, "Called nn_act.HasNfsAccount");
osLib_returnFromFunction(hCPU, 1); // Nfs = Nintendo Friend System? (Splatoon tries to call nn_fp.RegisterAccount if we set this to false)
}
@ -585,7 +585,7 @@ void nnActExport_AcquireNexServiceToken(PPCInterpreter_t* hCPU)
memcpy(token, actRequest->resultBinary.binBuffer, sizeof(nexServiceToken_t));
forceLogDebug_printf("Called nn_act.AcquireNexServiceToken LR %08x", hCPU->spr.LR);
cemuLog_logDebug(LogType::Force, "Called nn_act.AcquireNexServiceToken");
osLib_returnFromFunction(hCPU, getNNReturnCode(resultCode, actRequest));
}
@ -616,8 +616,8 @@ void nnActExport_AcquireIndependentServiceToken(PPCInterpreter_t* hCPU)
ppcDefineParamMEMPTR(token, independentServiceToken_t, 0);
ppcDefineParamMEMPTR(serviceToken, const char, 1);
uint32 result = AcquireIndependentServiceToken(token.GetPtr(), serviceToken.GetPtr(), 0);
forceLogDebug_printf("nn_act.AcquireIndependentServiceToken(0x%p, %s) -> %x | LR %08x", (void*)token.GetPtr(), serviceToken.GetPtr(), result, hCPU->spr.LR);
forceLogDebug_printf("Token: %s", serviceToken.GetPtr());
cemuLog_logDebug(LogType::Force, "nn_act.AcquireIndependentServiceToken(0x{}, {}) -> {:x}", (void*)token.GetPtr(), serviceToken.GetPtr(), result);
cemuLog_logDebug(LogType::Force, "Token: {}", serviceToken.GetPtr());
osLib_returnFromFunction(hCPU, result);
}
@ -627,7 +627,7 @@ void nnActExport_AcquireIndependentServiceToken2(PPCInterpreter_t* hCPU)
ppcDefineParamMEMPTR(clientId, const char, 1);
ppcDefineParamU32(cacheDurationInSeconds, 2);
uint32 result = AcquireIndependentServiceToken(token, clientId.GetPtr(), cacheDurationInSeconds);
forceLogDebug_printf("Called nn_act.AcquireIndependentServiceToken2 LR %08x", hCPU->spr.LR);
cemuLog_logDebug(LogType::Force, "Called nn_act.AcquireIndependentServiceToken2");
osLib_returnFromFunction(hCPU, result);
}
@ -635,7 +635,7 @@ void nnActExport_AcquireEcServiceToken(PPCInterpreter_t* hCPU)
{
ppcDefineParamMEMPTR(pEcServiceToken, independentServiceToken_t, 0);
uint32 result = AcquireIndependentServiceToken(pEcServiceToken.GetPtr(), "71a6f5d6430ea0183e3917787d717c46", 0);
forceLogDebug_printf("Called nn_act.AcquireEcServiceToken LR %08x", hCPU->spr.LR);
cemuLog_logDebug(LogType::Force, "Called nn_act.AcquireEcServiceToken");
osLib_returnFromFunction(hCPU, result);
}
@ -644,7 +644,7 @@ void nnActExport_AcquirePrincipalIdByAccountId(PPCInterpreter_t* hCPU)
ppcDefineParamMEMPTR(principalId, uint32be, 0);
ppcDefineParamMEMPTR(nnid, char, 1);
ppcDefineParamU32(ukn, 2); // some option, can be 0 or 1 ?
forceLogDebug_printf("nn_act.AcquirePrincipalIdByAccountId(0x%08x,\"%s\", %d) - last param unknown", principalId.GetMPTR(), nnid.GetPtr(), ukn);
cemuLog_logDebug(LogType::Force, "nn_act.AcquirePrincipalIdByAccountId(0x{:08x},\"{}\", {}) - last param unknown", principalId.GetMPTR(), nnid.GetPtr(), ukn);
actPrepareRequest2();
actRequest->requestCode = IOSU_ARC_ACQUIREPIDBYNNID;
strcpy(actRequest->clientId, nnid.GetPtr());
@ -662,11 +662,11 @@ void nnActExport_GetUtcOffsetEx(PPCInterpreter_t* hCPU)
ppcDefineParamU32BEPtr(utcOffsetOut, 0);
ppcDefineParamU32(uknParam, 1);
forceLogDebug_printf("Called nn_act.GetUtcOffsetEx LR %08x", hCPU->spr.LR);
cemuLog_logDebug(LogType::Force, "Called nn_act.GetUtcOffsetEx");
*utcOffsetOut = 0;
forceLogDebug_printf("GetUtcOffsetEx stub");
cemuLog_logDebug(LogType::Force, "GetUtcOffsetEx stub");
osLib_returnFromFunction(hCPU, 0);
}