Merge pull request #7072 from lioncash/emitter

DSPEmitter: Make m_unresolved_jumps private
This commit is contained in:
Léo Lam 2018-06-04 22:26:24 +02:00 committed by GitHub
commit 8fe7f8d80d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions

View File

@ -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);

View File

@ -205,9 +205,11 @@ public:
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 @@ private:
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).