lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

In release advance precisely opcode length. Fixes #54.

Browse Source 
In non-release, still warn + log for unexpected tokens, and
error for over-reading, but since there's no good documentation
we have to just assume the opcode length is accurate and try not
to worry about mysterious inaccuracies.
This commit is contained in:
baldurk
2014-05-10 23:46:53 +01:00
parent b30fe86658
commit 1f43b0e64e
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d11/shaders/dxbc_disassemble.cpp
+11 -2
View File
@@ -1827,6 +1827,7 @@ bool DXBCFile::ExtractOperation(uint32_t *&tokenStream, ASMOperation &retOp)
}
}
#if !defined(RELEASE)
if((uint32_t)(tokenStream - begin) > retOp.length)
{
RDCERR("Consumed too many tokens for %d!", retOp.operation);
@@ -1837,17 +1838,25 @@ bool DXBCFile::ExtractOperation(uint32_t *&tokenStream, ASMOperation &retOp)
}
else if((uint32_t)(tokenStream - begin) < retOp.length)
{
RDCERR("Consumed too few tokens for %d!", retOp.operation);
// sometimes this just happens, which is why we only print this in non-release so we can
// inspect it. There's probably not much we can do though, it's just magic.
RDCWARN("Consumed too few tokens for %d!", retOp.operation);
uint32_t missing = retOp.length - (uint32_t)(tokenStream - begin);
for(uint32_t i=0; i < missing; i++)
{
RDCLOG("missing token %d: 0x%08x", tokenStream[0]);
RDCLOG("missing token %d: 0x%08x", i, tokenStream[0]);
tokenStream++;
}
}
// make sure we consumed all uint32s
RDCASSERT((uint32_t)(tokenStream - begin) == retOp.length);
#else
// there's no good documentation for this, we're freewheeling blind in a nightmarish hellscape.
// Instead of assuming we can predictably decode the whole of every opcode, just advance by the
// defined length.
tokenStream = begin + retOp.length;
#endif
return true;
}