piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

UCodes: Get rid of pointer casts

Browse Source
This commit is contained in:
Lioncash
2015-10-15 22:45:03 -04:00
parent b0bbe52cc9
commit c420c52308
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h
View File

@ -4,10 +4,10 @@
#pragma once #pragma once
#include <cstring>
#include "Common/ChunkFile.h" #include "Common/ChunkFile.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/Thread.h" #include "Common/Thread.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/HW/DSPHLE/DSPHLE.h" #include "Core/HW/DSPHLE/DSPHLE.h"
@ -35,18 +35,26 @@ inline u8 HLEMemory_Read_U8(u32 address)
inline u16 HLEMemory_Read_U16(u32 address) inline u16 HLEMemory_Read_U16(u32 address)
{ {
u16 value;
if (ExramRead(address)) if (ExramRead(address))
return Common::swap16(*(u16*)&Memory::m_pEXRAM[address & Memory::EXRAM_MASK]); std::memcpy(&value, &Memory::m_pEXRAM[address & Memory::EXRAM_MASK], sizeof(u16));
else else
return Common::swap16(*(u16*)&Memory::m_pRAM[address & Memory::RAM_MASK]); std::memcpy(&value, &Memory::m_pRAM[address & Memory::RAM_MASK], sizeof(u16));
return Common::swap16(value);
} }
inline u32 HLEMemory_Read_U32(u32 address) inline u32 HLEMemory_Read_U32(u32 address)
{ {
u32 value;
if (ExramRead(address)) if (ExramRead(address))
return Common::swap32(*(u32*)&Memory::m_pEXRAM[address & Memory::EXRAM_MASK]); std::memcpy(&value, &Memory::m_pEXRAM[address & Memory::EXRAM_MASK], sizeof(u32));
else else
return Common::swap32(*(u32*)&Memory::m_pRAM[address & Memory::RAM_MASK]); std::memcpy(&value, &Memory::m_pRAM[address & Memory::RAM_MASK], sizeof(u32));
return Common::swap32(value);
} }
inline void* HLEMemory_Get_Pointer(u32 address) inline void* HLEMemory_Get_Pointer(u32 address)