ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

I think it should be addr there, not address. Plus code-formatting. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6169 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
j4ck.fr0st 2010-09-03 14:06:34 +00:00
parent 76a5ca84d1
commit c92ae1c915
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Source/Core/VideoCommon/Src/DLCache.cpp
View File

@ -367,10 +367,10 @@ bool CompileAndRunDisplayList(u32 address, int size, CachedDisplayList *dl)
case GX_CMD_CALL_DL: case GX_CMD_CALL_DL:
{ {
u32 addr= DataReadU32(); u32 addr = DataReadU32();
u32 count = DataReadU32(); u32 count = DataReadU32();
ExecuteDisplayList(addr, count); ExecuteDisplayList(addr, count);
emitter.ABI_CallFunctionCC((void *)&ExecuteDisplayList, address, count); emitter.ABI_CallFunctionCC((void *)&ExecuteDisplayList, addr, count);
} }
break; break;
@ -419,7 +419,8 @@ bool CompileAndRunDisplayList(u32 address, int size, CachedDisplayList *dl)
memcpy(NewData,StartAddress,Vdatasize); memcpy(NewData,StartAddress,Vdatasize);
dl->Vdata[dl->BufferCount] = NewData; dl->Vdata[dl->BufferCount] = NewData;
dl->BufferCount++; dl->BufferCount++;
emitter.ABI_CallFunctionCCCP((void *)&VertexLoaderManager::RunCompiledVertices,cmd_byte & GX_VAT_MASK, (cmd_byte & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT, numVertices, NewData); emitter.ABI_CallFunctionCCCP((void *)&VertexLoaderManager::RunCompiledVertices,
cmd_byte & GX_VAT_MASK, (cmd_byte & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT, numVertices, NewData);
} }
} }
else else
@ -529,7 +530,7 @@ bool HandleDisplayList(u32 address, u32 size)
{ {
case DLCache::DLPASS_ANALYZE: case DLCache::DLPASS_ANALYZE:
if (DLCache::AnalyzeAndRunDisplayList(address, size, &dl)) { if (DLCache::AnalyzeAndRunDisplayList(address, size, &dl)) {
dl.dl_hash = GetHash64(Memory_GetPtr(address), size,0); dl.dl_hash = GetHash64(Memory_GetPtr(address), size, 0);
dl.pass = DLCache::DLPASS_COMPILE; dl.pass = DLCache::DLPASS_COMPILE;
dl.check = 1; dl.check = 1;
dl.next_check = 1; dl.next_check = 1;
@ -541,7 +542,7 @@ bool HandleDisplayList(u32 address, u32 size)
break; break;
case DLCache::DLPASS_COMPILE: case DLCache::DLPASS_COMPILE:
// First, check that the hash is the same as the last time. // First, check that the hash is the same as the last time.
if (dl.dl_hash != GetHash64(Memory_GetPtr(address), size,0)) if (dl.dl_hash != GetHash64(Memory_GetPtr(address), size, 0))
{ {
// PanicAlert("uncachable %08x", address); // PanicAlert("uncachable %08x", address);
dl.uncachable = true; dl.uncachable = true;
@ -557,7 +558,7 @@ bool HandleDisplayList(u32 address, u32 size)
dl.check--; dl.check--;
if (dl.check <= 0) if (dl.check <= 0)
{ {
if (dl.dl_hash != GetHash64(Memory_GetPtr(address), size,0)) if (dl.dl_hash != GetHash64(Memory_GetPtr(address), size, 0))
{ {
dl.uncachable = true; dl.uncachable = true;
dl.check = 60; dl.check = 60;
@ -580,13 +581,13 @@ bool HandleDisplayList(u32 address, u32 size)
u8 *old_datareader = g_pVideoData; u8 *old_datareader = g_pVideoData;
((void (*)())(void*)(dl.compiled_code))(); ((void (*)())(void*)(dl.compiled_code))();
Statistics::SwapDL(); Statistics::SwapDL();
ADDSTAT(stats.thisFrame.numCPLoadsInDL,dl.num_cp_reg); ADDSTAT(stats.thisFrame.numCPLoadsInDL, dl.num_cp_reg);
ADDSTAT(stats.thisFrame.numXFLoadsInDL,dl.num_xf_reg); ADDSTAT(stats.thisFrame.numXFLoadsInDL, dl.num_xf_reg);
ADDSTAT(stats.thisFrame.numBPLoadsInDL,dl.num_bp_reg); ADDSTAT(stats.thisFrame.numBPLoadsInDL, dl.num_bp_reg);
ADDSTAT(stats.thisFrame.numCPLoads,dl.num_cp_reg); ADDSTAT(stats.thisFrame.numCPLoads, dl.num_cp_reg);
ADDSTAT(stats.thisFrame.numXFLoads,dl.num_xf_reg); ADDSTAT(stats.thisFrame.numXFLoads, dl.num_xf_reg);
ADDSTAT(stats.thisFrame.numBPLoads,dl.num_bp_reg); ADDSTAT(stats.thisFrame.numBPLoads, dl.num_bp_reg);
INCSTAT(stats.numDListsCalled); INCSTAT(stats.numDListsCalled);
INCSTAT(stats.thisFrame.numDListsCalled); INCSTAT(stats.thisFrame.numDListsCalled);
@ -602,7 +603,7 @@ bool HandleDisplayList(u32 address, u32 size)
DLCache::CachedDisplayList dl; DLCache::CachedDisplayList dl;
if (DLCache::AnalyzeAndRunDisplayList(address, size, &dl)) { if (DLCache::AnalyzeAndRunDisplayList(address, size, &dl)) {
dl.dl_hash = GetHash64(Memory_GetPtr(address), size,0); dl.dl_hash = GetHash64(Memory_GetPtr(address), size, 0);
dl.pass = DLCache::DLPASS_COMPILE; dl.pass = DLCache::DLPASS_COMPILE;
dl.check = 1; dl.check = 1;
dl.next_check = 1; dl.next_check = 1;