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

Interpreter_Tables: Ensure all instructions fit within m_allInstruction at compile-time

Browse Source
This commit is contained in:
Lioncash
2017-01-18 02:17:10 -05:00
parent 6c61021eb1
commit 06488477a9
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp
View File

@ -4,7 +4,6 @@
#include <array> #include <array>
#include "Common/MsgHandler.h"
#include "Core/PowerPC/Gekko.h" #include "Core/PowerPC/Gekko.h"
#include "Core/PowerPC/Interpreter/Interpreter.h" #include "Core/PowerPC/Interpreter/Interpreter.h"
#include "Core/PowerPC/Interpreter/Interpreter_Tables.h" #include "Core/PowerPC/Interpreter/Interpreter_Tables.h"
@ -358,6 +357,15 @@ static std::array<GekkoOPTemplate, 10> table63_2 =
namespace InterpreterTables namespace InterpreterTables
{ {
constexpr size_t TotalInstructionFunctionCount()
{
return primarytable.size() + table4_2.size() + table4_3.size() + table4.size() + table31.size() +
table19.size() + table59.size() + table63.size() + table63_2.size();
}
static_assert(TotalInstructionFunctionCount() < m_allInstructions.size(),
"m_allInstructions is too small");
void InitTables() void InitTables()
{ {
// once initialized, tables are read-only // once initialized, tables are read-only
@ -484,11 +492,6 @@ void InitTables()
for (auto& tpl : table63_2) for (auto& tpl : table63_2)
m_allInstructions[m_numInstructions++] = &tpl.opinfo; m_allInstructions[m_numInstructions++] = &tpl.opinfo;
if (m_numInstructions >= 512)
{
PanicAlert("m_allInstructions underdimensioned");
}
initialized = true; initialized = true;
} }
} }