mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-06 17:26:01 +02:00
Code Issues Wiki Activity

Bug 489579 - [memory] PlainTextExporter doesn't work as expected, when

Browse source 
addressable size > 1

Change-Id: I97bc6aecbc9db0c40831b8180295df72ed283410
This commit is contained in:
Marc Dumais 2016-03-14 14:16:51 -04:00 • committed by Gerrit Code Review @ Eclipse.org
parent 90a56a1e7d
commit 91f9730d27
1 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextExporter.java
View file

@ -481,19 +481,23 @@ public class PlainTextExporter implements IMemoryExporter {
public IStatus run(IProgressMonitor monitor) { public IStatus run(IProgressMonitor monitor) {
try try
{ {
// FIXME 4 byte default final BigInteger addressableSize = getAdressableSize();
BigInteger CELLSIZE = BigInteger.valueOf(4); // These variables control how the output will be formatted
BigInteger COLUMNS = BigInteger.valueOf(5); // FIXME // The output data is split by chunks of 1 addressable unit size.
final BigInteger dataCellSize = BigInteger.valueOf(4);
BigInteger DATA_PER_LINE = CELLSIZE.multiply(COLUMNS); // show 32 bytes of data per line, total. Adjust number of columns to compensate
// for longer addressable unit size
final BigInteger numberOfColumns = BigInteger.valueOf(32).divide(addressableSize);
// deduce the number of data chunks to be output, per line
final BigInteger dataCellsPerLine = dataCellSize.multiply(numberOfColumns);
BigInteger transferAddress = fStartAddress; BigInteger transferAddress = fStartAddress;
FileWriter writer = new FileWriter(fOutputFile); FileWriter writer = new FileWriter(fOutputFile);
BigInteger jobs = fEndAddress.subtract(transferAddress).divide(DATA_PER_LINE); BigInteger jobs = fEndAddress.subtract(transferAddress).divide(dataCellsPerLine);
BigInteger factor = BigInteger.ONE; BigInteger factor = BigInteger.ONE;
if(jobs.compareTo(BigInteger.valueOf(0x7FFFFFFF)) > 0) if(jobs.compareTo(BigInteger.valueOf(0x7FFFFFFF)) > 0)
{ {
@ -506,7 +510,7 @@ public class PlainTextExporter implements IMemoryExporter {
BigInteger jobCount = BigInteger.ZERO; BigInteger jobCount = BigInteger.ZERO;
while(transferAddress.compareTo(fEndAddress) < 0 && !monitor.isCanceled()) while(transferAddress.compareTo(fEndAddress) < 0 && !monitor.isCanceled())
{ {
BigInteger length = DATA_PER_LINE; BigInteger length = dataCellsPerLine;
if(fEndAddress.subtract(transferAddress).compareTo(length) < 0) if(fEndAddress.subtract(transferAddress).compareTo(length) < 0)
length = fEndAddress.subtract(transferAddress); length = fEndAddress.subtract(transferAddress);
@ -514,23 +518,13 @@ public class PlainTextExporter implements IMemoryExporter {
StringBuffer buf = new StringBuffer(); StringBuffer buf = new StringBuffer();
// String transferAddressString = transferAddress.toString(16); for(int i = 0; i < length.divide(dataCellSize).intValue(); i++)
// future option
// for(int i = 0; i < 8 - transferAddressString.length(); i++)
// buf.append("0");
// buf.append(transferAddressString);
// buf.append(" "); // TODO tab?
// data
for(int i = 0; i < length.divide(CELLSIZE).intValue(); i++)
{ {
if(i != 0) if(i != 0)
buf.append(" "); //$NON-NLS-1$ buf.append(" "); //$NON-NLS-1$
MemoryByte bytes[] = ((IMemoryBlockExtension) fMemoryBlock).getBytesFromAddress( MemoryByte bytes[] = ((IMemoryBlockExtension) fMemoryBlock).getBytesFromAddress(
transferAddress.add(CELLSIZE.multiply(BigInteger.valueOf(i))), transferAddress.add(dataCellSize.multiply(BigInteger.valueOf(i))),
CELLSIZE.longValue() / ((IMemoryBlockExtension) fMemoryBlock).getAddressableSize()); dataCellSize.longValue());
for(int byteIndex = 0; byteIndex < bytes.length; byteIndex++) for(int byteIndex = 0; byteIndex < bytes.length; byteIndex++)
{ {
String bString = BigInteger.valueOf(0xFF & bytes[byteIndex].getValue()).toString(16); String bString = BigInteger.valueOf(0xFF & bytes[byteIndex].getValue()).toString(16);
@ -577,4 +571,17 @@ public class PlainTextExporter implements IMemoryExporter {
job.setUser(true); job.setUser(true);
job.schedule(); job.schedule();
} }
private BigInteger getAdressableSize() {
BigInteger addressableSize;
try {
addressableSize = BigInteger.valueOf(((IMemoryBlockExtension)fMemoryBlock).getAddressableSize());
} catch (DebugException e1) {
// sane value for most cases
addressableSize = BigInteger.ONE;
}
return addressableSize;
}
} }