From 74a81d3e32755e56dde462e96ff49be04afcb84c Mon Sep 17 00:00:00 2001
From: Anton Leherbauer <anton.leherbauer@windriver.com>
Date: Mon, 1 Mar 2010 14:07:52 +0000
Subject: [PATCH] [302875] [dis] Toggling "Show Symbols" resets viewport
 [304110]  [Disassembly] Refresh button should not jump to PC address

---
 .../ui/disassembly/DisassemblyPart.java       | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
index 16e853743b1..82709f52664 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
@@ -1865,13 +1865,25 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem
 				long now = System.currentTimeMillis();
 				if (now >= refreshViewScheduled) {
 					if (DEBUG) System.err.println("*** refreshing view ***"); //$NON-NLS-1$
-					fFocusAddress = PC_UNKNOWN;
+					
+					// save viewport position and frame info
+					BigInteger topAddress = getTopAddress();
 					int targetFrame= fTargetFrame;
+					BigInteger frameAddress = fFrameAddress;
+					BigInteger pcAddress = fPCAddress;
+					
+					// clear viewer
 					resetViewer();
 					if (fScrollPos != null) {
 						fScrollPos.isDeleted = true;
 					}
-					gotoFrameIfActive(targetFrame);
+
+					// restore frame info and viewport
+					fPCAnnotationUpdatePending = true;
+					fTargetFrame = targetFrame;
+					fFrameAddress = frameAddress;
+					fPCAddress = pcAddress;
+					gotoAddress(topAddress);
 				} else {
 					refreshView((int)(refreshViewScheduled - now));
 				}
@@ -1886,6 +1898,14 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem
 		}
 	}
 
+	private BigInteger getTopAddress() {
+		BigInteger topAddress = getAddressOfLine(fViewer.getTopIndex());
+		if (topAddress.equals(fStartAddress)) {
+			topAddress = getAddressOfLine(fViewer.getTopIndex() + 1);
+		}
+		return topAddress;
+	}
+
 	private void resetViewer() {
 		// clear all state and cache
 		fPCAnnotationUpdatePending = false;