RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-04 22:19:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Compilation fix

Browse source
This commit is contained in:
Nekotekina 2015-04-15 18:12:10 +03:00
parent d032bc5691
commit cfb41c4dab
3 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rpcs3/Emu/Memory/vm.h
View file

@ -65,7 +65,7 @@ namespace vm
void dealloc(u32 addr, memory_location location = user_space);
template<typename T = void>
T* const get_ptr(u32 addr)
T* get_ptr(u32 addr)
{
return reinterpret_cast<T*>(static_cast<u8*>(g_base_addr) + addr);
}
@ -77,7 +77,7 @@ namespace vm
}
template<typename T = void>
T* const priv_ptr(u32 addr)
T* priv_ptr(u32 addr)
{
return reinterpret_cast<T*>(static_cast<u8*>(g_priv_addr) + addr);
}
@ -107,15 +107,11 @@ namespace vm
template<>
struct cast_ptr<unsigned long>
{
static_assert(sizeof(unsigned long) == 8, "Unexpected size of unsigned long");
__forceinline static u32 cast(const unsigned long addr, const char* func)
{
const u32 res = static_cast<u32>(addr);
if (res != addr)
{
vm::error(addr, func);
}
return res;
return cast_ptr<u64>::cast(addr, func);
}
};
#endif

2
rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp
View file

@ -74,7 +74,7 @@ u64 get_save_data_size(const std::string& dir)
{
if ((entry->flags & DirEntry_TypeMask) == DirEntry_TypeFile)
{
result += vfsFile(dir + "/" + entry->name).GetSize();
result += entry->size;
}
}