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 #4776 from lioncash/dspemitter 

DSPEmitter: Convert a C array to a std::array
This commit is contained in:
Anthony 2017-03-01 08:11:26 -08:00 committed by GitHub
parent 83bd74aef0 4846f26916
commit 8dc96fce4d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/DSP/Jit/DSPEmitter.cpp
View File

@ -75,7 +75,7 @@ void DSPEmitter::DoState(PointerWrap& p)
void DSPEmitter::ClearIRAM() void DSPEmitter::ClearIRAM()
{ {
for (int i = 0x0000; i < 0x1000; i++) for (size_t i = 0; i < DSP_IRAM_SIZE; i++)
{ {
m_blocks[i] = (DSPCompiledCode)m_stub_entry_point; m_blocks[i] = (DSPCompiledCode)m_stub_entry_point;
m_block_links[i] = nullptr; m_block_links[i] = nullptr;
@ -91,7 +91,7 @@ void DSPEmitter::ClearIRAMandDSPJITCodespaceReset()
CompileDispatcher(); CompileDispatcher();
m_stub_entry_point = CompileStub(); m_stub_entry_point = CompileStub();
for (int i = 0x0000; i < 0x10000; i++) for (size_t i = 0; i < MAX_BLOCKS; i++)
{ {
m_blocks[i] = (DSPCompiledCode)m_stub_entry_point; m_blocks[i] = (DSPCompiledCode)m_stub_entry_point;
m_block_links[i] = nullptr; m_block_links[i] = nullptr;
@ -339,7 +339,7 @@ void DSPEmitter::Compile(u16 start_addr)
{ {
m_block_links[start_addr] = m_block_link_entry; m_block_links[start_addr] = m_block_link_entry;
for (u16 i = 0x0000; i < 0xffff; ++i) for (size_t i = 0; i < 0xffff; ++i)
{ {
if (!m_unresolved_jumps[i].empty()) if (!m_unresolved_jumps[i].empty())
{ {
@ -386,7 +386,7 @@ static void CompileCurrent()
while (retry) while (retry)
{ {
retry = false; retry = false;
for (u16 i = 0x0000; i < 0xffff; ++i) for (size_t i = 0; i < 0xffff; ++i)
{ {
if (!g_dsp_jit->m_unresolved_jumps[i].empty()) if (!g_dsp_jit->m_unresolved_jumps[i].empty())
{ {

3
Source/Core/Core/DSP/Jit/DSPEmitter.h
View File

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <array>
#include <cstddef> #include <cstddef>
#include <list> #include <list>
#include <vector> #include <vector>
@ -253,7 +254,7 @@ public:
void madd(const UDSPInstruction opc); void madd(const UDSPInstruction opc);
void msub(const UDSPInstruction opc); void msub(const UDSPInstruction opc);
std::list<u16> m_unresolved_jumps[MAX_BLOCKS]; std::array<std::list<u16>, MAX_BLOCKS> m_unresolved_jumps;
private: private:
void WriteBranchExit(); void WriteBranchExit();