Bug [388356] Disassembly view tries to disassemble beyond the addressrefs/changes/92/7492/1

space

Change-Id: I30ac42e5e1592c1762899b6a77d2bc9d318ec973

1 files changed, 21 insertions, 1 deletions

diff --git a/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/disassembly/TCFDisassemblyBackend.java b/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/disassembly/TCFDisassemblyBackend.java
index cfb2113..dbde49a 100644
--- a/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/disassembly/TCFDisassemblyBackend.java
+++ b/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/disassembly/TCFDisassemblyBackend.java
@@ -527,9 +527,29 @@ public class TCFDisassemblyBackend extends AbstractDisassemblyBackend {
                 }
                 big_endian = mem.isBigEndian();
                 addr_bits = mem.getAddressSize() * 8;
+
+                int accessSize = 0;
+                BigInteger bit = new BigInteger("1");
+                BigInteger mem_end = bit.shiftLeft(addr_bits);
+                mem_end = mem_end.subtract(bit);
+
+                if (startAddress.compareTo(mem_end) > 0) {
+                    fCallback.setUpdatePending(false);
+                    return;
+                }
+
+                BigInteger requestedLineEndAddr = startAddress.add(BigInteger.valueOf(linesHint * mem.getAddressSize()));
+
+                if (requestedLineEndAddr.compareTo(mem_end) > 0) {
+                    accessSize = mem_end.subtract(startAddress).intValue() + 1;
+                }
+                else {
+                    accessSize = linesHint * mem.getAddressSize();
+                }
+
                 if (!done_disassembly) {
                     Map<String, Object> params = new HashMap<String, Object>();
-                    disass.disassemble(mem.getID(), startAddress, linesHint * 4, params, new DoneDisassemble() {
+                    disass.disassemble(mem.getID(), startAddress, accessSize, params, new DoneDisassemble() {
                         @Override
                         public void doneDisassemble(IToken token, final Throwable error, IDisassemblyLine[] res) {
                             if (execContext != fExecContext) return;