Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-30 21:30:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

changed some naming/misc cleanups

Browse source
This commit is contained in:
bunnei 2014-04-10 22:15:07 -04:00
parent 2a7d7ce55d
commit 3bd041f5b0
4 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/core/hle.cpp
View file

@ -11,10 +11,10 @@
namespace HLE { namespace HLE {
static std::vector<HLEModule> g_module_db; static std::vector<ModuleDef> g_module_db;
void RegisterModule(const char *name, int num_functions, const HLEFunction *func_table) { void RegisterModule(std::string name, int num_functions, const FunctionDef* func_table) {
HLEModule module = {name, num_functions, func_table}; ModuleDef module = {name, num_functions, func_table};
g_module_db.push_back(module); g_module_db.push_back(module);
} }

32
src/core/hle/hle.h
View file

@ -9,29 +9,31 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
typedef void (*HLEFunc)();
struct HLEFunction {
u32 id;
HLEFunc func;
const char* name;
};
struct HLEModule {
const char* name;
int num_funcs;
const HLEFunction* func_table;
};
#define PARAM(n) Core::g_app_core->GetReg(n) #define PARAM(n) Core::g_app_core->GetReg(n)
#define RETURN(n) Core::g_app_core->SetReg(0, n) #define RETURN(n) Core::g_app_core->SetReg(0, n)
////////////////////////////////////////////////////////////////////////////////////////////////////
namespace HLE { namespace HLE {
typedef void (*Func)();
struct FunctionDef {
u32 id;
Func func;
std::string name;
};
struct ModuleDef {
std::string name;
int num_funcs;
const FunctionDef* func_table;
};
void Init(); void Init();
void Shutdown(); void Shutdown();
void RegisterModule(const char *name, int num_functions, const HLEFunction *func_table); void RegisterModule(std::string name, int num_functions, const FunctionDef *func_table);
} // namespace } // namespace

4
src/core/hle/hle_syscall.cpp
View file

@ -15,10 +15,10 @@ Result SVC_ConnectToPort(void* out, const char* port_name) {
return 0; return 0;
} }
const HLEFunction SysCallTable[] = { const HLE::FunctionDef SysCall_Table[] = {
{0x2D, WrapI_VC<SVC_ConnectToPort>, "svcConnectToPort"}, {0x2D, WrapI_VC<SVC_ConnectToPort>, "svcConnectToPort"},
}; };
void Register_SysCall() { void Register_SysCall() {
HLE::RegisterModule("SysCallTable", ARRAY_SIZE(SysCallTable), SysCallTable); HLE::RegisterModule("SysCallTable", ARRAY_SIZE(SysCall_Table), SysCall_Table);
} }

3
src/core/hle/hle_syscall.h
View file

@ -34,7 +34,4 @@
// } // }
//}; //};
void Register_SysCall(); void Register_SysCall();