cemu-project/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2024-11-23 03:19:48 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Make MEMPTR<T> a little more T*-like (#1385)
Some checks failed
Build check / build (push) Has been cancelled
Details
Generate translation template / generate-pot (push) Has been cancelled
Details

Browse Source
This commit is contained in:
capitalistspz 2024-10-30 22:10:32 +00:00 committed by GitHub
parent 459fd5d9bb
commit 47001ad233
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Common/MemPtr.h
View File

@ -98,35 +98,36 @@ class MEMPTR : MEMPTRBase
return MEMPTR<X>(this->m_value);
}
MEMPTR operator+(const MEMPTR& ptr) noexcept
sint32 operator-(const MEMPTR& ptr) noexcept
requires(!std::is_void_v<T>)
{
return MEMPTR(this->GetMPTR() + ptr.GetMPTR());
}
MEMPTR operator-(const MEMPTR& ptr) noexcept
{
return MEMPTR(this->GetMPTR() - ptr.GetMPTR());
return static_cast<sint32>(this->GetMPTR() - ptr.GetMPTR());
}
MEMPTR operator+(sint32 v) noexcept
requires(!std::is_void_v<T>)
{
// pointer arithmetic
return MEMPTR(this->GetMPTR() + v * 4);
return MEMPTR(this->GetMPTR() + v * sizeof(T));
}
MEMPTR operator-(sint32 v) noexcept
requires(!std::is_void_v<T>)
{
// pointer arithmetic
return MEMPTR(this->GetMPTR() - v * 4);
return MEMPTR(this->GetMPTR() - v * sizeof(T));
}
MEMPTR& operator+=(sint32 v) noexcept
requires(!std::is_void_v<T>)
{
m_value += v * sizeof(T);
return *this;
}
template<typename Q = T>
std::enable_if_t<!std::is_same_v<Q, void>, Q>& operator*() const noexcept
requires(!std::is_void_v<Q>)
Q& operator*() const noexcept
{
return *GetPtr();
}
@ -137,7 +138,8 @@ class MEMPTR : MEMPTRBase
}
template<typename Q = T>
std::enable_if_t<!std::is_same_v<Q, void>, Q>& operator[](int index) noexcept
requires(!std::is_void_v<Q>)
Q& operator[](int index) noexcept
{
return GetPtr()[index];
}