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

Fixed compilation errors 

Implemented vm::ptr & vm::ref
This commit is contained in:
DHrpcs3 2014-08-01 19:27:48 +03:00
parent cd33be1491
commit 7411012db9
7 changed files with 523 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
rpcs3/Emu/Memory/vm.cpp Normal file
View File

@ -0,0 +1,44 @@
#include "stdafx.h"
namespace vm
{
//TODO
bool check_addr(u32 addr)
{
return false;
}
bool map(u32 addr, u32 size, u32 flags)
{
return false;
}
bool unmap(u32 addr, u32 size, u32 flags)
{
return false;
}
u32 alloc(u32 size)
{
return 0;
}
void unalloc(u32 addr)
{
}
u32 read32(u32 addr)
{
return 0;
}
bool read32(u32 addr, u32& value)
{
return false;
}
bool write32(u32 addr, u32 value)
{
return false;
}
}

59
rpcs3/Emu/Memory/vm.h
View File

@ -2,45 +2,28 @@
namespace vm
{
bool check_addr(u32 addr);
bool map(u32 addr, u32 size, u32 flags);
bool unmap(u32 addr, u32 size = 0, u32 flags = 0);
u32 alloc(u32 size);
void unalloc(u32 addr);
template<typename T>
T* get_ptr(u32 addr)
{
return (T*)&Memory[addr];
}
template<typename T>
T& get_ref(u32 addr)
{
return (T&)Memory[addr];
}
//TODO
bool check_addr(u32 addr)
{
return false;
}
bool map(u32 addr, u32 size, u32 flags)
{
return false;
}
bool unmap(u32 addr, u32 size = 0, u32 flags = 0)
{
return false;
}
u32 alloc(u32 size)
{
return 0;
}
void unalloc(u32 addr)
{
}
u32 read32(u32 addr)
{
return 0;
}
bool read32(u32 addr, u32& value)
{
return false;
}
bool write32(u32 addr, u32 value)
{
return false;
}
u32 read32(u32 addr);
bool read32(u32 addr, u32& value);
bool write32(u32 addr, u32 value);
}
#include "vm_ptr.h"

382
rpcs3/Emu/Memory/vm_ptr.h
View File

