lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-08 07:41:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve disassembly of SPIR-V where a function's last block isn't return

Browse Source 
* In this case the last block in the function was part of a loop continuing, and
  the merge return block was inside the loop.
This commit is contained in:
baldurk
2025-05-26 10:56:54 +01:00
parent d4c1919a9c
commit e070de60ad
1 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/spirv/spirv_disassemble.cpp
+47 -5
View File
@@ -1025,12 +1025,54 @@ rdcstr Reflector::Disassemble(const rdcstr &entryPoint,
while(nextit.opcode() == Op::Line || nextit.opcode() == Op::NoLine)
nextit++;
// next opcode *must* be a label because this is the end of a block
RDCASSERTEQUAL(nextit.opcode(), Op::Label);
OpLabel decodedlabel(nextit);
// next opcode *must* be a label because this is the end of a block, unless there are no more blocks
Id decodedlabelId;
if(nextit.opcode() == Op::FunctionEnd)
{
// if we just hit the end of the function we have to wrap up any CFG constructs to at
// least match their braces. We also try to explicitly annotate what is happening next -
// an if can silently drop its scope but a switch or loop should have a break/continue.
// This situation only happens with strange block ordering
while(!cfgStack.empty())
{
if(cfgStack.back().mergeTarget == decoded.targetLabel)
{
ret += indent + "break;\n";
lineNum++;
}
else if((cfgStack.back().continueTarget == currentBlock &&
cfgStack.back().headerBlock == decoded.targetLabel) ||
cfgStack.back().continueTarget == decoded.targetLabel)
{
ret += indent + "continue;\n";
lineNum++;
}
// if this is the latest merge block print a closing brace and reduce the indent
indent.resize(indent.size() - 2);
// if this is a switch, remove another level
if(cfgStack.back().type == StructuredCFG::Switch)
indent.resize(indent.size() - 2);
ret += indent;
ret += "}\n\n";
lineNum += 2;
cfgStack.pop_back();
}
// don't do any more processing of this branch, we're done
continue;
}
else
{
RDCASSERTEQUAL(nextit.opcode(), Op::Label);
decodedlabelId = OpLabel(nextit).result;
}
// always skip redundant gotos
if(decodedlabel.result == decoded.targetLabel)
if(decodedlabelId == decoded.targetLabel)
{
// however if we're in a switch we might want to print a clarifying fallthrough comment
// or end-of-case break
@@ -1070,7 +1112,7 @@ rdcstr Reflector::Disassemble(const rdcstr &entryPoint,
// if we're in an if, skip branches to the merge block if the next block is the 'else'
if(!cfgStack.empty() && cfgStack.back().type == StructuredCFG::If &&
cfgStack.back().elseTarget == decodedlabel.result &&
cfgStack.back().elseTarget == decodedlabelId &&
cfgStack.back().mergeTarget == decoded.targetLabel)
continue;