archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-09 16:31:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid transitive include of vm_ref.h

Browse source 
Add forward declarations of vm::_ref_base
Remove default AT = u32 in _ptr_base and _ref_base (doesn't play well).
This commit is contained in:
Nekotekina 2019-07-15 15:46:46 +03:00
parent cfa1416d64
commit c01f1a8968
6 changed files with 33 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1084,12 +1084,12 @@ namespace vm
}
}
void fmt_class_string<vm::_ptr_base<const void>>::format(std::string& out, u64 arg)
void fmt_class_string<vm::_ptr_base<const void, u32>>::format(std::string& out, u64 arg)
{
fmt_class_string<u32>::format(out, arg);
}
void fmt_class_string<vm::_ptr_base<const char>>::format(std::string& out, u64 arg)
void fmt_class_string<vm::_ptr_base<const char, u32>>::format(std::string& out, u64 arg)
{
// Special case (may be allowed for some arguments)
if (arg == 0)
@ -1111,7 +1111,7 @@ void fmt_class_string<vm::_ptr_base<const char>>::format(std::string& out, u64 a
out += u8"“";
for (vm::_ptr_base<const volatile char> ptr = vm::cast(arg);; ptr++)
for (vm::_ptr_base<const volatile char, u32> ptr = vm::cast(arg);; ptr++)
{
if (!vm::check_addr(ptr.addr()))
{