Wrap functions on HLETables

This commit is contained in:
YaPeL 2013-01-01 22:22:08 -03:00 committed by Federico Apelhanz
parent 590d94da9f
commit 9cde301f4d
6 changed files with 29 additions and 29 deletions

View file

@ -75,7 +75,7 @@ const HLEFunction UtilsForUser[] =
{ {
{0x91E4F6A7, WrapU_V<sceKernelLibcClock>, "sceKernelLibcClock"}, {0x91E4F6A7, WrapU_V<sceKernelLibcClock>, "sceKernelLibcClock"},
{0x27CC57F0, WrapU_U<sceKernelLibcTime>, "sceKernelLibcTime"}, {0x27CC57F0, WrapU_U<sceKernelLibcTime>, "sceKernelLibcTime"},
{0x71EC4271, sceKernelLibcGettimeofday, "sceKernelLibcGettimeofday"}, {0x71EC4271, WrapU_U<sceKernelLibcGettimeofday>, "sceKernelLibcGettimeofday"},
{0xBFA98062, WrapI_UI<sceKernelDcacheInvalidateRange>, "sceKernelDcacheInvalidateRange"}, {0xBFA98062, WrapI_UI<sceKernelDcacheInvalidateRange>, "sceKernelDcacheInvalidateRange"},
{0xC8186A58, 0, "sceKernelUtilsMd5Digest"}, {0xC8186A58, 0, "sceKernelUtilsMd5Digest"},
{0x9E5C5086, 0, "sceKernelUtilsMd5BlockInit"}, {0x9E5C5086, 0, "sceKernelUtilsMd5BlockInit"},
@ -87,8 +87,8 @@ const HLEFunction UtilsForUser[] =
{0x585F1C09, 0, "sceKernelUtilsSha1BlockResult"}, {0x585F1C09, 0, "sceKernelUtilsSha1BlockResult"},
{0xE860E75E, 0, "sceKernelUtilsMt19937Init"}, {0xE860E75E, 0, "sceKernelUtilsMt19937Init"},
{0x06FB8A63, 0, "sceKernelUtilsMt19937UInt"}, {0x06FB8A63, 0, "sceKernelUtilsMt19937UInt"},
{0x37FB5C42, sceKernelGetGPI, "sceKernelGetGPI"}, {0x37FB5C42, WrapU_V<sceKernelGetGPI>, "sceKernelGetGPI"},
{0x6AD345D7, sceKernelSetGPO, "sceKernelSetGPO"}, {0x6AD345D7, WrapV_U<sceKernelSetGPO>, "sceKernelSetGPO"},
{0x79D1C3FA, WrapI_V<sceKernelDcacheWritebackAll>, "sceKernelDcacheWritebackAll"}, {0x79D1C3FA, WrapI_V<sceKernelDcacheWritebackAll>, "sceKernelDcacheWritebackAll"},
{0xB435DEC5, WrapI_V<sceKernelDcacheWritebackInvalidateAll>, "sceKernelDcacheWritebackInvalidateAll"}, {0xB435DEC5, WrapI_V<sceKernelDcacheWritebackInvalidateAll>, "sceKernelDcacheWritebackInvalidateAll"},
{0x3EE30821, WrapI_UI<sceKernelDcacheWritebackRange>, "sceKernelDcacheWritebackRange"}, {0x3EE30821, WrapI_UI<sceKernelDcacheWritebackRange>, "sceKernelDcacheWritebackRange"},
@ -98,7 +98,7 @@ const HLEFunction UtilsForUser[] =
{0x16641D70, 0, "sceKernelDcacheReadTag"}, {0x16641D70, 0, "sceKernelDcacheReadTag"},
{0x4FD31C9D, 0, "sceKernelIcacheProbe"}, {0x4FD31C9D, 0, "sceKernelIcacheProbe"},
{0xFB05FAD0, 0, "sceKernelIcacheReadTag"}, {0xFB05FAD0, 0, "sceKernelIcacheReadTag"},
{0x920f104a, sceKernelIcacheInvalidateAll, "sceKernelIcacheInvalidateAll"} {0x920f104a, WrapU_V<sceKernelIcacheInvalidateAll>, "sceKernelIcacheInvalidateAll"}
}; };
@ -126,7 +126,7 @@ const HLEFunction LoadCoreForKernel[] =
{0xB4D6FECC, 0, "sceKernelApplyElfRelSection"}, {0xB4D6FECC, 0, "sceKernelApplyElfRelSection"},
{0x54AB2675, 0, "LoadCoreForKernel_54AB2675"}, {0x54AB2675, 0, "LoadCoreForKernel_54AB2675"},
{0x2952F5AC, 0, "sceKernelDcacheWBinvAll"}, {0x2952F5AC, 0, "sceKernelDcacheWBinvAll"},
{0xD8779AC6, sceKernelIcacheClearAll, "sceKernelIcacheClearAll"}, {0xD8779AC6, WrapU_V<sceKernelIcacheClearAll>, "sceKernelIcacheClearAll"},
{0x99A695F0, 0, "sceKernelRegisterLibrary"}, {0x99A695F0, 0, "sceKernelRegisterLibrary"},
{0x5873A31F, 0, "sceKernelRegisterLibraryForUser"}, {0x5873A31F, 0, "sceKernelRegisterLibraryForUser"},
{0x0B464512, 0, "sceKernelReleaseLibrary"}, {0x0B464512, 0, "sceKernelReleaseLibrary"},
@ -148,7 +148,7 @@ const HLEFunction LoadCoreForKernel[] =
{0xCCE4A157, 0, "sceKernelFindModuleByUID"}, {0xCCE4A157, 0, "sceKernelFindModuleByUID"},
{0x82CE54ED, 0, "sceKernelModuleCount"}, {0x82CE54ED, 0, "sceKernelModuleCount"},
{0xC0584F0C, 0, "sceKernelGetModuleList"}, {0xC0584F0C, 0, "sceKernelGetModuleList"},
{0xCF8A41B1, sceKernelFindModuleByName,"sceKernelFindModuleByName"}, {0xCF8A41B1, WrapU_V<sceKernelFindModuleByName>,"sceKernelFindModuleByName"},
}; };
@ -158,7 +158,7 @@ const HLEFunction KDebugForKernel[] =
{0x2FF4E9F9, 0, "sceKernelAssert"}, {0x2FF4E9F9, 0, "sceKernelAssert"},
{0x9B868276, 0, "sceKernelGetDebugPutchar"}, {0x9B868276, 0, "sceKernelGetDebugPutchar"},
{0xE146606D, 0, "sceKernelRegisterDebugPutchar"}, {0xE146606D, 0, "sceKernelRegisterDebugPutchar"},
{0x7CEB2C09, sceKernelRegisterKprintfHandler, "sceKernelRegisterKprintfHandler"}, {0x7CEB2C09, WrapU_V<sceKernelRegisterKprintfHandler>, "sceKernelRegisterKprintfHandler"},
{0x84F370BC, 0, "Kprintf"}, {0x84F370BC, 0, "Kprintf"},
{0x5CE9838B, 0, "sceKernelDebugWrite"}, {0x5CE9838B, 0, "sceKernelDebugWrite"},
{0x66253C4E, 0, "sceKernelRegisterDebugWrite"}, {0x66253C4E, 0, "sceKernelRegisterDebugWrite"},

