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

Callbacks fix + TODO

This commit is contained in:
Nekotekina 2014-09-02 02:59:46 +04:00
parent 6e02477fc6
commit bd9775e0eb
2 changed files with 16 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -270,6 +270,10 @@ namespace vm
{
AT m_addr;
static_assert(!std::is_floating_point<RT>::value, "TODO: Unsupported callback result type (floating point)");
static_assert(!std::is_pointer<RT>::value, "Invalid callback result type (pointer)");
__forceinline RT call_func(bool is_async) const
{
Callback cb;
@ -312,60 +316,27 @@ namespace vm
}
};
namespace ps3
{
template<typename T, int lvl, typename AT> struct ptr;
}
template<typename AT, typename RT, typename ...T>
class _ptr_base<RT(*)(T...), 1, AT>
{
AT m_addr;
static_assert(!std::is_floating_point<RT>::value, "TODO: Unsupported callback result type (floating point)");
static_assert(!std::is_pointer<RT>::value, "Invalid callback result type (pointer)");
template<typename TT>
struct _func_arg
{
static_assert(!std::is_floating_point<TT>::value, "TODO: Unsupported callback argument type (floating point)");
static_assert(!std::is_pointer<TT>::value, "Invalid callback argument type (pointer)");
__forceinline static u64 get_value(const TT& arg)
{
return arg;
}
};
template<typename TT, typename ATT>
struct _func_arg<_ptr_base<TT, 1, ATT>>
{
__forceinline static u64 get_value(const _ptr_base<TT, 1, ATT>& arg)
{
return arg.addr();
}
};
template<typename TT, typename ATT>
struct _func_arg<ps3::ptr<TT, 1, ATT>>
{
__forceinline static u64 get_value(const ps3::ptr<TT, 1, ATT>& arg)
{
return arg.addr();
}
};
template<typename TT, typename ATT>
struct _func_arg<_ref_base<TT, ATT>>
{
__forceinline static u64 get_value(const _ref_base<TT, ATT>& arg)
{
return arg.addr();
}
};
template<typename TT, int i, typename ATT>
struct _func_arg<mem_ptr_t<TT, i, ATT>>
{
static_assert(!i, "Invalid callback argument type (mem_ptr_t), use vm::ptr");
__forceinline static u64 get_value(const mem_ptr_t<TT, i, ATT>& arg)
{
return 0;
u64 res = 0;
(TT&)res = arg;
return res;
}
};

2
rpcs3/Emu/SysCalls/SC_FUNC.h
View File

@ -74,7 +74,7 @@ namespace detail
static_assert(!std::is_pointer<T>::value, "Invalid function result type: pointer");
if (std::is_floating_point<T>::value)
{
(T&)CPU.FPR[1] = value;
CPU.FPR[1] = (double)value;
}
else
{