Skip to content

More HLE cleanup, fix MP3 in sceAudiocodec #20209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hrydgard merged 6 commits into from
Apr 3, 2025
Merged

More HLE cleanup, fix MP3 in sceAudiocodec #20209

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5b8f380
Add new sceReg log category
hrydgard Apr 3, 2025
291e5ef
Move sceMp3 error codes to the big enum
hrydgard Apr 3, 2025
7d92f05
Fix sceAudiocodec MP3 support, at least as used by Mega Drops 2
hrydgard Apr 3, 2025
afddb2c
DisableHLE settings shouldn't be change-able ingame
hrydgard Apr 3, 2025
b5a959c
Reduce logspam. No need to log in KernelObjectPool::Get, all callers …
hrydgard Apr 3, 2025
efa022b
Expose sceMpeg context to a future debugger window. Some general log …
hrydgard Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add new sceReg log category
  • Loading branch information
@hrydgard
hrydgard committed Apr 3, 2025
commit 5b8f3807d134ee2acb66097df7d98628a01d003c
1 change: 1 addition & 0 deletions Common/Log.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ enum class Log {
sceSas,
sceUtility,
sceMisc,
sceReg,

NUMBER_OF_LOGS, // Must be last
};
Expand Down
1 change: 1 addition & 0 deletions Common/Log/LogManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ static const char * const g_logTypeNames[] = {
"SCESAS",
"SCEUTIL",
"SCEMISC",
"SCEREG",
};

const char *LogManager::GetLogTypeName(Log type) {
Expand Down
80 changes: 40 additions & 40 deletions Core/HLE/sceReg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,13 +514,13 @@ static const KeyValue *LookupCategory(std::string_view path, int *count) {
found = true;
break;
} else {
ERROR_LOG(Log::System, "Not a dir");
ERROR_LOG(Log::sceReg, "Not a dir");
return nullptr;
}
}
}
if (!found) {
WARN_LOG(Log::System, "Path not found: %.*s", (int)path.size(), path.data());
WARN_LOG(Log::sceReg, "Path not found: %.*s", (int)path.size(), path.data());
return nullptr;
}
}
Expand All @@ -544,91 +544,91 @@ int sceRegOpenRegistry(u32 regParamAddr, int mode, u32 regHandleAddr) {
Memory::WriteUnchecked_U32(0, regHandleAddr);
}
g_openRegistryMode = mode;
return hleLogInfo(Log::System, 0);
return hleLogInfo(Log::sceReg, 0);
}

int sceRegCloseRegistry(int regHandle) {
if (regHandle != 0) {
return hleLogError(Log::System, SCE_REG_ERROR_REGISTRY_NOT_FOUND);
return hleLogError(Log::sceReg, SCE_REG_ERROR_REGISTRY_NOT_FOUND);
}
g_openCategories.clear();
return hleLogInfo(Log::System, 0);
return hleLogInfo(Log::sceReg, 0);
}

int sceRegFlushRegistry(int regHandle) {
if (regHandle != 0) {
return hleLogError(Log::System, SCE_REG_ERROR_REGISTRY_NOT_FOUND);
return hleLogError(Log::sceReg, SCE_REG_ERROR_REGISTRY_NOT_FOUND);
}
// For us this is a no-op.
return hleLogInfo(Log::System, 0);
return hleLogInfo(Log::sceReg, 0);
}

// Seems dangerous! Have not dared to test this on hardware.
int sceRegRemoveRegistry(u32 regParamAddr) {
return hleLogError(Log::System, 0, "UNIMPL");
return hleLogError(Log::sceReg, 0, "UNIMPL");
}

int sceRegOpenCategory(int regHandle, const char *name, int mode, u32 regHandleAddr) {
if (!Memory::IsValid4AlignedAddress(regHandleAddr)) {
return -1;
}
if (!name) {
return hleLogError(Log::System, SCE_REG_ERROR_INVALID_NAME);
return hleLogError(Log::sceReg, SCE_REG_ERROR_INVALID_NAME);
}
if (regHandle != 0) {
Memory::WriteUnchecked_U32(-1, regHandleAddr);
return hleLogError(Log::System, SCE_REG_ERROR_REGISTRY_NOT_FOUND, "Invalid registry");
return hleLogError(Log::sceReg, SCE_REG_ERROR_REGISTRY_NOT_FOUND, "Invalid registry");
}

if (equals(name, "") || equals(name, "/")) {
return hleLogError(Log::System, SCE_REG_ERROR_INVALID_PATH);
return hleLogError(Log::sceReg, SCE_REG_ERROR_INVALID_PATH);
}

int count = 0;
const KeyValue *keyvals = LookupCategory(name, &count);
if (!keyvals) {
Memory::WriteUnchecked_U32(-1, regHandleAddr);
return hleLogError(Log::System, SCE_REG_ERROR_CATEGORY_NOT_FOUND);
return hleLogError(Log::sceReg, SCE_REG_ERROR_CATEGORY_NOT_FOUND);
}

// Let's see if this category is marked as inaccessible (presumably from user mode)..
if (count == 1 && keyvals[0].type == ValueType::FAIL) {
const int errorCode = keyvals[0].intValue;
return hleLogWarning(Log::System, errorCode, "Inaccessible category");
return hleLogWarning(Log::sceReg, errorCode, "Inaccessible category");
}

int handle = g_handleGen++;
OpenCategory cat{ name, mode };
g_openCategories[handle] = cat;
Memory::WriteUnchecked_U32(handle, regHandleAddr);
return hleLogInfo(Log::System, 0, "open handle: %d", handle);
return hleLogInfo(Log::sceReg, 0, "open handle: %d", handle);
}

