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 #4767 from lioncash/mmio 

MMIO: Get rid of a TODO regarding tuples
This commit is contained in:
Markus Wick 2017-01-28 15:38:49 +01:00 committed by GitHub
parent 3405f0ba01 d680d1f81e
commit 69c4e6de41
1 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@
#include <array>
#include <string>
#include <tuple>
#include <type_traits>
#include "Common/Assert.h"
@ -177,45 +178,30 @@ private:
HandlerArray<u32>::Write m_write_handlers32;
// Getter functions for the handler arrays.
//
// TODO:
// It would be desirable to clean these methods up using tuples, i.e. doing something like
//
// auto handlers = std::tie(m_read_handlers8, m_read_handlers16, m_read_handlers32);
// return std::get<Unit>(handlers)[index];
//
// However, we cannot use this currently because of a compiler bug in clang, presumably related
// to http://llvm.org/bugs/show_bug.cgi?id=18345, due to which the above code makes the compiler
// exceed the template recursion depth.
// As a workaround, we cast all handlers to the requested one's type. This cast will
// compile to a NOP for the returned member variable, but it's necessary to get this
// code to compile at all.
template <typename Unit>
ReadHandler<Unit>& GetReadHandler(size_t index)
{
static_assert(std::is_same<Unit, u8>::value || std::is_same<Unit, u16>::value ||
std::is_same<Unit, u32>::value,
static_assert(std::is_same<Unit, u8>() || std::is_same<Unit, u16>() ||
std::is_same<Unit, u32>(),
"Invalid unit used");
auto handlers = std::tie(m_read_handlers8, m_read_handlers16, m_read_handlers32);
using ArrayType = typename HandlerArray<Unit>::Read;
ArrayType& handler = *(std::is_same<Unit, u8>::value ?
(ArrayType*)&m_read_handlers8 :
std::is_same<Unit, u16>::value ? (ArrayType*)&m_read_handlers16 :
(ArrayType*)&m_read_handlers32);
return handler[index];
return std::get<ArrayType&>(handlers)[index];
}
template <typename Unit>
WriteHandler<Unit>& GetWriteHandler(size_t index)
{
static_assert(std::is_same<Unit, u8>::value || std::is_same<Unit, u16>::value ||
std::is_same<Unit, u32>::value,
static_assert(std::is_same<Unit, u8>() || std::is_same<Unit, u16>() ||
std::is_same<Unit, u32>(),
"Invalid unit used");
auto handlers = std::tie(m_write_handlers8, m_write_handlers16, m_write_handlers32);
using ArrayType = typename HandlerArray<Unit>::Write;
ArrayType& handler = *(std::is_same<Unit, u8>::value ?
(ArrayType*)&m_write_handlers8 :
std::is_same<Unit, u16>::value ? (ArrayType*)&m_write_handlers16 :
(ArrayType*)&m_write_handlers32);
return handler[index];
return std::get<ArrayType&>(handlers)[index];
}
};