View file

@ -221,10 +221,10 @@ void sceKernelDevkitVersion()
RETURN(1); RETURN(1);
} }
void sceKernelRegisterKprintfHandler() u32 sceKernelRegisterKprintfHandler()
{ {
ERROR_LOG(HLE,"UNIMPL sceKernelRegisterKprintfHandler()"); ERROR_LOG(HLE,"UNIMPL sceKernelRegisterKprintfHandler()");
RETURN(0); return 0;
} }
void sceKernelRegisterDefaultExceptionHandler() void sceKernelRegisterDefaultExceptionHandler()
{ {
@ -232,17 +232,17 @@ void sceKernelRegisterDefaultExceptionHandler()
RETURN(0); RETURN(0);
} }
void sceKernelSetGPO() void sceKernelSetGPO(u32 ledAddr)
{ {
// Sets debug LEDs. // Sets debug LEDs.
DEBUG_LOG(HLE,"sceKernelSetGPO(%02x)", PARAM(0)); DEBUG_LOG(HLE,"sceKernelSetGPO(%02x)", ledAddr);
} }
void sceKernelGetGPI() u32 sceKernelGetGPI()
{ {
// Always returns 0 on production systems. // Always returns 0 on production systems.
DEBUG_LOG(HLE,"0=sceKernelGetGPI()"); DEBUG_LOG(HLE,"0=sceKernelGetGPI()");
RETURN(0); return 0;
} }
// Don't even log these, they're spammy and we probably won't // Don't even log these, they're spammy and we probably won't
@ -461,17 +461,17 @@ KernelObject *KernelObjectPool::CreateByIDType(int type)
} }
} }
void sceKernelIcacheInvalidateAll() u32 sceKernelIcacheInvalidateAll()
{ {
DEBUG_LOG(CPU, "Icache invalidated - should clear JIT someday"); DEBUG_LOG(CPU, "Icache invalidated - should clear JIT someday");
RETURN(0); return 0;
} }
void sceKernelIcacheClearAll() u32 sceKernelIcacheClearAll()
{ {
DEBUG_LOG(CPU, "Icache cleared - should clear JIT someday"); DEBUG_LOG(CPU, "Icache cleared - should clear JIT someday");
RETURN(0); return 0;
} }
struct SystemStatus { struct SystemStatus {

View file

@ -288,21 +288,21 @@ void sceKernelSleepThreadCB();
void sceKernelDevkitVersion(); void sceKernelDevkitVersion();
void sceKernelRegisterKprintfHandler(); u32 sceKernelRegisterKprintfHandler();
void sceKernelRegisterDefaultExceptionHandler(); void sceKernelRegisterDefaultExceptionHandler();
void sceKernelFindModuleByName(); u32 sceKernelFindModuleByName();
void sceKernelSetGPO(); void sceKernelSetGPO(u32 ledAddr);
void sceKernelGetGPI(); u32 sceKernelGetGPI();
int sceKernelDcacheInvalidateRange(u32 addr, int size); int sceKernelDcacheInvalidateRange(u32 addr, int size);
int sceKernelDcacheWritebackAll(); int sceKernelDcacheWritebackAll();
int sceKernelDcacheWritebackRange(u32 addr, int size); int sceKernelDcacheWritebackRange(u32 addr, int size);
int sceKernelDcacheWritebackInvalidateRange(u32 addr, int size); int sceKernelDcacheWritebackInvalidateRange(u32 addr, int size);
int sceKernelDcacheWritebackInvalidateAll(); int sceKernelDcacheWritebackInvalidateAll();
void sceKernelGetThreadStackFreeSize(); void sceKernelGetThreadStackFreeSize();
void sceKernelIcacheInvalidateAll(); u32 sceKernelIcacheInvalidateAll();
void sceKernelIcacheClearAll(); u32 sceKernelIcacheClearAll();
#define KERNELOBJECT_MAX_NAME_LENGTH 31 #define KERNELOBJECT_MAX_NAME_LENGTH 31

View file

@ -893,10 +893,10 @@ u32 sceKernelGetModuleId()
return __KernelGetCurThreadModuleId(); return __KernelGetCurThreadModuleId();
} }
void sceKernelFindModuleByName() u32 sceKernelFindModuleByName()
{ {
ERROR_LOG(HLE,"UNIMPL sceKernelFindModuleByName()"); ERROR_LOG(HLE,"UNIMPL sceKernelFindModuleByName()");
RETURN(1); return 1;
} }
u32 sceKernelLoadModuleByID(u32 id, u32 flags, u32 lmoptionPtr) u32 sceKernelLoadModuleByID(u32 id, u32 flags, u32 lmoptionPtr)

