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

Use a pointer instead of a non-const ref in MMIO::Mapping::Read now that compatibility with the old interface is not required anymore.

This commit is contained in:
Pierre Bourdon 2014-02-15 11:30:48 +01:00
parent 92f8d93e96
commit 96a66ada2e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/HW/MMIO.h
View File

@ -92,10 +92,10 @@ public:
// Note that for reads we cannot simply return the read value because C++ // Note that for reads we cannot simply return the read value because C++
// allows overloading only with parameter types, not return types. // allows overloading only with parameter types, not return types.
#define READ_FUNC(Size) \ #define READ_FUNC(Size) \
void Read(u32 addr, u##Size& val) const \ void Read(u32 addr, u##Size* val) const \
{ \ { \
u32 id = UniqueID(addr) / sizeof (u##Size); \ u32 id = UniqueID(addr) / sizeof (u##Size); \
val = m_Read##Size##Handlers[id].Read(addr); \ *val = m_Read##Size##Handlers[id].Read(addr); \
} }
READ_FUNC(8) READ_FUNC(16) READ_FUNC(32) READ_FUNC(8) READ_FUNC(16) READ_FUNC(32)
#undef READ_FUNC #undef READ_FUNC
@ -134,7 +134,7 @@ public:
// Dummy 64 bits variants of these functions. While 64 bits MMIO access is // Dummy 64 bits variants of these functions. While 64 bits MMIO access is
// not supported, we need these in order to make the code compile. // not supported, we need these in order to make the code compile.
void Read(u32 addr, u64& val) const { _dbg_assert_(MEMMAP, 0); } void Read(u32 addr, u64* val) const { _dbg_assert_(MEMMAP, 0); }
void Write(u32 addr, u64 val) const { _dbg_assert_(MEMMAP, 0); } void Write(u32 addr, u64 val) const { _dbg_assert_(MEMMAP, 0); }
private: private:

2
Source/Core/Core/HW/MemmapFunctions.cpp
View File

@ -98,7 +98,7 @@ inline void ReadFromHardware(T &_var, const u32 em_address, const u32 effective_
if (em_address < 0xcc000000) if (em_address < 0xcc000000)
_var = EFB_Read(em_address); _var = EFB_Read(em_address);
else else
mmio_mapping->Read(em_address, _var); mmio_mapping->Read(em_address, &_var);
} }
else if (((em_address & 0xF0000000) == 0x80000000) || else if (((em_address & 0xF0000000) == 0x80000000) ||
((em_address & 0xF0000000) == 0xC0000000) || ((em_address & 0xF0000000) == 0xC0000000) ||