Implementation of disassembly mode.

debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/internal/sourcelookup/DisassemblyManager.java

@@ -1,23 +0,0 @@
-/*
- *(c) Copyright QNX Software Systems Ltd. 2002.
- * All Rights Reserved.
- * 
- */
-
-package org.eclipse.cdt.debug.core.internal.sourcelookup;
-
-/**
- * Enter type comment.
- * 
- * @since: Oct 8, 2002
- */
-public class DisassemblyManager
-{
-	/**
-	 * Constructor for DisassemblyManager.
-	 */
-	public DisassemblyManager()
-	{
-		super();
-	}
-}

debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocator.java

@@ -36,7 +36,7 @@ public interface ICSourceLocator extends ISourceLocator
 	 * @param fileName the file name for which to locate source
 	 * @return an object representing a source element. 
 	 */
-	Object getSourceElement( String fileName );
+//	Object getSourceElement( String fileName );
 	
 	/**
 	 * Returns the source locations of this locator.

debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java

@@ -53,9 +53,9 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIObject;
 import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
 import org.eclipse.cdt.debug.core.cdi.model.ICDIThread;
 import org.eclipse.cdt.debug.core.cdi.model.ICDIWatchpoint;
-import org.eclipse.cdt.debug.core.internal.sourcelookup.CSourceLocator;
+import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceLocator;
-import org.eclipse.cdt.debug.core.internal.sourcelookup.CSourceManager;
+import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceManager;
-import org.eclipse.cdt.debug.core.internal.sourcelookup.DisassemblyManager;
+import org.eclipse.cdt.debug.internal.core.sourcelookup.DisassemblyManager;
 import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation;
 import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator;
 import org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint;
@@ -1805,7 +1805,7 @@ public class CDebugTarget extends CDebugElement
 	protected ISourceLocator createSourceLocator( IProject project )
 	{
 		return new CSourceManager( ( getLaunch().getSourceLocator() != null ) ? getLaunch().getSourceLocator() : new CSourceLocator( project ), 
-									new DisassemblyManager() ) ;
+									new DisassemblyManager( this ) ) ;
 	}
 	
 	protected void setSourceSearchPath()

debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceLocation.java

@@ -3,7 +3,7 @@
  * All Rights Reserved.
  * 
  */
-package org.eclipse.cdt.debug.core.internal.sourcelookup;
+package org.eclipse.cdt.debug.internal.core.sourcelookup;
 
 import java.io.File;
 

debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java

@@ -3,7 +3,7 @@
  * All Rights Reserved.
  * 
  */
-package org.eclipse.cdt.debug.core.internal.sourcelookup;
+package org.eclipse.cdt.debug.internal.core.sourcelookup;
 
 import java.io.File;
 

debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java

@@ -4,7 +4,7 @@
  * 
  */
 
-package org.eclipse.cdt.debug.core.internal.sourcelookup;
+package org.eclipse.cdt.debug.internal.core.sourcelookup;
 
 import java.util.ArrayList;
 
@@ -106,6 +106,7 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.core.ICSourceLocator#getSourceElement(String)
 	 */
+/*
 	public Object getSourceElement( String fileName )
 	{
 		Object result = null;
@@ -128,7 +129,7 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato
 		}
 		return result;
 	}
-
+*/
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.core.ICSourceLocator#contains(IResource)
 	 */

debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java

@@ -4,7 +4,7 @@
  * 
  */
 
-package org.eclipse.cdt.debug.core.internal.sourcelookup;
+package org.eclipse.cdt.debug.internal.core.sourcelookup;
 
 import org.eclipse.cdt.debug.core.IStackFrameInfo;
 import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation;
@@ -32,8 +32,8 @@ public class CSourceManager implements ICSourceLocator, ISourceMode, IAdaptable
 	 */
 	public CSourceManager( ISourceLocator sourceLocator, DisassemblyManager disassemblyManager )
 	{
-		fSourceLocator = sourceLocator;
+		setSourceLocator( sourceLocator );
-		fDisassemblyManager = disassemblyManager;
+		setDisassemblyManager( disassemblyManager );
 	}
 
 	/* (non-Javadoc)
@@ -58,11 +58,12 @@ public class CSourceManager implements ICSourceLocator, ISourceMode, IAdaptable
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#getSourceElement(String)
 	 */