@ -2,5 +2,385 @@
namespace vm
{
//TODO
template<typename T, int lvl = 1, typename AT = u32>
class ptr
{
AT m_addr;
public:
ptr operator++ (int)
{
AT result = m_addr;
m_addr += sizeof(AT);
return { result };
}
ptr& operator++ ()
{
m_addr += sizeof(AT);
return *this;
}
ptr operator-- (int)
{
AT result = m_addr;
m_addr -= sizeof(AT);
return { result };
}
ptr& operator-- ()
{
m_addr -= sizeof(AT);
return *this;
}
ptr& operator += (int count)
{
m_addr += count * sizeof(AT);
return *this;
}
ptr& operator -= (int count)
{
m_addr -= count * sizeof(AT);
return *this;
}
ptr operator + (int count) const
{
return { m_addr + count * sizeof(AT) };
}
ptr operator - (int count) const
{
return { m_addr - count * sizeof(AT) };
}
__forceinline ptr<T, lvl - 1, AT>& operator *()
{
return get_ref<ptr<T, lvl - 1, AT>>(m_addr);
}
__forceinline const ptr<T, lvl - 1, AT>& operator *() const
{
return get_ref<const ptr<T, lvl - 1, AT>>(m_addr);
}
__forceinline ptr<T, lvl - 1, AT>& operator [](int index)
{
return get_ref<ptr<T, lvl - 1, AT>>(m_addr + sizeof(AT) * index);
}
__forceinline const ptr<T, lvl - 1, AT>& operator [](int index) const
{
return get_ref<const ptr<T, lvl - 1, AT>>(m_addr + sizeof(AT) * index);
}
operator bool() const
{
return m_addr != 0;
}
AT addr() const
{
return m_addr;
}
bool check() const
{
return Memory.IsGoodAddr(m_addr, sizeof(AT));
}
static ptr make(u32 addr)
{
return (ptr&)addr;
}
};
template<typename T, typename AT>
class ptr<T, 1, AT>
{
AT m_addr;
public:
__forceinline T* operator -> ()
{
return get_ptr<T>(m_addr);
}
__forceinline const T* operator -> () const
{
return get_ptr<const T>(m_addr);
}
ptr operator++ (int)
{
AT result = m_addr;
m_addr += sizeof(T);
return { result };
}
ptr& operator++ ()
{
m_addr += sizeof(T);
return *this;
}
ptr operator-- (int)
{
AT result = m_addr;
m_addr -= sizeof(T);
return { result };
}
ptr& operator-- ()
{
m_addr -= sizeof(T);
return *this;
}
ptr& operator += (int count)
{
m_addr += count * sizeof(T);
return *this;
}
ptr& operator -= (int count)
{
m_addr -= count * sizeof(T);
return *this;
}
ptr operator + (int count) const
{
return { m_addr + count * sizeof(T) };
}
ptr operator - (int count) const
{
return { m_addr - count * sizeof(T) };
}
__forceinline T& operator *()
{
return get_ref<T>(m_addr);
}
__forceinline const T& operator *() const
{
return get_ref<T>(m_addr);
}
__forceinline T& operator [](int index)
{
return get_ref<T>(m_addr + sizeof(T) * index);
}
__forceinline const T& operator [](int index) const
{
return get_ref<const T>(m_addr + sizeof(T) * index);
}
/*
operator ref<T>()
{
return { m_addr };
}
operator const ref<T>() const
{
return { m_addr };
}
*/
AT addr() const
{
return m_addr;
}
operator bool() const
{
return m_addr != 0;
}
T* get_ptr() const
{
return vm::get_ptr<T>(m_addr);
}
bool check() const
{
return Memory.IsGoodAddr(m_addr, sizeof(T));
}
static ptr make(u32 addr)
{
return (ptr&)addr;
}
};
template<typename AT>
class ptr<void, 1, AT>
{
AT m_addr;
public:
AT addr() const
{
return m_addr;
}
void* get_ptr() const
{
return vm::get_ptr<void>(m_addr);
}
bool check() const
{
return Memory.IsGoodAddr(m_addr);
}
operator bool() const
{
return m_addr != 0;
}
static ptr make(u32 addr)
{
return (ptr&)addr;
}
};
template<typename RT, typename AT>
class ptr<RT(*)(), 1, AT>
{
AT m_addr;
__forceinline RT call_func(bool is_async) const
{
Callback cb;
cb.SetAddr(m_addr);
return (RT)cb.Branch(!is_async);
}
public:
typedef RT(*type)();
__forceinline RT operator()() const
{
return call_func(false);
}
__forceinline void async() const
{
call_func(true);
}
AT addr() const
{
return m_addr;
}
type get_ptr() const
{
return *((type*)vm::get_ptr<void*>(m_addr));
}
bool check() const
{
return Memory.IsGoodAddr(m_addr);
}
operator bool() const
{
return m_addr != 0;
}
static ptr make(u32 addr)
{
return (ptr&)addr;
}
};
template<typename AT, typename RT, typename ...T>
class ptr<RT(*)(T...), 1, AT>
{
AT m_addr;
__forceinline RT call_func(bool is_async, T... args) const
{
template<typename T>
struct _func_arg
{
__forceinline static u64 get_value(const T& arg)
{
return arg;
}
};
template<typename T, typename AT>
struct _func_arg<ptr<T, AT>>
{
__forceinline static u64 get_value(const ptr<T, AT> arg)
{
return arg.addr();
}
};
template<typename T, typename AT>
struct _func_arg<ref<T, AT>>
{
__forceinline static u64 get_value(const ref<T, AT> arg)
{
return arg.addr();
}
};
Callback cb;
cb.SetAddr(m_addr);
cb.Handle(_func_arg<T>::get_value(args)...);
return (RT)cb.Branch(!is_async);
}
public:
typedef RT(*type)(T...);
__forceinline RT operator()(T... args) const
{
return call_func(false, args...);
}
__forceinline void async(T... args) const
{
call_func(true, args...);
}
AT addr() const
{
return m_addr;
}
type get_ptr() const
{
return *((type*)vm::get_ptr<void*>(m_addr));
}
bool check() const
{
return Memory.IsGoodAddr(m_addr);
}
operator bool() const
{
return m_addr != 0;
}
static ptr make(u32 addr)
{
return (ptr&)addr;
}
};
template<typename T, int lvl = 1, typename AT = u32>
class beptr : public ptr<T, lvl, be_t<AT>> {};
}

59
rpcs3/Emu/Memory/vm_ref.h
View File

@ -2,5 +2,62 @@
namespace vm
{
//TODO
template<typename T, typename AT = u32>
class _ref_base
{
AT m_addr;
public:
operator T&()
{
return get_ref<T>(m_addr);
}
operator const T&() const
{
return get_ref<const T>(m_addr);
}
AT addr() const
{
return m_addr;
}
bool check() const
{
return Memory.IsGoodAddr(m_addr, sizeof(T));
}
static ref make(u32 addr)
{
return (ref&)addr;
}
};
//BE reference to LE data
template<typename T, typename AT = u32> class brefl : public _ref_base<T, be_t<AT>> {};
//BE reference to BE data
template<typename T, typename AT = u32> class brefb : public _ref_base<be_t<T>, be_t<AT>> {};
//LE reference to BE data
template<typename T, typename AT = u32> class lrefb : public _ref_base<be_t<T>, AT> {};
//LE reference to LE data
template<typename T, typename AT = u32> class lrefl : public _ref_base<T, AT> {};
namespace ps3
{
//default reference for HLE functions (LE reference to BE data)
template<typename T, typename AT = u32> class ref : public lrefb {};
//default reference for HLE structures (BE reference to BE data)
template<typename T, typename AT = u32> class bref : public brefb {};
}
namespace psv
{
//default reference for HLE functions & structures (LE reference to LE data)
template<typename T, typename AT = u32> class ref : public lrefl {};
}
}

