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

Merge pull request #1474 from phire/DSPHLE_cleanups 

DSPHLE: Remove individual byteswaps and replace with generic function.
This commit is contained in:
Scott Mansell 2015-11-24 13:33:59 +13:00
parent f92a36d86c d2b03e1aad
commit 83bda3be46
5 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/CommonFuncs.h
View File

@ -167,7 +167,7 @@ inline void swap<8>(u8* data)
template <typename T> template <typename T>
inline T FromBigEndian(T data) inline T FromBigEndian(T data)
{ {
//static_assert(std::is_arithmetic<T>::value, "function only makes sense with arithmetic types"); static_assert(std::is_arithmetic<T>::value, "function only makes sense with arithmetic types");
swap<sizeof(data)>(reinterpret_cast<u8*>(&data)); swap<sizeof(data)>(reinterpret_cast<u8*>(&data));
return data; return data;

3
Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp
View File

@ -403,8 +403,7 @@ void AXUCode::ProcessPBList(u32 pb_addr)
m_samples_auxB_surround m_samples_auxB_surround
}}; }};
if (!ReadPB(pb_addr, pb)) ReadPB(pb_addr, pb);
break;
u32 updates_addr = HILO_TO_32(pb.updates.data); u32 updates_addr = HILO_TO_32(pb.updates.data);
u16* updates = (u16*)HLEMemory_Get_Pointer(updates_addr); u16* updates = (u16*)HLEMemory_Get_Pointer(updates_addr);

22
Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h
View File

@ -78,31 +78,17 @@ union AXBuffers
}; };
// Read a PB from MRAM/ARAM // Read a PB from MRAM/ARAM
bool ReadPB(u32 addr, PB_TYPE& pb) void ReadPB(u32 addr, PB_TYPE& pb)
{ {
u16* dst = (u16*)&pb; u16* dst = (u16*)&pb;
const u16* src = (const u16*)Memory::GetPointer(addr); Memory::CopyFromEmuSwapped<u16>(dst, addr, sizeof(pb));
if (!src)
return false;
for (u32 i = 0; i < sizeof (pb) / sizeof (u16); ++i)
dst[i] = Common::swap16(src[i]);
return true;
} }
// Write a PB back to MRAM/ARAM // Write a PB back to MRAM/ARAM
bool WritePB(u32 addr, const PB_TYPE& pb) void WritePB(u32 addr, const PB_TYPE& pb)
{ {
const u16* src = (const u16*)&pb; const u16* src = (const u16*)&pb;
u16* dst = (u16*)Memory::GetPointer(addr); Memory::CopyToEmuSwapped<u16>(addr, src, sizeof(pb));
if (!dst)
return false;
for (u32 i = 0; i < sizeof (pb) / sizeof (u16); ++i)
dst[i] = Common::swap16(src[i]);
return true;
} }
#if 0 #if 0

3
Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp
View File

@ -455,8 +455,7 @@ void AXWiiUCode::ProcessPBList(u32 pb_addr)
m_samples_aux3 m_samples_aux3
}}; }};
if (!ReadPB(pb_addr, pb)) ReadPB(pb_addr, pb);
break;
u16 num_updates[3]; u16 num_updates[3];
u16 updates[1024]; u16 updates[1024];

25
Source/Core/Core/HW/Memmap.h
View File

@ -92,4 +92,29 @@ void Write_U64(const u64 var, const u32 address);
void Write_U32_Swap(const u32 var, const u32 address); void Write_U32_Swap(const u32 var, const u32 address);
void Write_U64_Swap(const u64 var, const u32 address); void Write_U64_Swap(const u64 var, const u32 address);
// Templated functions for byteswapped copies.
template <typename T>
void CopyFromEmuSwapped(T* data, u32 address, size_t size)
{
const T* src = reinterpret_cast<T*>(GetPointer(address));
if(src == nullptr)
return;
for (size_t i = 0; i < size / sizeof(T); i++)
data[i] = Common::FromBigEndian(src[i]);
}
template <typename T>
void CopyToEmuSwapped(u32 address, const T* data, size_t size)
{
T* dest = reinterpret_cast<T*>(GetPointer(address));
if (dest == nullptr)
return;
for (size_t i = 0; i < size / sizeof(T); i++)
dest[i] = Common::FromBigEndian(data[i]);
}
} }