Merge branch 'fix_tigerxdragon_crash' of https://github.com/kaienfr/ppsspp_cn into kaienfr-fix_tigerxdragon_crash

This commit is contained in:
Henrik Rydgard 2013-08-31 23:15:07 +02:00
commit 36c45a2d9e
2 changed files with 9 additions and 4 deletions

View File

@ -1515,6 +1515,13 @@ void ModuleMgrForKernel_50f0c1ec(u32 moduleId, u32 argsize, u32 argAddr, u32 ret
sceKernelStartModule(moduleId, argsize, argAddr, returnValueAddr, optionAddr);
}
//fix for tiger x dragon
u32 ModuleMgrForKernel_a1a78c58(const char *name, u32 flags, u32 optionAddr)
{
WARN_LOG(HLE,"Not support this patcher");
return sceKernelLoadModule(name, flags, optionAddr);
}
const HLEFunction ModuleMgrForUser[] =
{
{0x977DE386,&WrapU_CUU<sceKernelLoadModule>,"sceKernelLoadModule"},
@ -1542,11 +1549,9 @@ const HLEFunction ModuleMgrForKernel[] =
{
{0x50f0c1ec,&WrapV_UUUUU<ModuleMgrForKernel_50f0c1ec>, "ModuleMgrForKernel_50f0c1ec"},//Not sure right
{0x977de386, &WrapU_CUU<ModuleMgrForKernel_977de386>, "ModuleMgrForKernel_977de386"},//Not sure right
{0xa1a78c58, 0, "ModuleMgrForKernel_a1a78c58"},
{0xa1a78c58, &WrapU_CUU<ModuleMgrForKernel_a1a78c58>, "ModuleMgrForKernel_a1a78c58"}, //fix for tiger x dragon
};
void Register_ModuleMgrForUser()
{
RegisterModule("ModuleMgrForUser", ARRAY_SIZE(ModuleMgrForUser), ModuleMgrForUser);

2
native

@ -1 +1 @@
Subproject commit 9282fa59cadc1faad6c247d413fb96231293acd2
Subproject commit 9761532a1c1ca5de733e8d39f6dbcf23d99e9d7c