View file

@ -144,7 +144,7 @@ u32 sceKernelLibcTime(u32 outPtr)
return t; return t;
} }
void sceKernelLibcGettimeofday() u32 sceKernelLibcGettimeofday(u32 timeAddr)
{ {
#ifdef _WIN32 #ifdef _WIN32
union { union {
@ -158,12 +158,12 @@ void sceKernelLibcGettimeofday()
u32 tv_usec; u32 tv_usec;
}; };
timeval *tv = (timeval*)Memory::GetPointer(PARAM(0)); timeval *tv = (timeval*)Memory::GetPointer(timeAddr);
DEBUG_LOG(HLE,"sceKernelLibcGettimeofday()"); DEBUG_LOG(HLE,"sceKernelLibcGettimeofday()");
GetSystemTimeAsFileTime (&now.ft); GetSystemTimeAsFileTime (&now.ft);
tv->tv_usec = (long) ((now.ns100 / 10LL) % 1000000LL); tv->tv_usec = (long) ((now.ns100 / 10LL) % 1000000LL);
tv->tv_sec = (long) ((now.ns100 - 116444736000000000LL) / 10000000LL); tv->tv_sec = (long) ((now.ns100 - 116444736000000000LL) / 10000000LL);
#endif #endif
RETURN(0); return 0;
} }

View file

@ -17,7 +17,7 @@
#pragma once #pragma once
void sceKernelLibcGettimeofday(); u32 sceKernelLibcGettimeofday(u32 timeAddr);
u32 sceKernelLibcTime(u32 outPtr); u32 sceKernelLibcTime(u32 outPtr);
void sceKernelUSec2SysClock(); void sceKernelUSec2SysClock();
void sceKernelGetSystemTime(); void sceKernelGetSystemTime();