Permalink
Browse files

Merge pull request #7072 from lioncash/emitter

DSPEmitter: Make m_unresolved_jumps private
  • Loading branch information...
leoetlino committed Jun 4, 2018
2 parents 5e0da22 + bbd2fd0 commit 8fe7f8d80d5b988404b14906248262602bd3a79d
Showing with 7 additions and 3 deletions.
  1. +1 −1 Source/Core/Core/DSP/Jit/x64/DSPEmitter.cpp
  2. +6 −2 Source/Core/Core/DSP/Jit/x64/DSPEmitter.h
@@ -365,7 +365,7 @@ void DSPEmitter::Compile(u16 start_addr)
JMP(m_return_dispatcher, true);
}
static void CompileCurrent(DSPEmitter& emitter)
void DSPEmitter::CompileCurrent(DSPEmitter& emitter)
{
emitter.Compile(g_dsp.pc);
@@ -205,9 +205,11 @@ class DSPEmitter : public Gen::X64CodeBlock
void madd(UDSPInstruction opc);
void msub(UDSPInstruction opc);
std::array<std::list<u16>, MAX_BLOCKS> m_unresolved_jumps;
private:
// The emitter emits calls to this function. It's present here
// within the class itself to allow access to member variables.
static void CompileCurrent(DSPEmitter& emitter);
void WriteBranchExit();
void WriteBlockLink(u16 dest);
@@ -307,6 +309,8 @@ class DSPEmitter : public Gen::X64CodeBlock
std::vector<Block> m_block_links;
Block m_block_link_entry;
std::array<std::list<u16>, MAX_BLOCKS> m_unresolved_jumps;
u16 m_cycles_left = 0;
// The index of the last stored ext value (compile time).

0 comments on commit 8fe7f8d

Please sign in to comment.