diff options
Diffstat (limited to 'plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm')
15 files changed, 214 insertions, 214 deletions
diff --git a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/Activator.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/Activator.java index 9d71d4f25..2e3ae3a82 100644 --- a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/Activator.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/Activator.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2007, 2008 Wind River Systems, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ diff --git a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFExecuter.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFExecuter.java index 309159c89..deff54f04 100644 --- a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFExecuter.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFExecuter.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2007, 2008 Wind River Systems, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ diff --git a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFLaunch.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFLaunch.java index 641faed20..90fadb4ea 100644 --- a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFLaunch.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFLaunch.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2007, 2008 Wind River Systems, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ @@ -61,7 +61,7 @@ public class TCFDSFLaunch extends TCFLaunch { }; executor.execute(new TCFDSFShutdownSequence(session, TCFDSFLaunch.this, monitor)); } - + public DsfExecutor getDsfExecutor() { return executor; } diff --git a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFLaunchDelegate.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFLaunchDelegate.java index d6a9280bf..eaef10e4b 100644 --- a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFLaunchDelegate.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFLaunchDelegate.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2007, 2008 Wind River Systems, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ diff --git a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFLaunchSequence.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFLaunchSequence.java index 21d4ec427..185159820 100644 --- a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFLaunchSequence.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFLaunchSequence.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2007, 2008 Wind River Systems, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ diff --git a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFShutdownSequence.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFShutdownSequence.java index 9478bf0a2..48aed5ba3 100644 --- a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFShutdownSequence.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFShutdownSequence.java @@ -33,7 +33,7 @@ class TCFDSFShutdownSequence extends Sequence { tracker = new DsfServicesTracker(Activator.getBundleContext(), session_id); monitor.done(); } - + @Override public void rollBack(RequestMonitor monitor) { // In case the shutdown sequence aborts, @@ -42,7 +42,7 @@ class TCFDSFShutdownSequence extends Sequence { tracker = null; monitor.done(); } - }, + }, new Step() { @Override public void execute(RequestMonitor monitor) { @@ -86,7 +86,7 @@ class TCFDSFShutdownSequence extends Sequence { tracker = null; monitor.done(); } - } + } }; } diff --git a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFSourceLookupDirector.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFSourceLookupDirector.java index 39a98ebc0..84a1a96a1 100644 --- a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFSourceLookupDirector.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFSourceLookupDirector.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2008 Wind River Systems, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ diff --git a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFSourceLookupParticipant.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFSourceLookupParticipant.java index 3ac0bd2ff..136a95efc 100644 --- a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFSourceLookupParticipant.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/launch/TCFDSFSourceLookupParticipant.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2008 Wind River Systems, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ diff --git a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFAddress.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFAddress.java index 3de969429..74d5e6836 100644 --- a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFAddress.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFAddress.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2008 Wind River Systems, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ @@ -15,9 +15,9 @@ import java.math.BigInteger; import org.eclipse.cdt.core.IAddress; public final class TCFAddress implements IAddress { - + private final BigInteger addr; - + // TODO: TCFAddress should include memory space ID public TCFAddress(Number addr) { if (addr instanceof BigInteger) this.addr = (BigInteger)addr; @@ -79,7 +79,7 @@ public final class TCFAddress implements IAddress { public int compareTo(Object o) { return addr.compareTo(((TCFAddress)o).addr); } - + public String toString() { return "[" + toHexAddressString() + "]"; } diff --git a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFBreakpoints.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFBreakpoints.java index f310d160b..056cbb2ce 100644 --- a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFBreakpoints.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFBreakpoints.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2008 Wind River Systems, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ @@ -49,14 +49,14 @@ import org.eclipse.tm.tcf.util.TCFDataCache; import org.osgi.framework.BundleContext; public class TCFDSFBreakpoints extends AbstractDsfService implements org.eclipse.dd.dsf.debug.service.IBreakpoints { - + private class BreakpointDMC extends AbstractDMContext implements IBreakpointDMContext { - + final String id; final IBreakpoint bp; final TCFDataCache<Map<String,Object>> status; final Set<IBreakpointsTargetDMContext> targets; - + boolean disposed; public BreakpointDMC(IDsfService service, final String id, IBreakpoint bp) { @@ -93,7 +93,7 @@ public class TCFDSFBreakpoints extends AbstractDsfService implements org.eclipse public int hashCode() { return id.hashCode(); } - + void dispose() { assert !disposed; cache.remove(id); @@ -102,7 +102,7 @@ public class TCFDSFBreakpoints extends AbstractDsfService implements org.eclipse assert targets.isEmpty(); disposed = true; } - + void onAdded(final IBreakpointsTargetDMContext t) { targets.add(t); IBreakpointsAddedEvent e = new IBreakpointsAddedEvent() { @@ -115,7 +115,7 @@ public class TCFDSFBreakpoints extends AbstractDsfService implements org.eclipse }; getSession().dispatchEvent(e, getProperties()); } - + void onUpdated(final IBreakpointsTargetDMContext t) { assert targets.contains(t); IBreakpointsUpdatedEvent e = new IBreakpointsUpdatedEvent() { @@ -128,7 +128,7 @@ public class TCFDSFBreakpoints extends AbstractDsfService implements org.eclipse }; getSession().dispatchEvent(e, getProperties()); } - + void onRemoved(final IBreakpointsTargetDMContext t) { targets.remove(t); IBreakpointsRemovedEvent e = new IBreakpointsRemovedEvent() { @@ -142,14 +142,14 @@ public class TCFDSFBreakpoints extends AbstractDsfService implements org.eclipse getSession().dispatchEvent(e, getProperties()); } } - + private class BreakpointData implements IBreakpointDMData { - + final IBreakpoint bp; final Map<String,Object> attrs; final Map<String,Object> status; final String file; - + @SuppressWarnings("unchecked") BreakpointData(IBreakpoint bp, Map<String,Object> status) throws CoreException, IOException { this.bp = bp; @@ -181,7 +181,7 @@ public class TCFDSFBreakpoints extends AbstractDsfService implements org.eclipse if (arr == null) return null; int cnt = 0; for (Map<String,Object> m : arr) { - if (m.get(IBreakpoints.INSTANCE_ADDRESS) != null) cnt++; + if (m.get(IBreakpoints.INSTANCE_ADDRESS) != null) cnt++; } IAddress[] res = new IAddress[cnt]; int pos = 0; @@ -232,7 +232,7 @@ public class TCFDSFBreakpoints extends AbstractDsfService implements org.eclipse return enabled != null && enabled.booleanValue() && bp_manager.isEnabled(); } } - + private final ITCFBreakpointListener bp_listener = new ITCFBreakpointListener() { @SuppressWarnings("unchecked") @@ -272,20 +272,20 @@ public class TCFDSFBreakpoints extends AbstractDsfService implements org.eclipse if (dmc != null) dmc.dispose(); } }; - + private final TCFLaunch launch; private final IChannel channel; private final org.eclipse.tm.tcf.services.IBreakpoints tcf_bpt_service; private final Map<String,BreakpointDMC> cache = new HashMap<String,BreakpointDMC>(); private final IBreakpointManager bp_manager = DebugPlugin.getDefault().getBreakpointManager(); - + public TCFDSFBreakpoints(DsfSession session, TCFLaunch launch, final RequestMonitor monitor) { super(session); - this.launch = launch; + this.launch = launch; channel = launch.getChannel(); launch.getBreakpointsStatus().addListener(bp_listener); tcf_bpt_service = channel.getRemoteService(org.eclipse.tm.tcf.services.IBreakpoints.class); - initialize(new RequestMonitor(getExecutor(), monitor) { + initialize(new RequestMonitor(getExecutor(), monitor) { @Override protected void handleSuccess() { String[] class_names = { @@ -298,7 +298,7 @@ public class TCFDSFBreakpoints extends AbstractDsfService implements org.eclipse }); } - @Override + @Override public void shutdown(RequestMonitor monitor) { unregister(); super.shutdown(monitor); @@ -354,7 +354,7 @@ public class TCFDSFBreakpoints extends AbstractDsfService implements org.eclipse catch (Exception x) { rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, REQUEST_FAILED, "Data error", x)); //$NON-NLS-1$ - + } } else { diff --git a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFExecutionDMC.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFExecutionDMC.java index 3f6d30dc7..7cf0d0731 100644 --- a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFExecutionDMC.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFExecutionDMC.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2007, 2008 Wind River Systems, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ @@ -30,15 +30,15 @@ import org.eclipse.tm.tcf.util.TCFDataCache; public abstract class TCFDSFExecutionDMC extends AbstractDMContext implements IExecutionDMContext, IContainerDMContext, IMemoryDMContext, IBreakpointsTargetDMContext { - + public final TCFDataCache<IMemory.MemoryContext> memory_context_cache; - public final TCFDataCache<RunControlContext> run_control_context_cache; - public final TCFDataCache<Map<String,TCFDSFExecutionDMC>> run_control_children_cache; - public final TCFDataCache<TCFContextState> run_control_state_cache; - + public final TCFDataCache<RunControlContext> run_control_context_cache; + public final TCFDataCache<Map<String,TCFDSFExecutionDMC>> run_control_children_cache; + public final TCFDataCache<TCFContextState> run_control_state_cache; + TCFDataCache<?> stack_frames_cache; TCFDataCache<?> registers_cache; - + TCFDSFExecutionDMC(IChannel channel, IDsfService service, IDMContext[] parents) { super(service, parents); final IMemory tcf_mem_service = channel.getRemoteService(IMemory.class); @@ -135,20 +135,20 @@ public abstract class TCFDSFExecutionDMC extends AbstractDMContext } }; } - + public abstract void dispose(); - + /** * Get TCF ID of execution context. * @return TCF ID. */ public abstract String getTcfContextId(); - + /** * Check if this context object is disposed, because, for example, a thread has exited. * @return true if context object is disposed. */ public abstract boolean isDisposed(); - + protected abstract TCFDSFExecutionDMC addChild(String id); } diff --git a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFMemory.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFMemory.java index df3e9b873..f79bd61c4 100644 --- a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFMemory.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFMemory.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2008 Wind River Systems, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ @@ -33,21 +33,21 @@ import org.osgi.framework.BundleContext; public class TCFDSFMemory extends AbstractDsfService implements org.eclipse.dd.dsf.debug.service.IMemory { - + private static class MemoryChangedEvent extends AbstractDMEvent<IMemoryDMContext> implements IMemoryChangedEvent { IAddress[] fAddresses; IDMContext fContext; - + public MemoryChangedEvent(IMemoryDMContext context, IAddress[] addresses) { super(context); fAddresses = addresses; } - + public IAddress[] getAddresses() { return fAddresses; } } - + private final org.eclipse.tm.tcf.services.IMemory.MemoryListener mem_listener = new org.eclipse.tm.tcf.services.IMemory.MemoryListener() { @@ -76,14 +76,14 @@ public class TCFDSFMemory extends AbstractDsfService implements org.eclipse.dd.d } } }; - + private final org.eclipse.tm.tcf.services.IMemory tcf_mem_service; public TCFDSFMemory(DsfSession session, IChannel channel, final RequestMonitor monitor) { super(session); tcf_mem_service = channel.getRemoteService(org.eclipse.tm.tcf.services.IMemory.class); if (tcf_mem_service != null) tcf_mem_service.addListener(mem_listener); - initialize(new RequestMonitor(getExecutor(), monitor) { + initialize(new RequestMonitor(getExecutor(), monitor) { @Override protected void handleSuccess() { String[] class_names = { @@ -96,7 +96,7 @@ public class TCFDSFMemory extends AbstractDsfService implements org.eclipse.dd.d }); } - @Override + @Override public void shutdown(RequestMonitor monitor) { unregister(); super.shutdown(monitor); diff --git a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFRegisters.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFRegisters.java index a6c2a2616..0f84629d7 100644 --- a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFRegisters.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFRegisters.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2008 Wind River Systems, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ @@ -46,14 +46,14 @@ import org.osgi.framework.BundleContext; public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.dd.dsf.debug.service.IRegisters { - + private class ObjectDMC extends AbstractDMContext implements IFormattedDataDMContext { final String id; final RegisterChildrenCache children; final Map<String,ValueDMC> values; - - org.eclipse.tm.tcf.services.IRegisters.RegistersContext context; + + org.eclipse.tm.tcf.services.IRegisters.RegistersContext context; boolean disposed; ObjectDMC(String session_id, IDMContext[] parents, String id) { @@ -84,7 +84,7 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d public String getName() { return context.getName(); } - + void dispose() { assert !disposed; children.dispose(); @@ -94,13 +94,13 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d disposed = true; } } - + private class RegisterGroupDMC extends ObjectDMC implements IRegisterGroupDMContext { - + RegisterGroupDMC(String session_id, IDMContext[] parents, String id) { super(session_id, parents, id); } - + /* Constructor for a fake register group - DSF requires at least one group object */ RegisterGroupDMC(String session_id, IDMContext[] parents, final String id, RegisterChildrenCache children) { super(session_id, parents, id, children); @@ -186,43 +186,43 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d }; } } - + private class RegisterDMC extends ObjectDMC implements IRegisterDMContext { - + RegisterDMC(String session_id, IDMContext[] parents, String id) { super(session_id, parents, id); } } - + private class BitFieldDMC extends ObjectDMC implements IBitFieldDMContext { BitFieldDMC(String session_id, IDMContext[] parents, String id) { super(session_id, parents, id); } } - + private class ValueDMC extends FormattedValueDMContext { - + final RegisterValueCache cache; - + boolean disposed; ValueDMC(ObjectDMC parent, String fmt) { super(TCFDSFRegisters.this, parent, fmt); cache = new RegisterValueCache(channel, parent.context, fmt); } - + void dispose() { assert !disposed; cache.dispose(); disposed = true; } } - + private class RegisterGroupData implements IRegisterGroupDMData { - + final org.eclipse.tm.tcf.services.IRegisters.RegistersContext context; - + RegisterGroupData(org.eclipse.tm.tcf.services.IRegisters.RegistersContext context) { this.context = context; } @@ -235,11 +235,11 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d return context.getName(); } } - + private class RegisterData implements IRegisterDMData { final org.eclipse.tm.tcf.services.IRegisters.RegistersContext context; - + RegisterData(org.eclipse.tm.tcf.services.IRegisters.RegistersContext context) { this.context = context; } @@ -280,14 +280,14 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d return context.isWriteable(); } } - + private class BitFieldData implements IBitFieldDMData { final org.eclipse.tm.tcf.services.IRegisters.RegistersContext context; - + IMnemonic[] mnemonics; IBitGroup[] bit_groups; - + BitFieldData(org.eclipse.tm.tcf.services.IRegisters.RegistersContext context) { this.context = context; } @@ -388,15 +388,15 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d return context.isLeftToRight(); } } - + private class RegisterChildrenCache extends TCFDataCache<Map<String,ObjectDMC>> { - + final String id; final IDMContext[] parents; - + Map<String,ObjectDMC> dmc_pool = new HashMap<String,ObjectDMC>();; boolean disposed; - + public RegisterChildrenCache(IChannel channel, String id, IDMContext[] parents) { super(channel); this.id = id; @@ -409,7 +409,7 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d dmc.children.invalidateRegContents(); } } - + void dispose() { assert !disposed; reset(); @@ -478,12 +478,12 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d return false; } } - + private class RegisterValueCache extends TCFDataCache<FormattedValueDMData> { - + final org.eclipse.tm.tcf.services.IRegisters.RegistersContext context; final String fmt; - + boolean disposed; public RegisterValueCache(IChannel channel, @@ -505,8 +505,8 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d FormattedValueDMData data = null; if (value != null) { int radix = 10; - if (fmt.equals(HEX_FORMAT)) radix = 16; - else if (fmt.equals(OCTAL_FORMAT)) radix = 8; + if (fmt.equals(HEX_FORMAT)) radix = 16; + else if (fmt.equals(OCTAL_FORMAT)) radix = 8; byte[] temp = new byte[value.length + 1]; temp[0] = 0; // Extra byte to avoid sign extension by BigInteger if (context.isBigEndian()) { @@ -536,14 +536,14 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d }); return false; } - + void dispose() { assert !disposed; reset(); disposed = true; } } - + private static class RegisterGroupChangedEvent extends AbstractDMEvent<IRegisterGroupDMContext> implements IGroupChangedDMEvent { @@ -551,7 +551,7 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d super(context); } } - + private static class RegisterChangedEvent extends AbstractDMEvent<IRegisterDMContext> implements IRegisterChangedDMEvent { @@ -562,12 +562,12 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d private static class BitFieldChangedEvent extends AbstractDMEvent<IBitFieldDMContext> implements IBitFieldChangedDMEvent { - + public BitFieldChangedEvent(IBitFieldDMContext context) { super(context); } } - + private static class GroupsChangedEvent extends AbstractDMEvent<IDMContext> implements IGroupsChangedDMEvent { public GroupsChangedEvent(IExecutionDMContext context) { @@ -607,11 +607,11 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d } } }; - + private final IChannel channel; private final org.eclipse.tm.tcf.services.IRegisters tcf_reg_service; private final Map<String,ObjectDMC> model; - + private final String[] available_formats = { HEX_FORMAT, DECIMAL_FORMAT, @@ -624,7 +624,7 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d model = new HashMap<String,ObjectDMC>(); tcf_reg_service = channel.getRemoteService(org.eclipse.tm.tcf.services.IRegisters.class); if (tcf_reg_service != null) tcf_reg_service.addListener(listener); - initialize(new RequestMonitor(getExecutor(), monitor) { + initialize(new RequestMonitor(getExecutor(), monitor) { @Override protected void handleSuccess() { String[] class_names = { @@ -638,7 +638,7 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d }); } - @Override + @Override public void shutdown(RequestMonitor monitor) { getSession().removeServiceEventListener(this); unregister(); @@ -712,12 +712,12 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d } rm.done(); } - + private RegisterChildrenCache getRegisterChildrenCache(IDMContext dmc, DataRequestMonitor<?> rm) { RegisterChildrenCache cache = null; if (dmc instanceof CompositeDMContext) { for (IDMContext ctx : dmc.getParents()) { - if (ctx instanceof TCFDSFExecutionDMC || ctx instanceof TCFDSFStack.TCFFrameDMC || + if (ctx instanceof TCFDSFExecutionDMC || ctx instanceof TCFDSFStack.TCFFrameDMC || ctx instanceof RegisterGroupDMC || ctx instanceof RegisterDMC) { dmc = ctx; break; @@ -978,8 +978,8 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d return; } int radix = 10; - if (fmt.equals(HEX_FORMAT)) radix = 16; - else if (fmt.equals(OCTAL_FORMAT)) radix = 8; + if (fmt.equals(HEX_FORMAT)) radix = 16; + else if (fmt.equals(OCTAL_FORMAT)) radix = 8; byte[] data = new BigInteger(val, radix).toByteArray(); if (!((ObjectDMC)dmc).context.isBigEndian()) { byte[] temp = new byte[data.length]; @@ -1061,8 +1061,8 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d return; } int radix = 10; - if (fmt.equals(HEX_FORMAT)) radix = 16; - else if (fmt.equals(OCTAL_FORMAT)) radix = 8; + if (fmt.equals(HEX_FORMAT)) radix = 16; + else if (fmt.equals(OCTAL_FORMAT)) radix = 8; byte[] data = new BigInteger(val, radix).toByteArray(); if (!((ObjectDMC)dmc).context.isBigEndian()) { byte[] temp = new byte[data.length]; @@ -1168,7 +1168,7 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d if (cache != null) cache.invalidateRegContents(); } } - + @DsfServiceEventHandler public void eventDispatched(org.eclipse.dd.dsf.debug.service.IRunControl.ISuspendedDMEvent e) { RegisterChildrenCache cache = (RegisterChildrenCache)((TCFDSFExecutionDMC)e.getDMContext()).registers_cache; diff --git a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFRunControl.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFRunControl.java index b5ffef8c2..8b72abec8 100644 --- a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFRunControl.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFRunControl.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2007, 2008 Wind River Systems, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ @@ -214,7 +214,7 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. if (n != null) n.onContextSuspended(pc, reason, params); } }; - + private class ExecutionDMC extends TCFDSFExecutionDMC { final String id; @@ -224,7 +224,7 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. boolean disposed; int is_stepping; int is_resuming; - + public ExecutionDMC(ExecutionDMC parent, final String id) { super(channel, TCFDSFRunControl.this, parent == null ? new IDMContext[0] : new IDMContext[] { parent }); @@ -249,7 +249,7 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. } return n; } - + @Override public String toString() { return baseToString() + ".context[" + id + "]"; //$NON-NLS-1$ //$NON-NLS-2$ @@ -288,7 +288,7 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. public boolean isDisposed() { return disposed; } - + @Override public void dispose() { assert !disposed; @@ -304,7 +304,7 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. cache.remove(id); disposed = true; } - + /*--------------------------------------------------------------------------------------*/ /* Events */ @@ -386,7 +386,7 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. return true; } - public StateChangeReason getStateChangeReason() { + public StateChangeReason getStateChangeReason() { return reason; } } @@ -422,7 +422,7 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. if (tcf_run_service != null) tcf_run_service.addListener(run_listener); root_dmc = new ExecutionDMC(null, null); cache.put(null, root_dmc); - initialize(new RequestMonitor(getExecutor(), monitor) { + initialize(new RequestMonitor(getExecutor(), monitor) { @Override protected void handleSuccess() { String[] class_names = { @@ -435,7 +435,7 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. }); } - @Override + @Override public void shutdown(RequestMonitor monitor) { if (tcf_run_service != null) tcf_run_service.removeListener(run_listener); unregister(); @@ -680,13 +680,13 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. rm.done(); } } - + public Collection<TCFDSFExecutionDMC> getCachedContexts() { ArrayList<TCFDSFExecutionDMC> l = new ArrayList<TCFDSFExecutionDMC>(); for (ExecutionDMC dmc : cache.values()) l.add(dmc); return l; } - + public int toTCFStepType(StepType step_type) { switch (step_type) { case STEP_OVER: @@ -704,14 +704,14 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. } return -1; } - + private class StepIntoAction extends TCFActionStepInto { - + private final ExecutionDMC ctx; private final RequestMonitor monitor; - + private TCFDSFStack.TCFFrameDMC frame; - + StepIntoAction(TCFLaunch launch, ExecutionDMC ctx, RequestMonitor monitor, boolean src_step) { super(launch, ctx.run_control_context_cache.getData(), src_step); this.ctx = ctx; @@ -763,7 +763,7 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. if (service == null) return null; return service.getFramesCache(ctx, null); } - + @Override protected void exit(Throwable error) { if (exited) return; @@ -778,12 +778,12 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. } private class StepOverAction extends TCFActionStepOver { - + private final ExecutionDMC ctx; private final RequestMonitor monitor; - + private TCFDSFStack.TCFFrameDMC frame; - + StepOverAction(TCFLaunch launch, ExecutionDMC ctx, RequestMonitor monitor, boolean src_step) { super(launch, ctx.run_control_context_cache.getData(), src_step); this.ctx = ctx; @@ -835,7 +835,7 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. if (service == null) return null; return service.getFramesCache(ctx, null); } - + @Override protected void exit(Throwable error) { if (exited) return; @@ -850,12 +850,12 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. } private class StepOutAction extends TCFActionStepOut { - + private final ExecutionDMC ctx; private final RequestMonitor monitor; - + private TCFDSFStack.TCFFrameDMC frame; - + StepOutAction(TCFLaunch launch, ExecutionDMC ctx, RequestMonitor monitor) { super(launch, ctx.run_control_context_cache.getData()); this.ctx = ctx; @@ -896,7 +896,7 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. if (service == null) return null; return service.getFramesCache(ctx, null); } - + @Override protected void exit(Throwable error) { if (exited) return; @@ -1077,7 +1077,7 @@ public class TCFDSFRunControl extends AbstractDsfService implements org.eclipse. if (ctx.run_control_state_cache.isValid()) { TCFContextState st = ctx.run_control_state_cache.getData(); if (st != null && st.suspend_reason != null) { - r = toStateChangeReason(st.suspend_reason); + r = toStateChangeReason(st.suspend_reason); } } rm.setData(new ExecutionData(r)); diff --git a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFStack.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFStack.java index 58c06bab0..f281fdb18 100644 --- a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFStack.java +++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFStack.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2008 Wind River Systems, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ @@ -41,23 +41,23 @@ import org.osgi.framework.BundleContext; public class TCFDSFStack extends AbstractDsfService implements IStack { - + public class TCFFrameDMC extends AbstractDMContext implements IFrameDMContext, Comparable<TCFFrameDMC> { - + public final String id; public final TCFDSFExecutionDMC exe_dmc; public final TCFDataCache<IStackTrace.StackTraceContext> context_cache; public final TCFDataCache<TCFSourceRef> source_cache; - + int level; TCFSourceRef prev_data; - + public TCFFrameDMC(final TCFDSFExecutionDMC exe_dmc, final String id) { super(TCFDSFStack.this.getSession().getId(), new IDMContext[] { exe_dmc }); this.id = id; this.exe_dmc = exe_dmc; context_cache = new TCFDataCache<IStackTrace.StackTraceContext>(channel) { - + @Override public boolean startDataRetrieval() { assert command == null; @@ -76,7 +76,7 @@ public class TCFDSFStack extends AbstractDsfService implements IStack { return false; } }; - + source_cache = new TCFDataCache<TCFSourceRef>(channel) { @Override @@ -102,7 +102,7 @@ public class TCFDSFStack extends AbstractDsfService implements IStack { set(null, null, prev_data = data); return true; } - + private boolean getSourcePos(final TCFSourceRef data) { if (tcf_lns_service == null) return true; if (data.address == null) return true; @@ -125,23 +125,23 @@ public class TCFDSFStack extends AbstractDsfService implements IStack { } }; } - + public int getLevel() { return level; } - + @Override public boolean equals(Object other) { return super.baseEquals(other) && ((TCFFrameDMC)other).id.equals(id); } - + @Override public int hashCode() { return id.hashCode(); } - + @Override - public String toString() { + public String toString() { return baseToString() + ".frame[" + id + "]"; //$NON-NLS-1$ //$NON-NLS-2$ } @@ -149,17 +149,17 @@ public class TCFDSFStack extends AbstractDsfService implements IStack { if (level < f.level) return -1; if (level > f.level) return +1; return 0; - } + } } - + public static class TCFFrameData implements IFrameDMData { - + public final IStackTrace.StackTraceContext context; public final IAddress address; public final int level; public final String function; public final ILineNumbers.CodeArea code_area; - + TCFFrameData(TCFFrameDMC dmc) { context = dmc.context_cache.getData(); TCFSourceRef ref = dmc.source_cache.getData(); @@ -172,7 +172,7 @@ public class TCFDSFStack extends AbstractDsfService implements IStack { public IAddress getAddress() { return address; } - + public String getFunction() { return function; } @@ -196,20 +196,20 @@ public class TCFDSFStack extends AbstractDsfService implements IStack { return code_area.start_column; } } - + private class FramesCache extends TCFDataCache<Map<String,TCFFrameDMC>> { - + private final TCFDSFExecutionDMC dmc; private final Map<String,TCFFrameDMC> frame_pool; - + private String top_frame_id; - + FramesCache(IChannel channel, TCFDSFExecutionDMC dmc) { super(channel); this.dmc = dmc; frame_pool = new HashMap<String,TCFFrameDMC>(); } - + @Override public boolean startDataRetrieval() { assert command == null; @@ -249,7 +249,7 @@ public class TCFDSFStack extends AbstractDsfService implements IStack { }); return false; } - + TCFFrameDMC createFrameDMC(String id, int level) { TCFFrameDMC n = frame_pool.get(id); if (n == null) frame_pool.put(id, n = new TCFFrameDMC(dmc, id)); @@ -265,7 +265,7 @@ public class TCFDSFStack extends AbstractDsfService implements IStack { dmc.source_cache.reset(); } } - + void dispose() { } } @@ -279,7 +279,7 @@ public class TCFDSFStack extends AbstractDsfService implements IStack { this.channel = channel; tcf_stk_service = channel.getRemoteService(IStackTrace.class); tcf_lns_service = channel.getRemoteService(ILineNumbers.class); - initialize(new RequestMonitor(getExecutor(), monitor) { + initialize(new RequestMonitor(getExecutor(), monitor) { @Override protected void handleSuccess() { String[] class_names = { @@ -293,7 +293,7 @@ public class TCFDSFStack extends AbstractDsfService implements IStack { }); } - @Override + @Override public void shutdown(RequestMonitor monitor) { getSession().removeServiceEventListener(this); unregister(); @@ -358,7 +358,7 @@ public class TCFDSFStack extends AbstractDsfService implements IStack { rm.done(); } } - + public TCFDataCache<?> getFramesCache(TCFDSFExecutionDMC exe, DataRequestMonitor<?> rm) { if (tcf_stk_service == null) { if (rm != null) { @@ -379,7 +379,7 @@ public class TCFDSFStack extends AbstractDsfService implements IStack { if (exe.stack_frames_cache == null) exe.stack_frames_cache = new FramesCache(channel, exe); return (FramesCache)exe.stack_frames_cache; } - + public void getFrames(final IDMContext dmc, final DataRequestMonitor<IFrameDMContext[]> rm) { if (dmc instanceof TCFDSFExecutionDMC) { TCFDSFExecutionDMC exe = (TCFDSFExecutionDMC)dmc; @@ -482,7 +482,7 @@ public class TCFDSFStack extends AbstractDsfService implements IStack { rm.done(); } } - + public TCFFrameDMC getTopFrame(TCFDSFExecutionDMC exe) { FramesCache cache = (FramesCache)getFramesCache(exe, null); assert cache != null; @@ -521,7 +521,7 @@ public class TCFDSFStack extends AbstractDsfService implements IStack { if (cache != null) cache.invalidateFrames(); } } - + @DsfServiceEventHandler public void eventDispatched(IRunControl.ISuspendedDMEvent e) { FramesCache cache = (FramesCache)((TCFDSFExecutionDMC)e.getDMContext()).stack_frames_cache; |