mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-19 06:55:23 +02:00
Code Issues Wiki Activity

Bug 379968 : Memory find/replace does not account for target endian-ness

Browse source
This commit is contained in:
Randy Rohrbach 2012-05-22 15:21:11 -04:00
parent d768c30d0c
commit e266e58f98
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindReplaceDialog.java
View file

@ -1134,7 +1134,15 @@ public class FindReplaceDialog extends SelectionDialog
{ {
try try
{ {
fMemoryBlock.setValue(currentPosition.subtract(fMemoryBlock.getBigBaseAddress()), replaceData); if ((searchPhrase instanceof BigIntegerSearchPhrase) && (bytes.length > 0) && bytes[0].isEndianessKnown() && !bytes[0].isBigEndian())
{
// swap the bytes when replacing an integer on little-endian targets
fMemoryBlock.setValue(currentPosition.subtract(fMemoryBlock.getBigBaseAddress()), swapBytes(replaceData));
}
else
{
fMemoryBlock.setValue(currentPosition.subtract(fMemoryBlock.getBigBaseAddress()), replaceData);
}
} }
catch(DebugException de) catch(DebugException de)
{ {
@ -1376,9 +1384,18 @@ public class FindReplaceDialog extends SelectionDialog
byte[] targetBytes = new byte[bytes.length + 1]; byte[] targetBytes = new byte[bytes.length + 1];
targetBytes[0] = 0; targetBytes[0] = 0;
for(int i = 0; i < bytes.length; i++) for(int i = 0; i < bytes.length; i++)
targetBytes[i + 1] = bytes[i].getValue(); {
if (bytes[i].isEndianessKnown() && !bytes[i].isBigEndian())
{
// swap the bytes when matching an integer on little-endian targets
targetBytes[i + 1] = bytes[bytes.length - i - 1].getValue();
}
else
{
targetBytes[i + 1] = bytes[i].getValue();
}
}
// TODO endian?
BigInteger targetBigInteger = new BigInteger(targetBytes); BigInteger targetBigInteger = new BigInteger(targetBytes);
return fPhrase.equals(targetBigInteger); return fPhrase.equals(targetBigInteger);
@ -1395,6 +1412,14 @@ public class FindReplaceDialog extends SelectionDialog
return processedBytes; return processedBytes;
} }
private byte[] swapBytes(byte[] bytes)
{
byte[] processedBytes = new byte[bytes.length];
for (int i = 0; i < bytes.length; i++)
processedBytes[i] = bytes[bytes.length - i - 1];
return processedBytes;
}
interface IMemorySearchQuery extends ISearchQuery interface IMemorySearchQuery extends ISearchQuery
{ {
public IMemoryRenderingSite getMemoryView(); public IMemoryRenderingSite getMemoryView();