ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build fix

This commit is contained in:
skidau 2013-01-05 12:56:35 +11:00
parent 1c9c6052d5
commit c61b0c7fba
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/Src/HLE/HLE.cpp
View File

@ -58,10 +58,10 @@ static const SPatch OSPatches[] =
// speedup // speedup
//{ "OSProtectRange", HLE_Misc::UnimplementedFunctionFalse, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, //{ "OSProtectRange", HLE_Misc::UnimplementedFunctionFalse, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC },
//{ "THPPlayerGetState", HLE_Misc:THPPlayerGetState, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, //{ "THPPlayerGetState", HLE_Misc:THPPlayerGetState, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC },
//{ "memcpy", HLE_Misc::memcpy, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, //{ "memcpy", HLE_Misc::gc_memcpy, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY },
//{ "memcmp", HLE_Misc::memcmp, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, //{ "memcmp", HLE_Misc::gc_memcmp, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY },
//{ "memset", HLE_Misc::memset, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, //{ "memset", HLE_Misc::gc_memset, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY },
//{ "memmove", HLE_Misc::memmove, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, //{ "memmove", HLE_Misc::gc_memmove, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY },
//{ "__div2i", HLE_Misc::div2i, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // Slower? //{ "__div2i", HLE_Misc::div2i, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // Slower?
//{ "__div2u", HLE_Misc::div2u, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // Slower? //{ "__div2u", HLE_Misc::div2u, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // Slower?

18
Source/Core/Core/Src/HLE/HLE_Misc.cpp
View File

@ -358,7 +358,7 @@ void ExecuteDOL(u8* dolFile, u32 fileSize)
Memory::Write_U32(num_args, args_base + ptr_to_num_args); Memory::Write_U32(num_args, args_base + ptr_to_num_args);
Memory::Write_U32(0x14, hi_ptr); Memory::Write_U32(0x14, hi_ptr);
for (int i = 0; i < args.length(); i++) for (unsigned int i = 0; i < args.length(); i++)
Memory::WriteUnchecked_U8(args[i], new_args_ptr+i); Memory::WriteUnchecked_U8(args[i], new_args_ptr+i);
} }
@ -412,39 +412,39 @@ u32 GetDolFileSize(std::string dol)
return (u32)pFileSystem->GetFileSize(dolFile.c_str()); return (u32)pFileSystem->GetFileSize(dolFile.c_str());
} }
void memmove() void gc_memmove()
{ {
u32 dest = GPR(3); u32 dest = GPR(3);
u32 src = GPR(4); u32 src = GPR(4);
u32 count = GPR(5); u32 count = GPR(5);
std::memmove((u8*)(Memory::base + dest), (u8*)(Memory::base + src), count); memmove((u8*)(Memory::base + dest), (u8*)(Memory::base + src), count);
NPC = LR; NPC = LR;
} }
void memcpy() void gc_memcpy()
{ {
u32 dest = GPR(3); u32 dest = GPR(3);
u32 src = GPR(4); u32 src = GPR(4);
u32 count = GPR(5); u32 count = GPR(5);
std::memcpy((u8*)(Memory::base + dest), (u8*)(Memory::base + src), count); memcpy((u8*)(Memory::base + dest), (u8*)(Memory::base + src), count);
NPC = LR; NPC = LR;
} }
void memset() void gc_memset()
{ {
u32 dest = GPR(3); u32 dest = GPR(3);
u32 ch = GPR(4); u32 ch = GPR(4);
u32 count = GPR(5); u32 count = GPR(5);
std::memset((u8*)(Memory::base + dest), ch, count); memset((u8*)(Memory::base + dest), ch, count);
NPC = LR; NPC = LR;
} }
void memcmp() void gc_memcmp()
{ {
u32 dest = GPR(3); u32 dest = GPR(3);
u32 src = GPR(4); u32 src = GPR(4);
u32 count = GPR(5); u32 count = GPR(5);
GPR(3) = std::memcmp((u8*)(Memory::base + dest), (u8*)(Memory::base + src), count); GPR(3) = memcmp((u8*)(Memory::base + dest), (u8*)(Memory::base + src), count);
NPC = LR; NPC = LR;
} }