int sceRegCloseCategory(int regHandle) {
auto iter = g_openCategories.find(regHandle);
if (iter == g_openCategories.end()) {
// Not found
return hleLogError(Log::System, 0, "Not an open category");
return hleLogError(Log::sceReg, 0, "Not an open category");
}

g_openCategories.erase(iter);
return hleLogInfo(Log::System, 0);
return hleLogInfo(Log::sceReg, 0);
}

int sceRegRemoveCategory(int regHandle, const char *name) {
return hleLogError(Log::System, 0, "UNIMPL");
return hleLogError(Log::sceReg, 0, "UNIMPL");
}

int sceRegFlushCategory(int regHandle) {
return hleLogError(Log::System, 0, "UNIMPL");
return hleLogError(Log::sceReg, 0, "UNIMPL");
}

// Key level

int sceRegGetKeysNum(int catHandle, u32 numAddr) {
auto iter = g_openCategories.find(catHandle);
if (iter == g_openCategories.end()) {
return hleLogError(Log::System, 0, "Not an open category");
return hleLogError(Log::sceReg, 0, "Not an open category");
}

if (!Memory::IsValid4AlignedAddress(numAddr)) {
Expand All @@ -639,29 +639,29 @@ int sceRegGetKeysNum(int catHandle, u32 numAddr) {
const KeyValue *keyvals = LookupCategory(iter->second.path, &count);
if (!keyvals) {
Memory::WriteUnchecked_U32(-1, numAddr);
return hleLogWarning(Log::System, SCE_REG_ERROR_CATEGORY_NOT_FOUND);
return hleLogWarning(Log::sceReg, SCE_REG_ERROR_CATEGORY_NOT_FOUND);
}

Memory::WriteUnchecked_U32(count, numAddr);
return hleLogInfo(Log::System, 0);
return hleLogInfo(Log::sceReg, 0);
}

int sceRegGetKeys(int catHandle, u32 bufAddr, int num) {
auto iter = g_openCategories.find(catHandle);
if (iter == g_openCategories.end()) {
return hleLogError(Log::System, 0, "Not an open category");
return hleLogError(Log::sceReg, 0, "Not an open category");
}

if (!Memory::IsValidRange(bufAddr, num * 27)) {
return hleLogError(Log::System, -1, "bad output addr");
return hleLogError(Log::sceReg, -1, "bad output addr");
}

const int addrLen = 27; // for some reason

int count = 0;
const KeyValue *keyvals = LookupCategory(iter->second.path, &count);
if (!keyvals) {
return hleLogWarning(Log::System, SCE_REG_ERROR_CATEGORY_NOT_FOUND);
return hleLogWarning(Log::sceReg, SCE_REG_ERROR_CATEGORY_NOT_FOUND);
}

count = std::min(count, num);
Expand All @@ -671,19 +671,19 @@ int sceRegGetKeys(int catHandle, u32 bufAddr, int num) {
strncpy(dest, keyvals[i].name.c_str(), 27);
}

return hleLogInfo(Log::System, 0);
return hleLogInfo(Log::sceReg, 0);
}

int sceRegGetKeyInfo(int catHandle, const char *name, u32 outKeyHandleAddr, u32 outTypeAddr, u32 outSizeAddr) {
auto iter = g_openCategories.find(catHandle);
if (iter == g_openCategories.end()) {
return hleLogError(Log::System, 0, "Not found");
return hleLogError(Log::sceReg, 0, "Not found");
}

int count = 0;
const KeyValue *keyvals = LookupCategory(iter->second.path, &count);
if (!keyvals) {
return hleLogWarning(Log::System, SCE_REG_ERROR_CATEGORY_NOT_FOUND);
return hleLogWarning(Log::sceReg, SCE_REG_ERROR_CATEGORY_NOT_FOUND);
}

for (int i = 0; i < count; i++) {
Expand All @@ -709,15 +709,15 @@ int sceRegGetKeyInfo(int catHandle, const char *name, u32 outKeyHandleAddr, u32
// Let's just make the index the key handle.
Memory::WriteUnchecked_U32(size, outSizeAddr);
}
return hleLogInfo(Log::System, 0, "handle: %d type: %d size: %d", i, (int)keyvals[i].type, size);
return hleLogInfo(Log::sceReg, 0, "handle: %d type: %d size: %d", i, (int)keyvals[i].type, size);
}
}

return hleLogWarning(Log::System, -1, "key with name '%s' not found", name);
return hleLogWarning(Log::sceReg, -1, "key with name '%s' not found", name);
}

int sceRegGetKeyInfoByName(int catHandle, const char *name, u32 typeAddr, u32 sizeAddr) {
return hleLogError(Log::System, 0);
return hleLogError(Log::sceReg, 0);
}

int sceRegGetKeyValue(int catHandle, int keyHandle, u32 bufAddr, u32 size) {
Expand All @@ -727,48 +727,48 @@ int sceRegGetKeyValue(int catHandle, int keyHandle, u32 bufAddr, u32 size) {

auto iter = g_openCategories.find(catHandle);
if (iter == g_openCategories.end()) {
return hleLogError(Log::System, 0, "Not found");
return hleLogError(Log::sceReg, 0, "Not found");
}

int count = 0;
const KeyValue *keyvals = LookupCategory(iter->second.path, &count);
if (!keyvals) {
return hleLogWarning(Log::System, SCE_REG_ERROR_CATEGORY_NOT_FOUND);
return hleLogWarning(Log::sceReg, SCE_REG_ERROR_CATEGORY_NOT_FOUND);
}

if (keyHandle < 0 || keyHandle >= count) {
return hleLogWarning(Log::System, SCE_REG_ERROR_CATEGORY_NOT_FOUND);
return hleLogWarning(Log::sceReg, SCE_REG_ERROR_CATEGORY_NOT_FOUND);
}

const KeyValue &keyval = keyvals[keyHandle];
switch (keyval.type) {
case ValueType::BIN:
Memory::MemcpyUnchecked(bufAddr, keyval.strValue.data(), std::min(size, (u32)keyval.strValue.size()));
return hleLogInfo(Log::System, 0);
return hleLogInfo(Log::sceReg, 0);
case ValueType::STR:
Memory::MemcpyUnchecked(bufAddr, keyval.strValue.data(), std::min(size, (u32)keyval.strValue.size() + 1));
return hleLogInfo(Log::System, 0, "value: '%s'", keyval.strValue.data());
return hleLogInfo(Log::sceReg, 0, "value: '%s'", keyval.strValue.data());
case ValueType::INT:
Memory::WriteUnchecked_U32(keyval.intValue, bufAddr);
return hleLogInfo(Log::System, 0, "value: %d (0x%08x)", keyval.intValue, keyval.intValue);
return hleLogInfo(Log::sceReg, 0, "value: %d (0x%08x)", keyval.intValue, keyval.intValue);
case ValueType::DIR:
case ValueType::FAIL:
default:
// Return an error?
return hleLogWarning(Log::System, 0, "Unexpected type for sceRegGetKeyValue");
return hleLogWarning(Log::sceReg, 0, "Unexpected type for sceRegGetKeyValue");
}
}

int sceRegGetKeyValueByName(int catHandle, const char *name, u32 bufAddr, u32 size) {
return hleLogError(Log::System, 0);
return hleLogError(Log::sceReg, 0);
}

int sceRegSetKeyValue(int catHandle, const char *name, u32 bufAddr, u32 size) {
return hleLogError(Log::System, 0);
return hleLogError(Log::sceReg, 0);
}

int sceRegCreateKey(int catHandle, const char *name, int type, u32 size) {
return hleLogError(Log::System, 0);
return hleLogError(Log::sceReg, 0);
}

const HLEFunction sceReg[] = {
Expand Down
4 changes: 2 additions & 2 deletions UI/ImDebugger/ImDebugger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1910,10 +1910,10 @@ void ImDebugger::Frame(MIPSDebugInterface *mipsDebug, GPUDebugInterface *gpuDebu
// More to come here...
ImGui::EndMenu();
}
if (ImGui::BeginMenu("Audio")) {
if (ImGui::BeginMenu("Audio/Video")) {
ImGui::MenuItem("SasAudio mixer", nullptr, &cfg_.sasAudioOpen);
ImGui::MenuItem("Raw audio channels", nullptr, &cfg_.audioChannelsOpen);
ImGui::MenuItem("Decoder contexts", nullptr, &cfg_.audioDecodersOpen);
ImGui::MenuItem("AV Decoder contexts", nullptr, &cfg_.audioDecodersOpen);
ImGui::EndMenu();
}
if (ImGui::BeginMenu("Network")) {
Expand Down