38
rpcs3/Emu/Memory/vm_var.h
View File

@ -34,7 +34,7 @@ namespace vm
void alloc()
{
m_addr = Memory.Alloc(size(), m_align);
m_ptr = Memory.IsGoodAddr(m_addr, size()) ? (T*)&Memory[m_addr] : nullptr;
m_ptr = Memory.IsGoodAddr(m_addr, size()) ? get_ptr<T>(m_addr) : nullptr;
}
void dealloc()
@ -46,16 +46,6 @@ namespace vm
m_ptr = nullptr;
}
}
void clear()
{
if (check())
{
Memory.Free(m_addr);
m_addr = 0;
m_ptr = nullptr;
}
}
static var make(u32 addr, u32 size = sizeof(T), u32 align = sizeof(T))
{
@ -64,7 +54,7 @@ namespace vm
res.m_addr = addr;
res.m_size = size;
res.m_align = align;
res.m_ptr = Memory.IsGoodAddr(m_addr, sizeof(T)) ? (T*)&Memory[m_addr] : nullptr;
res.m_ptr = Memory.IsGoodAddr(addr, size) ? get_ptr<T>(addr) : nullptr;
return res;
}
@ -166,7 +156,7 @@ namespace vm
void alloc()
{
m_addr = Memory.Alloc(size(), m_align);
m_ptr = Memory.IsGoodAddr(m_addr, size()) ? (T*)&Memory[m_addr] : nullptr;
m_ptr = Memory.IsGoodAddr(m_addr, size()) ? get_ptr<T>(m_addr) : nullptr;
}
void dealloc()
@ -187,7 +177,7 @@ namespace vm
res.m_count = count;
res.m_size = size;
res.m_align = align;
res.m_ptr = Memory.IsGoodAddr(m_addr, size()) ? (T*)&Memory[m_addr] : nullptr;
res.m_ptr = Memory.IsGoodAddr(addr, size * count) ? get_ptr<T>(addr) : nullptr;
return res;
}
@ -297,17 +287,17 @@ namespace vm
T& at(uint index)
{
if (index >= count())
throw std::out_of_range();
throw std::out_of_range(std::to_string(index) + " >= " + count());
return *(m_ptr + index);
return *(T*)((u8*)m_ptr + (m_size < m_align ? m_align : m_size) * index);
}
const T& at(uint index) const
{
if (index >= count())
throw std::out_of_range();
throw std::out_of_range(std::to_string(index) + " >= " + count());
return *(m_ptr + index);
return *(T*)((u8*)m_ptr + (m_size < m_align ? m_align : m_size) * index);
}
T* ptr()
@ -365,7 +355,7 @@ namespace vm
void alloc()
{
m_addr = Memory.Alloc(size(), m_align);
m_ptr = Memory.IsGoodAddr(m_addr, size()) ? (T*)&Memory[m_addr] : nullptr;
m_ptr = Memory.IsGoodAddr(m_addr, size()) ? get_ptr<T>(m_addr) : nullptr;
}
void dealloc()
@ -479,23 +469,23 @@ namespace vm
const T& operator [](uint index) const
{
assert(index < count());
return return *(T*)((u8*)m_ptr + (m_size < m_align ? m_align : m_size) * index);
return *(T*)((u8*)m_ptr + (m_size < m_align ? m_align : m_size) * index);
}
T& at(uint index)
{
if (index >= count())
throw std::out_of_range();
throw std::out_of_range(std::to_string(index) + " >= " + count());
return *(m_ptr + index);
return *(T*)((u8*)m_ptr + (m_size < m_align ? m_align : m_size) * index);
}
const T& at(uint index) const
{
if (index >= count())
throw std::out_of_range();
throw std::out_of_range(std::to_string(index) + " >= " + count());
return *(m_ptr + index);
return *(T*)((u8*)m_ptr + (m_size < m_align ? m_align : m_size) * index);
}
/*

3
rpcs3/emucore.vcxproj
View File

@ -90,6 +90,7 @@
<ClCompile Include="Emu\Io\Mouse.cpp" />
<ClCompile Include="Emu\Io\Pad.cpp" />
<ClCompile Include="Emu\Memory\Memory.cpp" />
<ClCompile Include="Emu\Memory\vm.cpp" />
<ClCompile Include="Emu\SysCalls\Callback.cpp" />
<ClCompile Include="Emu\SysCalls\FuncList.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\lv2Fs.cpp" />
@ -518,7 +519,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<WarningLevel>Level2</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>false</SDLCheck>
<PrecompiledHeader>Use</PrecompiledHeader>

3
rpcs3/emucore.vcxproj.filters
View File

@ -584,6 +584,9 @@
<ClCompile Include="Emu\SysCalls\Modules\cellMsgDialog.cpp">
<Filter>Emu\SysCalls\Modules</Filter>
</ClCompile>
<ClCompile Include="Emu\Memory\vm.cpp">
<Filter>Emu\Memory</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Crypto\aes.h">