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

Clean vm::ps3 namespace use

Browse source
This commit is contained in:
Nekotekina 2018-02-09 17:49:37 +03:00
parent 76be7d40ac
commit cce0ad0c35
176 changed files with 693 additions and 698 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/Memory/Memory.cpp
View file

@ -105,7 +105,7 @@ bool VirtualMemoryBlock::Read32(const u32 addr, u32* value)
u32 realAddr;
if (!getRealAddr(addr, realAddr))
return false;
*value = vm::ps3::read32(realAddr);
*value = vm::read32(realAddr);
return true;
}
@ -114,7 +114,7 @@ bool VirtualMemoryBlock::Write32(const u32 addr, const u32 value)
u32 realAddr;
if (!getRealAddr(addr, realAddr))
return false;
vm::ps3::write32(realAddr, value);
vm::write32(realAddr, value);
return true;
}

2
rpcs3/Emu/Memory/vm.cpp
View file

@ -781,7 +781,7 @@ namespace vm
return nullptr;
}
inline namespace ps3
inline namespace ps3_
{
void init()
{

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

@ -268,7 +268,7 @@ namespace vm
g_base_addr[addr] = value;
}
inline namespace ps3
inline namespace ps3_
{
// Convert specified PS3 address to a pointer of specified (possibly converted to BE) type
template<typename T> inline to_be_t<T>* _ptr(u32 addr)

2
rpcs3/Emu/Memory/vm_ptr.h
View file

@ -287,7 +287,7 @@ namespace vm
// LE pointer to BE data
template<typename T, typename AT = u32> using lptrb = _ptr_base<to_be_t<T>, to_le_t<AT>>;
inline namespace ps3
inline namespace ps3_
{
// Default pointer type for PS3 HLE functions (Native endianness pointer to BE data)
template<typename T, typename AT = u32> using ptr = ptrb<T, AT>;

2
rpcs3/Emu/Memory/vm_ref.h
View file

@ -163,7 +163,7 @@ namespace vm
// LE reference to BE data
template<typename T, typename AT = u32> using lrefb = _ref_base<to_be_t<T>, to_le_t<AT>>;
inline namespace ps3
inline namespace ps3_
{
// default reference for PS3 HLE functions (Native endianness reference to BE data)
template<typename T, typename AT = u32> using ref = refb<T, AT>;

2
rpcs3/Emu/Memory/vm_var.h
View file

@ -114,7 +114,7 @@ namespace vm
// BE variable
template<typename T, typename A> using varb = _var_base<to_be_t<T>, A>;
inline namespace ps3
inline namespace ps3_
{
// BE variable
template<typename T, typename A = stack_allocator<ppu_thread>> using var = varb<T, A>;