piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some preliminary cleanup of the global namespace for LTO.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6942 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2011-01-28 00:53:30 +00:00
parent 72d604d3f2
commit 2a7f305d45
8 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Core/DSPCore/Src/DSPCore.cpp
View File

@ -39,7 +39,7 @@ SDSP g_dsp;
DSPBreakpoints dsp_breakpoints;
DSPCoreState core_state = DSPCORE_STOP;
u16 cyclesLeft = 0;
DSPEmitter *jit = NULL;
DSPEmitter *dspjit = NULL;
Common::Event step_event;
Common::CriticalSection ExtIntCriticalSection;
@ -92,7 +92,7 @@ bool DSPCore_Init(const char *irom_filename, const char *coef_filename,
{
g_dsp.step_counter = 0;
cyclesLeft = 0;
jit = NULL;
dspjit = NULL;
g_dsp.irom = (u16*)AllocateMemoryPages(DSP_IROM_BYTE_SIZE);
g_dsp.iram = (u16*)AllocateMemoryPages(DSP_IRAM_BYTE_SIZE);
@ -150,7 +150,7 @@ bool DSPCore_Init(const char *irom_filename, const char *coef_filename,
// Initialize JIT, if necessary
if(bUsingJIT)
jit = new DSPEmitter();
dspjit = new DSPEmitter();
DSPAnalyzer::Analyze();
@ -165,9 +165,9 @@ void DSPCore_Shutdown()
{
core_state = DSPCORE_STOP;
if(jit) {
delete jit;
jit = NULL;
if(dspjit) {
delete dspjit;
dspjit = NULL;
}
step_event.Shutdown();
FreeMemoryPages(g_dsp.irom, DSP_IROM_BYTE_SIZE);
@ -248,10 +248,10 @@ void DSPCore_CheckExceptions()
// Handle state changes and stepping.
int DSPCore_RunCycles(int cycles)
{
if (jit)
if (dspjit)
{
cyclesLeft = cycles;
CompiledCode pExecAddr = (CompiledCode)jit->enterDispatcher;
CompiledCode pExecAddr = (CompiledCode)dspjit->enterDispatcher;
pExecAddr();
if (g_dsp.external_interrupt_waiting)
@ -318,7 +318,7 @@ void DSPCore_Step()
void CompileCurrent()
{
jit->Compile(g_dsp.pc);
dspjit->Compile(g_dsp.pc);
bool retry = true;
@ -327,11 +327,11 @@ void CompileCurrent()
retry = false;
for(u16 i = 0x0000; i < 0xffff; ++i)
{
if (!jit->unresolvedJumps[i].empty())
if (!dspjit->unresolvedJumps[i].empty())
{
u16 addrToCompile = jit->unresolvedJumps[i].front();
jit->Compile(addrToCompile);
if (!jit->unresolvedJumps[i].empty())
u16 addrToCompile = dspjit->unresolvedJumps[i].front();
dspjit->Compile(addrToCompile);
if (!dspjit->unresolvedJumps[i].empty())
retry = true;
}
}

2
Source/Core/DSPCore/Src/DSPCore.h
View File

@ -267,7 +267,7 @@ struct SDSP
extern SDSP g_dsp;
extern DSPBreakpoints dsp_breakpoints;
extern DSPEmitter *jit;
extern DSPEmitter *dspjit;
extern u16 cyclesLeft;
bool DSPCore_Init(const char *irom_filename, const char *coef_filename,

4
Source/Core/DSPCore/Src/DSPHWInterface.cpp
View File

@ -257,8 +257,8 @@ void gdsp_idma_in(u16 dsp_addr, u32 addr, u32 size)
NOTICE_LOG(DSPLLE, "*** Copy new UCode from 0x%08x to 0x%04x (crc: %8x)", addr, dsp_addr, g_dsp.iram_crc);
if (jit)
jit->ClearIRAM();
if (dspjit)
dspjit->ClearIRAM();
DSPAnalyzer::Analyze();
}