Bug 310171

Description Norman Yee 2010-04-22 14:03:31 EDT

Build Identifier: I20100312-1448

The DSF disassembly view can display disassembly interspersed with the source code that corresponds to the disassembly.  If the source code is from multiple files, the disassembly view will only display the mixed instructions for one file, the one in the current stack frame, and the mixed instructions for the other files are missing.

Consider this example:

I have a main.cpp that contains:

#include <stdio.h>
#include "foobar.h"

int main(void)
{
	int x = 0;

	x = inc(x);
	printf("x = %d\n", x);
	return 0;
}

and foobar.h contains:

inline int inc(int a)
{
	return a + 1;
}

If I'm viewing the disassembly for main(), I only see the mixed instructions for main() but the mixed instructions for inc() are not shown because the source code is located in a different source file, foobar.h.

Looking at the source code for the DSF disassembly view, I think the problem is that it calls the DSF disassembly service's getMixedInstructions(IDisassemblyDMContext, String filename, int linenum,  int lines, DataRequestMonitor<IMixedInstruction[]>) first.  If that fails, it calls getMixedInstructions(IDisassemblyDMContext, BigInteger startAddress, BigInteger endAddress, DataRequestMonitor<IMixedInstruction[]>), which can return mixed instructions from multiple source files.  I think it should be changed so that it skips the first call and just uses getMixedInstructions(IDisassemblyDMContext, BigInteger startAddress, BigInteger endAddress, DataRequestMonitor<IMixedInstruction[]>).

I am writing a custom DSF debugger plugin and I can work around the problem by returning a failure code in my implementation of the DSF disassembly service's getMixedInstructions(IDisassemblyDMContext, String filename, int linenum,  int lines, DataRequestMonitor<IMixedInstruction[]>).  This forces the disassembly view to call getMixedInstructions(IDisassemblyDMContext, BigInteger startAddress, BigInteger endAddress, DataRequestMonitor<IMixedInstruction[]>) and then I see the correct mixed instructions in the disassembly view.  I would prefer that this problem be fixed in the disassembly view.

Reproducible: Always