preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-17 16:30:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

string-view-ify stuff

Browse Source
This commit is contained in:
Henrik Rydgård committed 2025-01-20 12:19:14 +01:00
1 parent 6732d54742
commit 86fcdeeb25
3 files changed
+76 -54
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Core/HLE/HLE.cpp
+62 -42
View File
@@ -40,8 +40,7 @@
#include "Core/HLE/sceKernelInterrupt.h"
#include "Core/HLE/HLE.h"
enum
{
enum {
// Do nothing after the syscall.
HLE_AFTER_NOTHING = 0x00,
// Reschedule immediately after the syscall.
@@ -113,7 +112,7 @@ static std::vector<HLEMipsCallInfo> enqueuedMipsCalls;
// Does need to be saved, referenced by the stack and owned.
static std::vector<PSPAction *> mipsCallActions;
void hleDelayResultFinish(u64 userdata, int cycleslate) {
static void hleDelayResultFinish(u64 userdata, int cycleslate) {
u32 error;
SceUID threadID = (SceUID) userdata;
SceUID verify = __KernelGetWaitID(threadID, WAITTYPE_HLEDELAY, error);
@@ -183,7 +182,7 @@ int GetNumRegisteredModules() {
return (int)moduleDB.size();
}
void RegisterModule(const char *name, int numFunctions, const HLEFunction *funcTable) {
void RegisterModule(std::string_view name, int numFunctions, const HLEFunction *funcTable) {
HLEModule module = {name, numFunctions, funcTable};
moduleDB.push_back(module);
}
@@ -192,44 +191,59 @@ const HLEModule *GetModuleByIndex(int index) {
return &moduleDB[index];
}
int GetModuleIndex(const char *moduleName) {
// TODO: Do something faster.
const HLEModule *GetModuleByName(std::string_view name) {
for (auto &module : moduleDB) {
if (name == module.name) {
return &module;
}
}
return nullptr;
}
// TODO: Do something faster.
const HLEFunction *GetFuncByName(const HLEModule *module, std::string_view name) {
for (int i = 0; i < module->numFunctions; i++) {
auto &func = module->funcTable[i];
if (func.name == name) {
return &func;
}
}
return nullptr;
}
int GetModuleIndex(std::string_view moduleName) {
for (size_t i = 0; i < moduleDB.size(); i++)
if (strcmp(moduleName, moduleDB[i].name) == 0)
if (moduleDB[i].name == moduleName)
return (int)i;
return -1;
}
int GetFuncIndex(int moduleIndex, u32 nib)
{
int GetFuncIndex(int moduleIndex, u32 nib) {
const HLEModule &module = moduleDB[moduleIndex];
for (int i = 0; i < module.numFunctions; i++)
{
for (int i = 0; i < module.numFunctions; i++) {
if (module.funcTable[i].ID == nib)
return i;
}
return -1;
}
u32 GetNibByName(const char *moduleName, const char *function)
{
u32 GetNibByName(std::string_view moduleName, std::string_view function) {
int moduleIndex = GetModuleIndex(moduleName);
if (moduleIndex == -1)
return -1;
const HLEModule &module = moduleDB[moduleIndex];
for (int i = 0; i < module.numFunctions; i++)
{
if (!strcmp(module.funcTable[i].name, function))
for (int i = 0; i < module.numFunctions; i++) {
if (function == module.funcTable[i].name)
return module.funcTable[i].ID;
}
return -1;
}
const HLEFunction *GetFunc(const char *moduleName, u32 nib)
{
const HLEFunction *GetFunc(std::string_view moduleName, u32 nib) {
int moduleIndex = GetModuleIndex(moduleName);
if (moduleIndex != -1)
{
if (moduleIndex != -1) {
int idx = GetFuncIndex(moduleIndex, nib);
if (idx != -1)
return &(moduleDB[moduleIndex].funcTable[idx]);
@@ -237,22 +251,21 @@ const HLEFunction *GetFunc(const char *moduleName, u32 nib)
return 0;
}
const char *GetFuncName(const char *moduleName, u32 nib)
{
_dbg_assert_msg_(moduleName != nullptr, "Invalid module name.");
const char *GetFuncName(std::string_view moduleName, u32 nib) {
_dbg_assert_msg_(!moduleName.empty(), "Invalid module name.");
const HLEFunction *func = GetFunc(moduleName,nib);
const HLEFunction *func = GetFunc(moduleName, nib);
if (func)
return func->name;
static char temp[256];
static char temp[64];
snprintf(temp, sizeof(temp), "[UNK: 0x%08x]", nib);
return temp;
}
u32 GetSyscallOp(const char *moduleName, u32 nib) {
u32 GetSyscallOp(std::string_view moduleName, u32 nib) {
// Special case to hook up bad imports.
if (moduleName == NULL) {
if (moduleName.empty()) {
return (0x03FFFFCC); // invalid syscall
}
@@ -262,20 +275,18 @@ u32 GetSyscallOp(const char *moduleName, u32 nib) {
if (funcindex != -1) {
return (0x0000000c | (modindex<<18) | (funcindex<<6));
} else {
INFO_LOG(Log::HLE, "Syscall (%s, %08x) unknown", moduleName, nib);
INFO_LOG(Log::HLE, "Syscall (%.*s, %08x) unknown", (int)moduleName.size(), moduleName.data(), nib);
return (0x0003FFCC | (modindex<<18)); // invalid syscall
}
}
else
{
ERROR_LOG(Log::HLE, "Unknown module %s!", moduleName);
return (0x03FFFFCC); // invalid syscall
} else {
ERROR_LOG(Log::HLE, "Unknown module %.*s!", (int)moduleName.size(), moduleName.data());
return 0x03FFFFCC; // invalid syscall
}
}
bool FuncImportIsSyscall(const char *module, u32 nib)
bool FuncImportIsSyscall(std::string_view module, u32 nib)
{
return GetFunc(module, nib) != NULL;
return GetFunc(module, nib) != nullptr;
}
void WriteFuncStub(u32 stubAddr, u32 symAddr)
@@ -291,14 +302,14 @@ void WriteFuncMissingStub(u32 stubAddr, u32 nid)
{
// Write a trap so we notice this func if it's called before resolving.
Memory::Write_U32(MIPS_MAKE_JR_RA(), stubAddr); // jr ra
Memory::Write_U32(GetSyscallOp(NULL, nid), stubAddr + 4);
Memory::Write_U32(GetSyscallOp("", nid), stubAddr + 4);
}
bool WriteSyscall(const char *moduleName, u32 nib, u32 address)
bool WriteSyscall(std::string_view moduleName, u32 nib, u32 address)
{
if (nib == 0)
{
WARN_LOG_REPORT(Log::HLE, "Wrote patched out nid=0 syscall (%s)", moduleName);
WARN_LOG_REPORT(Log::HLE, "Wrote patched out nid=0 syscall (%.*s)", (int)moduleName.size(), moduleName.data());
Memory::Write_U32(MIPS_MAKE_JR_RA(), address); //patched out?
Memory::Write_U32(MIPS_MAKE_NOP(), address+4); //patched out?
return true;
@@ -312,7 +323,7 @@ bool WriteSyscall(const char *moduleName, u32 nib, u32 address)
}
else
{
ERROR_LOG_REPORT(Log::HLE, "Unable to write unknown syscall: %s/%08x", moduleName, nib);
ERROR_LOG_REPORT(Log::HLE, "Unable to write unknown syscall: %.*s/%08x", (int)moduleName.size(), moduleName.data(), nib);
return false;
}
}
@@ -753,7 +764,8 @@ const HLEFunction *GetSyscallFuncPointer(MIPSOpcode op)
int funcnum = callno & 0xFFF;
int modulenum = (callno & 0xFF000) >> 12;
if (funcnum == 0xfff) {
ERROR_LOG(Log::HLE, "Unknown syscall: Module: %s (module: %d func: %d)", modulenum > (int)moduleDB.size() ? "(unknown)" : moduleDB[modulenum].name, modulenum, funcnum);
std::string_view modName = modulenum > (int)moduleDB.size() ? "(unknown)" : moduleDB[modulenum].name;
ERROR_LOG(Log::HLE, "Unknown syscall: Module: '%.*s' (module: %d func: %d)", (int)modName.size(), modName.data(), modulenum, funcnum);
return NULL;
}
if (modulenum >= (int)moduleDB.size()) {
@@ -934,12 +946,12 @@ size_t hleFormatLogArgs(char *message, size_t sz, const char *argmask) {
void hleLeave() {
_dbg_assert_(g_stackSize > 0);
if (g_stackSize > 0) {
g_stackSize--;
g_stackSize--;
} // else warn?
}
void hleDoLogInternal(Log t, LogLevel level, u64 res, const char *file, int line, const char *reportTag, char retmask, const char *reason, const char *formatted_reason) {
char formatted_args[4096];
char formatted_args[2048];
const char *funcName = "?";
u32 funcFlags = 0;
@@ -952,7 +964,15 @@ void hleDoLogInternal(Log t, LogLevel level, u64 res, const char *file, int line
if (g_stackSize) {
_dbg_assert_(hleFunc->argmask != nullptr);
hleFormatLogArgs(formatted_args, sizeof(formatted_args), hleFunc->argmask);
// NOTE: For second stack level, we can't get arguments (unless we somehow get them from the host stack!)
// Need to do something smart in hleCall.
if (g_stackSize == 1) {
hleFormatLogArgs(formatted_args, sizeof(formatted_args), hleFunc->argmask);
} else {
truncate_cpy(formatted_args, "...N/A...");
}
// This acts as an override (for error returns which are usually hex.)
if (retmask == '\0')
Core/HLE/HLE.h
+10 -9
View File
@@ -20,6 +20,7 @@
#include <cstdio>
#include <cstdarg>
#include <type_traits>
#include <string_view>
#include "Common/CommonTypes.h"
#include "Common/Log.h"
@@ -76,7 +77,7 @@ struct HLEFunction {
};
struct HLEModule {
const char *name;
std::string_view name;
int numFunctions;
const HLEFunction *funcTable;
};
@@ -96,13 +97,13 @@ struct Syscall {
#define RETURN64(n) {u64 RETURN64_tmp = n; currentMIPS->r[MIPS_REG_V0] = RETURN64_tmp & 0xFFFFFFFF; currentMIPS->r[MIPS_REG_V1] = RETURN64_tmp >> 32;}
#define RETURNF(fl) currentMIPS->f[0] = fl
const char *GetFuncName(const char *module, u32 nib);
const char *GetFuncName(std::string_view module, u32 nib);
const char *GetFuncName(int module, int func);
const HLEFunction *GetFunc(const char *module, u32 nib);
const HLEFunction *GetFunc(std::string_view module, u32 nib);
int GetFuncIndex(int moduleIndex, u32 nib);
int GetModuleIndex(const char *modulename);
int GetModuleIndex(std::string_view modulename);
void RegisterModule(const char *name, int numFunctions, const HLEFunction *funcTable);
void RegisterModule(std::string_view name, int numFunctions, const HLEFunction *funcTable);
int GetNumRegisteredModules();
const HLEModule *GetModuleByIndex(int index);
@@ -157,10 +158,10 @@ inline s64 hleDelayResult(s64 result, const char *reason, int usec) {
void HLEInit();
void HLEDoState(PointerWrap &p);
void HLEShutdown();
u32 GetNibByName(const char *module, const char *function);
u32 GetSyscallOp(const char *module, u32 nib);
bool FuncImportIsSyscall(const char *module, u32 nib);
bool WriteSyscall(const char *module, u32 nib, u32 address);
u32 GetNibByName(std::string_view module, std::string_view function);
u32 GetSyscallOp(std::string_view module, u32 nib);
bool FuncImportIsSyscall(std::string_view module, u32 nib);
bool WriteSyscall(std::string_view module, u32 nib, u32 address);
void CallSyscall(MIPSOpcode op);
void WriteFuncStub(u32 stubAddr, u32 symAddr);
void WriteFuncMissingStub(u32 stubAddr, u32 nid);
UI/ImDebugger/ImDebugger.cpp
+4 -3
View File
@@ -977,11 +977,12 @@ void DrawHLEModules(ImConfig &config) {
}
std::sort(modules.begin(), modules.end(), [](const HLEModule* a, const HLEModule* b) {
return std::strcmp(a->name, b->name) < 0;
return a->name < b->name;
});
std::string label;
for (auto mod : modules) {
if (ImGui::TreeNode(mod->name)) {
label = mod->name;
if (ImGui::TreeNode(label.c_str())) {
for (int j = 0; j < mod->numFunctions; j++) {
auto &func = mod->funcTable[j];
ImGui::Text("%s(%s)", func.name, func.argmask);