1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00

Bug 387688: Memory cache update fix

This commit is contained in:
John Dallaway 2012-09-24 10:21:15 -04:00 committed by Marc Khouzam
parent d62ed3f350
commit 00ca041f6b

View file

@ -11,6 +11,7 @@
* Ericsson AB - added support for event handling
* Ericsson AB - added memory cache
* Vladimir Prus (CodeSourcery) - support for -data-read-memory-bytes (bug 322658)
* John Dallaway - memory cache update fix (bug 387688)
*******************************************************************************/
package org.eclipse.cdt.dsf.mi.service;
@ -829,12 +830,20 @@ public class MIMemory extends AbstractDsfService implements IMemory, ICachingSer
System.arraycopy(modBlock, 0, cachedBlock.fBlock, pos, count);
}
// Case where the cached block is completely included in the modified block
else if (modBlockStart.distanceTo(cachedBlockStart).longValue() >= 0
&& cachedBlockEnd.distanceTo(modBlockEnd).longValue() >= 0)
{
int pos = (int) modBlockStart.distanceTo(cachedBlockStart).longValue();
System.arraycopy(modBlock, pos, cachedBlock.fBlock, 0, (int) cachedBlock.fLength);
}
// Case where the beginning of the modified block is within the cached block
else if (cachedBlockStart.distanceTo(modBlockStart).longValue() >= 0
&& modBlockStart.distanceTo(cachedBlockEnd).longValue() > 0)
{
int pos = (int) cachedBlockStart.distanceTo(modBlockStart).longValue();
int length = (int) cachedBlockStart.distanceTo(modBlockEnd).longValue();
int length = (int) modBlockStart.distanceTo(cachedBlockEnd).longValue();
System.arraycopy(modBlock, 0, cachedBlock.fBlock, pos, length);
}