diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2017-03-01 08:11:26 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-01 08:11:26 -0800 |
| commit | 8dc96fce4df9ee80ef58cea03239202f1fa4cdcc (patch) | |
| tree | 6f01672936695d49c64b44e13b291c8c2ee6a7db /Source/Core | |
| parent | 83bd74aef033c0a38aa18b014929bc96bb961080 (diff) | |
| parent | 4846f269167633a77efa8231b9a18c397ff4e07f (diff) | |
Merge pull request #4776 from lioncash/dspemitter
DSPEmitter: Convert a C array to a std::array
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/DSP/Jit/DSPEmitter.cpp | 8 | ||||
| -rw-r--r-- | Source/Core/Core/DSP/Jit/DSPEmitter.h | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Source/Core/Core/DSP/Jit/DSPEmitter.cpp b/Source/Core/Core/DSP/Jit/DSPEmitter.cpp index 323e85ae71..5cbf529c51 100644 --- a/Source/Core/Core/DSP/Jit/DSPEmitter.cpp +++ b/Source/Core/Core/DSP/Jit/DSPEmitter.cpp @@ -75,7 +75,7 @@ void DSPEmitter::DoState(PointerWrap& p) 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_block_links[i] = nullptr; @@ -91,7 +91,7 @@ void DSPEmitter::ClearIRAMandDSPJITCodespaceReset() CompileDispatcher(); 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_block_links[i] = nullptr; @@ -339,7 +339,7 @@ void DSPEmitter::Compile(u16 start_addr) { 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()) { @@ -386,7 +386,7 @@ static void CompileCurrent() while (retry) { 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()) { diff --git a/Source/Core/Core/DSP/Jit/DSPEmitter.h b/Source/Core/Core/DSP/Jit/DSPEmitter.h index fe0d0ccc60..21d30442fb 100644 --- a/Source/Core/Core/DSP/Jit/DSPEmitter.h +++ b/Source/Core/Core/DSP/Jit/DSPEmitter.h @@ -4,6 +4,7 @@ #pragma once +#include <array> #include <cstddef> #include <list> #include <vector> @@ -253,7 +254,7 @@ public: void madd(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: void WriteBranchExit(); |