Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 186266 Details for
Bug 237306
[multicore][multi-process] Support for Multi-Process debugging
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
done cleanups to Marc's patch , working patch.
breakpoints_comment83.txt (text/plain), 24.32 KB, created by
Onur Akdemir
on 2011-01-07 07:56:56 EST
(
hide
)
Description:
done cleanups to Marc's patch , working patch.
Filename:
MIME Type:
Creator:
Onur Akdemir
Created:
2011-01-07 07:56:56 EST
Size:
24.32 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.cdt.dsf.gdb >Index: src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java,v >retrieving revision 1.17 >diff -u -r1.17 FinalLaunchSequence.java >--- src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java 5 Nov 2010 01:28:48 -0000 1.17 >+++ src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java 7 Jan 2011 12:46:28 -0000 >@@ -26,6 +26,7 @@ > import org.eclipse.cdt.dsf.datamodel.DataModelInitializedEvent; > import org.eclipse.cdt.dsf.datamodel.IDMContext; > import org.eclipse.cdt.dsf.debug.service.IBreakpoints.IBreakpointsTargetDMContext; >+import org.eclipse.cdt.dsf.debug.service.IProcesses.IProcessDMContext; > import org.eclipse.cdt.dsf.debug.service.ISourceLookup.ISourceLookupDMContext; > import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants; > import org.eclipse.cdt.dsf.gdb.IGdbDebugPreferenceConstants; >@@ -37,6 +38,7 @@ > import org.eclipse.cdt.dsf.gdb.service.SessionType; > import org.eclipse.cdt.dsf.gdb.service.command.IGDBControl; > import org.eclipse.cdt.dsf.mi.service.CSourceLookup; >+import org.eclipse.cdt.dsf.mi.service.IMIContainerDMContext; > import org.eclipse.cdt.dsf.mi.service.IMIProcesses; > import org.eclipse.cdt.dsf.mi.service.MIBreakpointsManager; > import org.eclipse.cdt.dsf.mi.service.command.CommandFactory; >@@ -64,7 +66,8 @@ > private CommandFactory fCommandFactory; > > private DsfServicesTracker fTracker; >- >+ private IMIContainerDMContext fInitialContainerCtx; >+ > public FinalLaunchSequence(DsfExecutor executor, GdbLaunch launch, SessionType sessionType, boolean attach, IProgressMonitor pm) { > super(executor, pm, LaunchMessages.getString("FinalLaunchSequence.0"), LaunchMessages.getString("FinalLaunchSequence.1")); //$NON-NLS-1$ //$NON-NLS-2$ > fLaunch = launch; >@@ -131,6 +134,12 @@ > return; > } > >+ // We can cheat a little. Since we know GDB starts off focused on the one >+ // groupId it automatically created, we can simply create a container with the 'null' >+ // groupId, which will get ignored and will use the process currently in focus. >+ IProcessDMContext procCtx = fProcService.createProcessContext(fCommandControl.getContext(), null); >+ fInitialContainerCtx = fProcService.createContainerContext(procCtx, null); >+ > requestMonitor.done(); > } > >@@ -285,7 +294,7 @@ > final IPath execPath = fGDBBackend.getProgramPath(); > if (!noFileCommand && execPath != null && !execPath.isEmpty()) { > fCommandControl.queueCommand( >- fCommandFactory.createMIFileExecAndSymbols(fCommandControl.getContext(), >+ fCommandFactory.createMIFileExecAndSymbols(fInitialContainerCtx, > execPath.toPortableString()), > new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor)); > } else { >@@ -670,12 +679,14 @@ > public void stepStartTrackingBreakpoints(final RequestMonitor requestMonitor) { > if (fSessionType != SessionType.CORE) { > MIBreakpointsManager bpmService = fTracker.getService(MIBreakpointsManager.class); >- IBreakpointsTargetDMContext breakpointDmc = (IBreakpointsTargetDMContext)fCommandControl.getContext(); >+ //IBreakpointsTargetDMContext breakpointDmc = (IBreakpointsTargetDMContext)fCommandControl.getContext(); >+ IBreakpointsTargetDMContext breakpointDmc = fInitialContainerCtx; > > bpmService.startTrackingBreakpoints(breakpointDmc, requestMonitor); > } else { > requestMonitor.done(); > } >+ > } > > /** >@@ -712,5 +723,9 @@ > fTracker = null; > requestMonitor.done(); > } >+ >+ protected IMIContainerDMContext getInitialContainerContext(){ >+ return fInitialContainerCtx; >+ } > } > >Index: src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_0.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_0.java,v >retrieving revision 1.9 >diff -u -r1.9 GDBBreakpoints_7_0.java >--- src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_0.java 11 Mar 2010 19:09:40 -0000 1.9 >+++ src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_0.java 7 Jan 2011 12:46:28 -0000 >@@ -27,6 +27,7 @@ > import org.eclipse.cdt.dsf.gdb.internal.GdbPlugin; > import org.eclipse.cdt.dsf.gdb.internal.tracepointactions.ITracepointAction; > import org.eclipse.cdt.dsf.gdb.internal.tracepointactions.TracepointActionManager; >+import org.eclipse.cdt.dsf.gdb.service.command.GDBControlDMContext; > import org.eclipse.cdt.dsf.mi.service.IMICommandControl; > import org.eclipse.cdt.dsf.mi.service.IMIRunControl; > import org.eclipse.cdt.dsf.mi.service.MIBreakpointDMData; >@@ -176,7 +177,8 @@ > } > }; > >- fRunControl.executeWithTargetAvailable(context, new Step[] { insertBreakpointStep }, finalRm); >+ GDBControlDMContext ctx = DMContexts.getAncestorOfType(context,GDBControlDMContext.class ); >+ fRunControl.executeWithTargetAvailable(ctx, new Step[] { insertBreakpointStep }, finalRm); > } > > /** >Index: src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java,v >retrieving revision 1.1 >diff -u -r1.1 GDBProcesses_7_2.java >--- src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java 16 Dec 2010 03:13:31 -0000 1.1 >+++ src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java 7 Jan 2011 12:46:28 -0000 >@@ -14,12 +14,14 @@ > import org.eclipse.cdt.dsf.concurrent.RequestMonitor; > import org.eclipse.cdt.dsf.datamodel.DMContexts; > import org.eclipse.cdt.dsf.datamodel.IDMContext; >+import org.eclipse.cdt.dsf.debug.service.IBreakpoints.IBreakpointsTargetDMContext; > import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; > import org.eclipse.cdt.dsf.gdb.internal.GdbPlugin; > import org.eclipse.cdt.dsf.gdb.service.command.IGDBControl; > import org.eclipse.cdt.dsf.mi.service.IMICommandControl; > import org.eclipse.cdt.dsf.mi.service.IMIContainerDMContext; > import org.eclipse.cdt.dsf.mi.service.IMIProcessDMContext; >+import org.eclipse.cdt.dsf.mi.service.MIBreakpointsManager; > import org.eclipse.cdt.dsf.mi.service.command.CommandFactory; > import org.eclipse.cdt.dsf.mi.service.command.output.MIAddInferiorInfo; > import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo; >@@ -92,6 +94,11 @@ > return; > } > >+ // Start tracking this context breakpoints. >+ MIBreakpointsManager bpmService = getServicesTracker().getService(MIBreakpointsManager.class); >+ IBreakpointsTargetDMContext breakpointDmc = createContainerContextFromGroupId(fCommandControl.getContext(), groupId); >+ bpmService.startTrackingBreakpoints(breakpointDmc, rm); >+ > final IMIContainerDMContext containerDmc = createContainerContext(procCtx, groupId); > fCommandControl.queueCommand( > fCommandFactory.createMITargetAttach(containerDmc, ((IMIProcessDMContext)procCtx).getProcId()), >Index: src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java,v >retrieving revision 1.20 >diff -u -r1.20 GDBControl.java >--- src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java 5 Nov 2010 01:28:48 -0000 1.20 >+++ src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java 7 Jan 2011 12:46:28 -0000 >@@ -45,6 +45,7 @@ > import org.eclipse.cdt.dsf.mi.service.IMIBackend; > import org.eclipse.cdt.dsf.mi.service.IMIBackend.BackendStateChangedEvent; > import org.eclipse.cdt.dsf.mi.service.IMICommandControl; >+import org.eclipse.cdt.dsf.mi.service.IMIContainerDMContext; > import org.eclipse.cdt.dsf.mi.service.IMIProcesses; > import org.eclipse.cdt.dsf.mi.service.MIProcesses; > import org.eclipse.cdt.dsf.mi.service.MIProcesses.ContainerExitedDMEvent; >@@ -362,10 +363,10 @@ > requestMonitor.done(); > return; > } >- >+ IMIContainerDMContext fContainerDmc = procService.createContainerContextFromGroupId(fControlDmc, MIProcesses.UNIQUE_GROUP_ID); > // Insert a breakpoint at the requested stop symbol. > queueCommand( >- getCommandFactory().createMIBreakInsert(fControlDmc, true, false, null, 0, stopSymbol, 0), >+ getCommandFactory().createMIBreakInsert(fContainerDmc, true, false, null, 0, stopSymbol, 0), > new DataRequestMonitor<MIBreakInsertInfo>(getExecutor(), requestMonitor) { > @Override > protected void handleSuccess() { >Index: src/org/eclipse/cdt/dsf/gdb/service/command/GDBControlDMContext.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControlDMContext.java,v >retrieving revision 1.3 >diff -u -r1.3 GDBControlDMContext.java >--- src/org/eclipse/cdt/dsf/gdb/service/command/GDBControlDMContext.java 29 Jan 2010 14:37:01 -0000 1.3 >+++ src/org/eclipse/cdt/dsf/gdb/service/command/GDBControlDMContext.java 7 Jan 2011 12:46:28 -0000 >@@ -10,7 +10,6 @@ > *******************************************************************************/ > package org.eclipse.cdt.dsf.gdb.service.command; > >-import org.eclipse.cdt.dsf.debug.service.IBreakpoints.IBreakpointsTargetDMContext; > import org.eclipse.cdt.dsf.debug.service.IDisassembly.IDisassemblyDMContext; > import org.eclipse.cdt.dsf.debug.service.IModules.ISymbolDMContext; > import org.eclipse.cdt.dsf.debug.service.ISignals.ISignalsDMContext; >@@ -22,7 +21,7 @@ > * > */ > public class GDBControlDMContext extends MIControlDMContext >- implements ISymbolDMContext, IBreakpointsTargetDMContext, ISourceLookupDMContext, >+ implements ISymbolDMContext, ISourceLookupDMContext, > ISignalsDMContext, IDisassemblyDMContext, ITraceTargetDMContext > { > >Index: src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java,v >retrieving revision 1.24 >diff -u -r1.24 GDBControl_7_0.java >--- src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java 5 Nov 2010 01:28:48 -0000 1.24 >+++ src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java 7 Jan 2011 12:46:28 -0000 >@@ -33,6 +33,7 @@ > import org.eclipse.cdt.dsf.concurrent.RequestMonitor; > import org.eclipse.cdt.dsf.concurrent.Sequence; > import org.eclipse.cdt.dsf.datamodel.AbstractDMEvent; >+import org.eclipse.cdt.dsf.debug.service.IBreakpoints.IBreakpointsTargetDMContext; > import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext; > import org.eclipse.cdt.dsf.debug.service.command.ICommand; > import org.eclipse.cdt.dsf.debug.service.command.ICommandControl; >@@ -395,8 +396,9 @@ > rm.done(); > return; > } >- >- queueCommand(getCommandFactory().createMIBreakInsert(fControlDmc, true, false, null, 0, userStopSymbol, 0), >+ IMIProcesses procService = getServicesTracker().getService(IMIProcesses.class); >+ fContainerDmc = procService.createContainerContextFromGroupId(fControlDmc, MIProcesses.UNIQUE_GROUP_ID); >+ queueCommand(getCommandFactory().createMIBreakInsert((IBreakpointsTargetDMContext)fContainerDmc, true, false, null, 0, userStopSymbol, 0), > new DataRequestMonitor<MIBreakInsertInfo>(getExecutor(), rm) { > @Override > public void handleSuccess() { >@@ -423,7 +425,7 @@ > @Override > public void execute(final RequestMonitor rm) { > if (reverseEnabled) { >- queueCommand(getCommandFactory().createMIBreakInsert(fControlDmc, true, false, null, 0, >+ queueCommand(getCommandFactory().createMIBreakInsert((IBreakpointsTargetDMContext)fContainerDmc, true, false, null, 0, > ICDTLaunchConfigurationConstants.DEBUGGER_STOP_AT_MAIN_SYMBOL_DEFAULT, 0), > new DataRequestMonitor<MIBreakInsertInfo>(getExecutor(), rm) { > @Override >@@ -448,8 +450,6 @@ > new Step() { > @Override > public void execute(RequestMonitor rm) { >- IMIProcesses procService = getServicesTracker().getService(IMIProcesses.class); >- fContainerDmc = procService.createContainerContextFromGroupId(fControlDmc, MIProcesses.UNIQUE_GROUP_ID); > ICommand<MIInfo> command; > > if (useContinueCommand(launch, restart)) { >Index: src/org/eclipse/cdt/dsf/mi/service/IMIContainerDMContext.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/IMIContainerDMContext.java,v >retrieving revision 1.2 >diff -u -r1.2 IMIContainerDMContext.java >--- src/org/eclipse/cdt/dsf/mi/service/IMIContainerDMContext.java 3 Jun 2010 00:09:36 -0000 1.2 >+++ src/org/eclipse/cdt/dsf/mi/service/IMIContainerDMContext.java 7 Jan 2011 12:46:29 -0000 >@@ -10,6 +10,7 @@ > *******************************************************************************/ > package org.eclipse.cdt.dsf.mi.service; > >+import org.eclipse.cdt.dsf.debug.service.IBreakpoints.IBreakpointsTargetDMContext; > import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext; > > /** >@@ -18,7 +19,7 @@ > * identifier. These thread groups are the basis for this context. > * @since 1.1 > */ >-public interface IMIContainerDMContext extends IContainerDMContext >+public interface IMIContainerDMContext extends IContainerDMContext ,IBreakpointsTargetDMContext > { > /** > * Returns the GDB/MI thread group identifier of this context. >Index: src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java,v >retrieving revision 1.16 >diff -u -r1.16 MIBreakpoints.java >--- src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java 6 Apr 2010 19:32:11 -0000 1.16 >+++ src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java 7 Jan 2011 12:46:29 -0000 >@@ -38,6 +38,7 @@ > import org.eclipse.cdt.dsf.debug.service.command.ICommandControl; > import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlShutdownDMEvent; > import org.eclipse.cdt.dsf.gdb.internal.GdbPlugin; >+import org.eclipse.cdt.dsf.gdb.service.command.GDBControlDMContext; > import org.eclipse.cdt.dsf.mi.service.command.CommandFactory; > import org.eclipse.cdt.dsf.mi.service.command.events.MIWatchpointScopeEvent; > import org.eclipse.cdt.dsf.mi.service.command.output.CLICatchInfo; >@@ -920,7 +921,9 @@ > } > }; > >- fRunControl.executeWithTargetAvailable(context, new Step[] { deleteBreakpointStep }, finalRm); >+ // Context no longer a CommandControlDMContext , With GDB 7.2 IBreakpointsTargetDMContext extends IMIContainerContext >+ GDBControlDMContext commandControl = DMContexts.getAncestorOfType(context, GDBControlDMContext.class); >+ fRunControl.executeWithTargetAvailable(commandControl, new Step[] { deleteBreakpointStep }, finalRm); > } > > // ------------------------------------------------------------------------- >Index: src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java,v >retrieving revision 1.29 >diff -u -r1.29 MIRunControl.java >--- src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java 27 Sep 2010 16:21:33 -0000 1.29 >+++ src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java 7 Jan 2011 12:46:29 -0000 >@@ -967,6 +967,11 @@ > > @Override > public void execute(final RequestMonitor rm) { >+ if (fCtx instanceof IContainerDMContext) { >+ fContainerDmc = (IContainerDMContext)(fCtx); >+ fTargetAvailable = isSuspended(fContainerDmc); >+ rm.done(); >+ } else { > IProcesses processControl = getServicesTracker().getService(IProcesses.class); > processControl.getProcessesBeingDebugged( > fCtx, >@@ -987,6 +992,7 @@ > } > }); > } >+ } > }; > > /** >Index: src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakDelete.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakDelete.java,v >retrieving revision 1.2 >diff -u -r1.2 MIBreakDelete.java >--- src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakDelete.java 3 Jun 2010 00:09:35 -0000 1.2 >+++ src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakDelete.java 7 Jan 2011 12:46:29 -0000 >@@ -39,4 +39,9 @@ > setParameters(brkids); > } > } >+ >+ @Override >+ public boolean supportsThreadGroupOption() { >+ return true; >+ } > } >Index: src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakInsert.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakInsert.java,v >retrieving revision 1.7 >diff -u -r1.7 MIBreakInsert.java >--- src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakInsert.java 26 Aug 2010 17:58:46 -0000 1.7 >+++ src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakInsert.java 7 Jan 2011 12:46:29 -0000 >@@ -198,4 +198,9 @@ > return adjustedValue.replace("\\\\", "\\"); //$NON-NLS-1$//$NON-NLS-2$ > } > } >+ >+ @Override >+ public boolean supportsThreadGroupOption() { >+ return true; >+ } > } >Index: src/org/eclipse/cdt/dsf/mi/service/command/commands/MICommand.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MICommand.java,v >retrieving revision 1.3 >diff -u -r1.3 MICommand.java >--- src/org/eclipse/cdt/dsf/mi/service/command/commands/MICommand.java 16 Dec 2010 03:13:31 -0000 1.3 >+++ src/org/eclipse/cdt/dsf/mi/service/command/commands/MICommand.java 7 Jan 2011 12:46:29 -0000 >@@ -257,7 +257,7 @@ > /** > * @since 4.0 > */ >- public boolean supportsThreadGroupOption() { return false; } >+ public boolean supportsThreadGroupOption() { return true; } > > /** > * Compare commands based on the MI command string that they generate, >#P org.eclipse.cdt.dsf.ui >Index: src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/AbstractDisassemblyBackend.java >=================================================================== >RCS file: src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/AbstractDisassemblyBackend.java >diff -N src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/AbstractDisassemblyBackend.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/AbstractDisassemblyBackend.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,18 @@ >+package org.eclipse.cdt.debug.internal.ui.disassembly.dsf; >+ >+import java.math.BigInteger; >+ >+public class AbstractDisassemblyBackend { >+ >+ public void init(IDisassemblyPartCallback callback) { >+ // TODO Auto-generated method stub >+ >+ } >+ >+ public BigInteger evaluateAddressExpression(String symbol, >+ boolean suppressError) { >+ // TODO Auto-generated method stub >+ return null; >+ } >+ >+} >Index: src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.cdt/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java,v >retrieving revision 1.21 >diff -u -r1.21 DisassemblyBackendDsf.java >--- src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java 21 Dec 2010 16:53:45 -0000 1.21 >+++ src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java 7 Jan 2011 12:46:31 -0000 >@@ -27,6 +27,7 @@ > import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.AddressRangePosition; > import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.DisassemblyUtils; > import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.ErrorPosition; >+import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend.SetDebugContextResult; > import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyPartCallback; > import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor; > import org.eclipse.cdt.dsf.concurrent.DsfExecutor; >@@ -79,6 +80,7 @@ > protected IFrameDMData fTargetFrameData; > > private String fDsfSessionId; >+ private IDisassemblyPartCallback fCallback; > > /** > * Constructor >@@ -228,7 +230,8 @@ > fTargetContext= newExeDmc; > fTargetFrameContext= frame; > if (!result.contextChanged) { >- fCallback.gotoFrameIfActive(frame.getLevel()); >+ IDisassemblyPartCallback fCallback = null; >+ //fCallback.gotoFrameIfActive(frame.getLevel()); > } > } > } >Index: src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.cdt/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java,v >retrieving revision 1.42 >diff -u -r1.42 DisassemblyPart.java >--- src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java 2 Dec 2010 12:04:04 -0000 1.42 >+++ src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java 7 Jan 2011 12:46:32 -0000 >@@ -28,10 +28,8 @@ > > import org.eclipse.cdt.core.IAddress; > import org.eclipse.cdt.core.model.ITranslationUnit; >-import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.AbstractDisassemblyBackend; > import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.AddressRangePosition; > import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.DisassemblyPosition; >-import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.DisassemblyUtils; > import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.ErrorPosition; > import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend; > import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyDocument; >@@ -3027,20 +3025,7 @@ > public BigInteger eval(String expr, boolean suppressError) { > if (fBackend != null) { > BigInteger address = null; >- if (fBackend instanceof AbstractDisassemblyBackend) { >- address = ((AbstractDisassemblyBackend) fBackend).evaluateAddressExpression(expr, suppressError); >- } else { >- String value = fBackend.evaluateExpression(expr); >- if (value != null) { >- try { >- address = DisassemblyUtils.decodeAddress(value); >- } catch (NumberFormatException e) { >- if (!suppressError) { >- generateErrorDialog(DisassemblyMessages.Disassembly_log_error_expression_eval); >- } >- } >- } >- } >+ > if (address != null) > return address; > } >Index: src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/AbstractDisassemblyAction.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.cdt/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/AbstractDisassemblyAction.java,v >retrieving revision 1.3 >diff -u -r1.3 AbstractDisassemblyAction.java >--- src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/AbstractDisassemblyAction.java 10 Nov 2010 06:50:00 -0000 1.3 >+++ src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/AbstractDisassemblyAction.java 7 Jan 2011 12:46:32 -0000 >@@ -10,6 +10,7 @@ > *******************************************************************************/ > package org.eclipse.cdt.dsf.debug.internal.ui.disassembly.actions; > >+import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyPartCallback; > import org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IDisassemblyPart; > import org.eclipse.core.runtime.Assert; > import org.eclipse.jface.action.Action; >@@ -20,7 +21,7 @@ > > protected IDisassemblyPart fDisassemblyPart; > >- AbstractDisassemblyAction() { >+ protected AbstractDisassemblyAction() { > } > > /** >@@ -78,4 +79,9 @@ > update(); > } > } >+ >+ public void init(IDisassemblyPartCallback callback) { >+ // TODO Auto-generated method stub >+ >+ } > }
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=186266">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Flags:
onurakdemir1
:
review?
Actions:
View
|
Diff
Attachments on
bug 237306
:
166478
|
167440
|
168092
|
168093
|
168510
|
176501
|
178929
|
179595
|
179596
|
179913
|
182593
|
184318
|
185285
|
185617
|
185691
| 186266 |
187326
|
187357
|
190931
|
190997