+/*
 	public Object getSourceElement( String fileName )
 	{
 		return ( getCSourceLocator() != null ) ? getCSourceLocator().getSourceElement( fileName ) : null;
 	}
-
+*/
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#getSourceLocations()
 	 */
@@ -106,7 +107,7 @@ public class CSourceManager implements ICSourceLocator, ISourceMode, IAdaptable
 		fMode = mode;
 	}
 
-	protected int getRealMode()
+	public int getRealMode()
 	{
 		return fRealMode;
 	}
@@ -129,7 +130,21 @@ public class CSourceManager implements ICSourceLocator, ISourceMode, IAdaptable
 	 */
 	public Object getSourceElement( IStackFrame stackFrame )
 	{
-		return ( getSourceLocator() != null ) ? getSourceLocator().getSourceElement( stackFrame ) : null;
+		Object result = null;
+		if ( getMode() == ISourceMode.MODE_SOURCE && getSourceLocator() != null )
+		{
+			result = getSourceLocator().getSourceElement( stackFrame );
+		}
+		if ( result == null && getDisassemblyManager() != null )
+		{
+			setRealMode( ISourceMode.MODE_DISASSEMBLY );
+			result = getDisassemblyManager().getSourceElement( stackFrame );
+		}
+		else
+		{
+			setRealMode( ISourceMode.MODE_SOURCE );
+		}
+		return result;
 	}
 	
 	protected ICSourceLocator getCSourceLocator()
@@ -143,4 +158,19 @@ public class CSourceManager implements ICSourceLocator, ISourceMode, IAdaptable
 	{
 		return fSourceLocator;
 	}
+
+	protected void setSourceLocator( ISourceLocator sl )
+	{
+		fSourceLocator = sl;
+	}
+	
+	protected void setDisassemblyManager( DisassemblyManager dm )
+	{
+		fDisassemblyManager = dm;
+	}
+
+	protected DisassemblyManager getDisassemblyManager()
+	{
+		return fDisassemblyManager;
+	}
 }

debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/DisassemblyManager.java

@@ -0,0 +1,61 @@
+/*
+ *(c) Copyright QNX Software Systems Ltd. 2002.
+ * All Rights Reserved.
+ * 
+ */
+
+package org.eclipse.cdt.debug.internal.core.sourcelookup;
+
+import org.eclipse.cdt.debug.core.IStackFrameInfo;
+import org.eclipse.cdt.debug.internal.core.DisassemblyStorage;
+import org.eclipse.cdt.debug.internal.core.model.CDebugTarget;
+import org.eclipse.debug.core.model.IStackFrame;
+
+/**
+ * Enter type comment.
+ * 
+ * @since: Oct 8, 2002
+ */
+public class DisassemblyManager
+{
+	private CDebugTarget fDebugTarget;
+	private DisassemblyStorage fStorage = null;
+
+	/**
+	 * Constructor for DisassemblyManager.
+	 */
+	public DisassemblyManager( CDebugTarget target )
+	{
+		setDebugTarget( target );
+	}
+
+	public int getLineNumber( IStackFrameInfo frameInfo )
+	{
+		return 0;
+	}
+
+	public Object getSourceElement( IStackFrame stackFrame )
+	{
+		return null;
+	}
+	
+	private void setDebugTarget( CDebugTarget target )
+	{
+		fDebugTarget = target;
+	}
+	
+	public CDebugTarget getDebugTarget()
+	{
+		return fDebugTarget;
+	}
+	
+	private void setDisassemblyStorage( DisassemblyStorage ds )
+	{
+		fStorage = ds;
+	}
+	
+	protected DisassemblyStorage getDisassemblyStorage()
+	{
+		return fStorage;
+	}
+}

debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CUISourceLocator.java

@@ -8,7 +8,7 @@ package org.eclipse.cdt.debug.ui;
 import java.text.MessageFormat;
 
 import org.eclipse.cdt.debug.core.IStackFrameInfo;
-import org.eclipse.cdt.debug.core.internal.sourcelookup.CSourceLocator;
+import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceLocator;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunchConfiguration;