Changes in Memory Map service implementation and UI:

1. Added new notification callback: void (*mapping_changed)(Context * ctx, void * client_data).
2. Manual memory map entries are now associated with full context name (including parent names) to avoid ambiguity.
3. TCF launch configuration now includes "Symbol Files" tab to allow editing of manual map entries as part of the launch configuration.
4. "Debug context" field of the memory map UI changed to combo box to allow a user to see/edit all maps associated with a launch.

7 files changed, 631 insertions, 512 deletions

diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/MemoryMapCommand.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/MemoryMapCommand.java
index 7e56c2e82..b3f1a93a0 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/MemoryMapCommand.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/MemoryMapCommand.java
@@ -54,23 +54,21 @@ public class MemoryMapCommand extends AbstractActionDelegate {
     }
 
     protected void selectionChanged() {
-        TCFNode n = getSelectedNode();
-        getAction().setEnabled(isValidNode(n));
+        getAction().setEnabled(isValidNode(getSelectedNode()));
     }
 
     protected void run() {
-        TCFNode n = getSelectedNode();
-        if (isValidNode(n)) {
-            Shell shell = getWindow().getShell();
-            try {
-                new MemoryMapDialog(shell, n).open();
-            }
-            catch (Throwable x) {
-                MessageBox mb = new MessageBox(shell, SWT.ICON_ERROR | SWT.OK);
-                mb.setText("Cannot open Symbol Files dialog");
-                mb.setMessage(TCFModel.getErrorMessage(x, true));
-                mb.open();
-            }
+        TCFNode node = getSelectedNode();
+        if (!isValidNode(node)) return;
+        Shell shell = getWindow().getShell();
+        try {
+            new MemoryMapDialog(shell, node).open();
+        }
+        catch (Throwable x) {
+            MessageBox mb = new MessageBox(shell, SWT.ICON_ERROR | SWT.OK);
+            mb.setText("Cannot open Symbol Files dialog");
+            mb.setMessage(TCFModel.getErrorMessage(x, true));
+            mb.open();
         }
     }
 }
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/MemoryMapDialog.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/MemoryMapDialog.java
index 1f892db3d..c8e450a7e 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/MemoryMapDialog.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/MemoryMapDialog.java
@@ -10,177 +10,31 @@
  *******************************************************************************/
 package org.eclipse.tm.internal.tcf.debug.ui.commands;
 
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableColorProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.tm.internal.tcf.debug.launch.TCFLaunchDelegate;
-import org.eclipse.tm.internal.tcf.debug.model.TCFMemoryRegion;
-import org.eclipse.tm.internal.tcf.debug.ui.Activator;
 import org.eclipse.tm.internal.tcf.debug.ui.ImageCache;
 import org.eclipse.tm.internal.tcf.debug.ui.model.TCFModel;
 import org.eclipse.tm.internal.tcf.debug.ui.model.TCFNode;
-import org.eclipse.tm.internal.tcf.debug.ui.model.TCFNodeExecContext;
-import org.eclipse.tm.tcf.protocol.IChannel;
-import org.eclipse.tm.tcf.protocol.JSON;
-import org.eclipse.tm.tcf.services.IMemory;
-import org.eclipse.tm.tcf.services.IMemoryMap;
-import org.eclipse.tm.tcf.services.IMemoryMap.MemoryRegion;
-import org.eclipse.tm.tcf.util.TCFDataCache;
-import org.eclipse.tm.tcf.util.TCFTask;
 
 class MemoryMapDialog extends Dialog {
 
-    private static final int
-        SIZING_TABLE_WIDTH = 800,
-        SIZING_TABLE_HEIGHT = 300;
-
-    private static final String[] column_names = {
-        "Address",
-        "Size",
-        "Flags",
-        "File offset/section",
-        "File name"
-    };
-
-    private final TCFModel model;
-    private final IChannel channel;
-    private final TCFNode selection;
-
-    private Text ctx_text;
-    private Table map_table;
-    private TableViewer table_viewer;
+    private final TCFNode node;
+    private final ILaunchConfiguration cfg;
+    private MemoryMapWidget widget;
     private Button ok_button;
-    private Runnable update_map_buttons;
-    private IMemoryMap.MemoryRegion[] org_map;
-    private IMemoryMap.MemoryRegion[] cur_map;
-    private TCFNodeExecContext node;
-    private IMemory.MemoryContext mem_ctx;
-    private ILaunchConfiguration cfg;
-    private final HashSet<String> loaded_files = new HashSet<String>();
-    private String mem_map_id;
-
-    private final IStructuredContentProvider content_provider = new IStructuredContentProvider() {
-
-        public Object[] getElements(Object input) {
-            return cur_map;
-        }
-
-        public void dispose() {
-        }
-
-        public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-        }
-    };
-
-    private class MapLabelProvider extends LabelProvider implements ITableLabelProvider, ITableColorProvider {
-
-        public Image getColumnImage(Object element, int column) {
-            return null;
-        }
-
-        public String getColumnText(Object element, int column) {
-            TCFMemoryRegion r = (TCFMemoryRegion)element;
-            switch (column) {
-            case 0:
-            case 1:
-                {
-                    BigInteger x = column == 0 ? r.addr : r.size;
-                    if (x == null) return "";
-                    String s = x.toString(16);
-                    int sz = mem_ctx.getAddressSize() * 2;
-                    int l = sz - s.length();
-                    if (l < 0) l = 0;
-                    if (l > 16) l = 16;
-                    return "0x0000000000000000".substring(0, 2 + l) + s;
-                }
-            case 2:
-                {
-                    int n = r.getFlags();
-                    StringBuffer bf = new StringBuffer();
-                    if ((n & IMemoryMap.FLAG_READ) != 0) bf.append('r');
-                    if ((n & IMemoryMap.FLAG_WRITE) != 0) bf.append('w');
-                    if ((n & IMemoryMap.FLAG_EXECUTE) != 0) bf.append('x');
-                    return bf.toString();
-                }
-            case 3:
-                {
-                    Number n = r.getOffset();
-                    if (n != null) {
-                        BigInteger x = n instanceof BigInteger ? (BigInteger)n : new BigInteger(n.toString());
-                        String s = x.toString(16);
-                        int l = 16 - s.length();
-                        if (l < 0) l = 0;
-                        if (l > 16) l = 16;
-                        return "0x0000000000000000".substring(0, 2 + l) + s;
-                    }
-                    String s = r.getSectionName();
-                    if (s != null) return s;
-                    return "";
-                }
-            case 4:
-                return r.getFileName();
-            }
-            return "";
-        }
-
-        public Color getBackground(Object element, int columnIndex) {
-            return map_table.getBackground();
-        }
-
-        public Color getForeground(Object element, int columnIndex) {
-            TCFMemoryRegion r = (TCFMemoryRegion)element;
-            if (r.getProperties().get(IMemoryMap.PROP_ID) != null) {
-                return map_table.getDisplay().getSystemColor(SWT.COLOR_BLUE);
-            }
-            return map_table.getForeground();
-        }
-
-        public String getText(Object element) {
-            return element.toString();
-        }
-    }
 
     MemoryMapDialog(Shell parent, TCFNode node) {
         super(parent);
-        model = node.getModel();
-        channel = node.getChannel();
-        selection = node;
+        this.node = node;
+        cfg = node.getModel().getLaunch().getLaunchConfiguration();
         setShellStyle(getShellStyle() | SWT.RESIZE);
     }
 
@@ -194,341 +48,31 @@ class MemoryMapDialog extends Dialog {
     @Override
     protected void createButtonsForButtonBar(Composite parent) {
         ok_button = createButton(parent, IDialogConstants.OK_ID, "&OK", true);
-        ok_button.setEnabled(mem_map_id != null);
+        ok_button.setEnabled(widget != null && widget.getMemoryMapID() != null);
     }
 
     @Override
     protected Control createDialogArea(Composite parent) {
         Composite composite = (Composite)super.createDialogArea(parent);
-
-        loadData();
-        createContextText(composite);
-        createMemoryMapTable(composite);
-
+        widget = new MemoryMapWidget(composite, node);
+        widget.loadData(cfg);
+        if (ok_button != null) ok_button.setEnabled(widget.getMemoryMapID() != null);
         composite.setSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
         return composite;
     }
 
-    private void createContextText(Composite parent) {
-        Font font = parent.getFont();
-        Composite composite = new Composite(parent, SWT.NONE);
-        GridLayout layout = new GridLayout(2, false);
-        composite.setFont(font);
-        composite.setLayout(layout);
-        composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-        Label props_label = new Label(composite, SWT.WRAP);
-        props_label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-        props_label.setFont(font);
-        props_label.setText("&Debug context:");
-
-        ctx_text = new Text(composite, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
-        ctx_text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-        ctx_text.setFont(font);
-        if (mem_map_id != null) ctx_text.setText(mem_map_id);
-    }
-
-    private void createMemoryMapTable(Composite parent) {
-        Font font = parent.getFont();
-
-        Composite composite = new Composite(parent, SWT.NONE);
-        GridLayout layout = new GridLayout(2, false);
-        composite.setFont(font);
-        composite.setLayout(layout);
-        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-        map_table = new Table(composite,
-                SWT.SINGLE | SWT.BORDER | SWT.FULL_SELECTION |
-                SWT.H_SCROLL | SWT.V_SCROLL);
-        map_table.setFont(font);
-        GridData data = new GridData(GridData.FILL_BOTH);
-        data.widthHint = SIZING_TABLE_WIDTH;
-        data.heightHint = SIZING_TABLE_HEIGHT;
-        map_table.setLayoutData(data);
-
-        int w = SIZING_TABLE_WIDTH / (column_names.length + 8);
-        for (int i = 0; i < column_names.length; i++) {
-            final TableColumn column = new TableColumn(map_table, SWT.LEAD, i);
-            column.setMoveable(false);
-            column.setText(column_names[i]);
-            switch (i) {
-            case 0:
-            case 1:
-            case 3:
-                column.setWidth(w * 2);
-                break;
-            case 4:
-                column.setWidth(w * 6);
-                break;
-            default:
-                column.setWidth(w);
-                break;
-            }
-        }
-        map_table.setHeaderVisible(true);
-        map_table.setLinesVisible(true);
-        map_table.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetDefaultSelected(SelectionEvent e) {
-                IMemoryMap.MemoryRegion r = (IMemoryMap.MemoryRegion)((IStructuredSelection)
-                        table_viewer.getSelection()).getFirstElement();
-                if (r == null) return;
-                editRegion(r);
-            }
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                update_map_buttons.run();
-            }
-        });
-
-        table_viewer = new TableViewer(map_table);
-        table_viewer.setUseHashlookup(true);
-        table_viewer.setColumnProperties(column_names);
-
-        table_viewer.setContentProvider(content_provider);
-
-        table_viewer.setLabelProvider(new MapLabelProvider());
-        table_viewer.setInput(this);
-
-        createMapButtons(composite);
-    }
-
-    private void createMapButtons(Composite parent) {
-        Font font = parent.getFont();
-        Composite composite = new Composite(parent, SWT.NONE);
-        GridLayout layout = new GridLayout();
-        composite.setFont(font);
-        composite.setLayout(layout);
-        composite.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));
-        Menu menu = new Menu(map_table);
-        SelectionAdapter sel_adapter = null;
-
-        final Button button_add = new Button(composite, SWT.PUSH);
-        button_add.setText("&Add...");
-        button_add.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-        button_add.addSelectionListener(sel_adapter = new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                Map<String,Object> props = new HashMap<String,Object>();
-                Image image = ImageCache.getImage(ImageCache.IMG_MEMORY_MAP);
-                if (new MemoryMapItemDialog(getShell(), image, props, true).open() == OK) {
-                    if (mem_map_id != null) props.put(IMemoryMap.PROP_ID, mem_map_id);
-                    IMemoryMap.MemoryRegion[] arr = new IMemoryMap.MemoryRegion[cur_map.length + 1];
-                    System.arraycopy(cur_map, 0, arr, 0, cur_map.length);
-                    TCFMemoryRegion r = new TCFMemoryRegion(props);
-                    arr[cur_map.length] = r;
-                    Arrays.sort(cur_map = arr);
-                    table_viewer.refresh();
-                }
-            }
-        });
-        final MenuItem item_add = new MenuItem(menu, SWT.PUSH);
-        item_add.setText("&Add...");
-        item_add.addSelectionListener(sel_adapter);
-
-        final Button button_edit = new Button(composite, SWT.PUSH);
-        button_edit.setText("E&dit...");
-        button_edit.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-        button_edit.addSelectionListener(sel_adapter = new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                IMemoryMap.MemoryRegion r = (IMemoryMap.MemoryRegion)((IStructuredSelection)
-                        table_viewer.getSelection()).getFirstElement();
-                if (r == null) return;
-                editRegion(r);
-            }
-        });
-        final MenuItem item_edit = new MenuItem(menu, SWT.PUSH);
-        item_edit.setText("E&dit...");
-        item_edit.addSelectionListener(sel_adapter);
-
-        final Button button_remove = new Button(composite, SWT.PUSH);
-        button_remove.setText("&Remove");
-        button_remove.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-        button_remove.addSelectionListener(sel_adapter = new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                IMemoryMap.MemoryRegion r = (IMemoryMap.MemoryRegion)((IStructuredSelection)
-                        table_viewer.getSelection()).getFirstElement();
-                if (r == null) return;
-                for (int n = 0; n < cur_map.length; n++) {
-                    if (cur_map[n] == r) {
-                        IMemoryMap.MemoryRegion[] arr = new IMemoryMap.MemoryRegion[cur_map.length - 1];
-                        System.arraycopy(cur_map, 0, arr, 0, n);
-                        System.arraycopy(cur_map, n + 1, arr, n, arr.length - n);
-                        cur_map = arr;
-                        table_viewer.refresh();
-                        return;
-                    }
-                }
-            }
-        });
-        final MenuItem item_remove = new MenuItem(menu, SWT.PUSH);
-        item_remove.setText("&Remove");
-        item_remove.addSelectionListener(sel_adapter);
-
-        map_table.setMenu(menu);
-
-        update_map_buttons = new Runnable() {
-            public void run() {
-                IMemoryMap.MemoryRegion r = (IMemoryMap.MemoryRegion)((IStructuredSelection)
-                        table_viewer.getSelection()).getFirstElement();
-                boolean manual = r != null && r.getProperties().get(IMemoryMap.PROP_ID) != null;
-                button_add.setEnabled(mem_map_id != null);
-                button_edit.setEnabled(r != null);
-                button_remove.setEnabled(manual);
-                item_add.setEnabled(mem_map_id != null);
-                item_edit.setEnabled(r != null);
-                item_remove.setEnabled(manual);
-            }
-        };
-        update_map_buttons.run();
-    }
-
-    private void editRegion(MemoryRegion r) {
-        Map<String,Object> props = r.getProperties();
-        boolean enable_editing = props.get(IMemoryMap.PROP_ID) != null;
-        if (enable_editing) props = new HashMap<String,Object>(props);
-        Image image = ImageCache.getImage(ImageCache.IMG_MEMORY_MAP);
-        if (new MemoryMapItemDialog(getShell(), image, props, enable_editing).open() == OK && enable_editing) {
-            int i = 0;
-            while (cur_map[i] != r) i++;
-            cur_map[i] = new TCFMemoryRegion(props);
-            Arrays.sort(cur_map);
-            table_viewer.refresh();
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private void readMemoryMapAttribute(ArrayList<IMemoryMap.MemoryRegion> lst, boolean own) throws Exception {
-        final String map = cfg.getAttribute(TCFLaunchDelegate.ATTR_MEMORY_MAP, "");
-        if (map.length() == 0) return;
-        Collection<Object> c = new TCFTask<Collection<Object>>() {
-            public void run() {
-                try {
-                    done((Collection<Object>)JSON.parseOne(map.getBytes("UTF-8")));
-                }
-                catch (IOException e) {
-                    error(e);
-                }
-            }
-        }.getIO();
-        if (c == null) return;
-        for (Object x : c) {
-            Map<String,Object> props = (Map<String,Object>)x;
-            if (mem_map_id.equals(props.get(IMemoryMap.PROP_ID)) != own) continue;
-            lst.add(new TCFMemoryRegion(props));
-        }
-    }
-
-    private void writeMemoryMapAttribute(final ArrayList<IMemoryMap.MemoryRegion> lst) throws Exception {
-        // TODO: cleanup unused maps that accumulate in ATTR_MEMORY_MAP
-        String s = null;
-        if (lst.size() > 0) {
-            s = new TCFTask<String>() {
-                public void run() {
-                    try {
-                        done(JSON.toJSON(lst));
-                    }
-                    catch (IOException e) {
-                        error(e);
-                    }
-                }
-            }.getIO();
-        }
-        ILaunchConfigurationWorkingCopy copy = cfg.getWorkingCopy();
-        copy.setAttribute(TCFLaunchDelegate.ATTR_MEMORY_MAP, s);
-        copy.doSave();
-    }
-
-    private void loadData() {
-        final ArrayList<IMemoryMap.MemoryRegion> lst = new ArrayList<IMemoryMap.MemoryRegion>();
-        mem_map_id = new TCFTask<String>(channel) {
-            public void run() {
-                TCFDataCache<TCFNodeExecContext> mem_cache = model.searchMemoryContext(selection);
-                if (mem_cache == null) {
-                    error(new Exception("Context does not provide memory access"));
-                    return;
-                }
-                if (!mem_cache.validate(this)) return;
-                if (mem_cache.getError() != null) {
-                    error(mem_cache.getError());
-                    return;
-                }
-                node = mem_cache.getData();
-                if (node != null) {
-                    TCFDataCache<TCFNodeExecContext.MemoryRegion[]> dc = node.getMemoryMap();
-                    if (!dc.validate(this)) return;
-                    if (dc.getError() != null) {
-                        error(dc.getError());
-                        return;
-                    }
-                    if (dc.getData() != null) {
-                        for (TCFNodeExecContext.MemoryRegion m : dc.getData()) {
-                            Map<String,Object> props = m.region.getProperties();
-                            if (props.get(IMemoryMap.PROP_ID) != null) {
-                                String fnm = m.region.getFileName();
-                                if (fnm != null) loaded_files.add(fnm);
-                            }
-                            else {
-                                lst.add(new TCFMemoryRegion(props));
-                            }
-                        }
-                    }
-                }
-                String id = null;
-                if (node != null) {
-                    mem_ctx = node.getMemoryContext().getData();
-                    if (mem_ctx != null) {
-                        id = mem_ctx.getName();
-                        if (id == null) id = mem_ctx.getID();
-                    }
-                }
-                done(id);
-            }
-        }.getE();
-        cfg = model.getLaunch().getLaunchConfiguration();
-        if (mem_map_id != null) {
-            try {
-                readMemoryMapAttribute(lst, true);
-            }
-            catch (Throwable x) {
-                Activator.log("Invalid launch cofiguration attribute", x);
-            }
-        }
-        cur_map = lst.toArray(new IMemoryMap.MemoryRegion[lst.size()]);
-        Arrays.sort(cur_map);
-        org_map = new IMemoryMap.MemoryRegion[cur_map.length];
-        System.arraycopy(cur_map, 0, org_map, 0, cur_map.length);
-    }
-
     @Override
     protected void okPressed() {
-        if (mem_map_id == null) return;
-        boolean loaded_files_ok = true;
-        for (IMemoryMap.MemoryRegion r : cur_map) {
-            if (r.getProperties().get(IMemoryMap.PROP_ID) != null) {
-                String fnm = r.getFileName();
-                if (fnm != null && !loaded_files.contains(fnm)) loaded_files_ok = false;
-            }
+        try {
+            ILaunchConfigurationWorkingCopy copy = cfg.getWorkingCopy();
+            if (widget.saveData(copy)) copy.doSave();
+            super.okPressed();
         }
-        if (!loaded_files_ok || !Arrays.equals(org_map, cur_map)) {
-            try {
-                final ArrayList<IMemoryMap.MemoryRegion> lst = new ArrayList<MemoryRegion>();
-                for (IMemoryMap.MemoryRegion r : cur_map) {
-                    if (r.getProperties().get(IMemoryMap.PROP_ID) != null) lst.add(r);
-                }
-                readMemoryMapAttribute(lst, false);
-                writeMemoryMapAttribute(lst);
-            }
-            catch (Throwable x) {
-                MessageBox mb = new MessageBox(getShell(), SWT.ICON_ERROR | SWT.OK);
-                mb.setText("Cannot update memory map");
-                mb.setMessage(TCFModel.getErrorMessage(x, true));
-                mb.open();
-                return;
-            }
+        catch (Throwable x) {
+            MessageBox mb = new MessageBox(getShell(), SWT.ICON_ERROR | SWT.OK);
+            mb.setText("Cannot update memory map");
+            mb.setMessage(TCFModel.getErrorMessage(x, true));
+            mb.open();
         }
-        super.okPressed();
     }
 }
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/MemoryMapWidget.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/MemoryMapWidget.java
new file mode 100644
index 000000000..3578a7dd3
--- /dev/null
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/MemoryMapWidget.java
@@ -0,0 +1,531 @@
+package org.eclipse.tm.internal.tcf.debug.ui.commands;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITableColorProvider;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.tm.internal.tcf.debug.launch.TCFLaunchDelegate;
+import org.eclipse.tm.internal.tcf.debug.model.TCFMemoryRegion;
+import org.eclipse.tm.internal.tcf.debug.ui.Activator;
+import org.eclipse.tm.internal.tcf.debug.ui.ImageCache;
+import org.eclipse.tm.internal.tcf.debug.ui.model.TCFModel;
+import org.eclipse.tm.internal.tcf.debug.ui.model.TCFNode;
+import org.eclipse.tm.internal.tcf.debug.ui.model.TCFNodeExecContext;
+import org.eclipse.tm.tcf.protocol.IChannel;
+import org.eclipse.tm.tcf.protocol.JSON;
+import org.eclipse.tm.tcf.services.IMemory;
+import org.eclipse.tm.tcf.services.IMemoryMap;
+import org.eclipse.tm.tcf.services.IRunControl;
+import org.eclipse.tm.tcf.util.TCFDataCache;
+import org.eclipse.tm.tcf.util.TCFTask;
+
+public class MemoryMapWidget {
+
+
+    private static final int
+        SIZING_TABLE_WIDTH = 800,
+        SIZING_TABLE_HEIGHT = 300;
+
+    private static final String[] column_names = {
+        "File",
+        "Address",
+        "Size",
+        "Flags",
+        "File offset/section",
+    };
+
+    private final TCFModel model;
+    private final IChannel channel;
+    private final TCFNode selection;
+
+    private Combo ctx_text;
+    private Table map_table;
+    private TableViewer table_viewer;
+    private Runnable update_map_buttons;
+    private final Map<String,ArrayList<IMemoryMap.MemoryRegion>> org_maps =
+        new HashMap<String,ArrayList<IMemoryMap.MemoryRegion>>();
+    private final Map<String,ArrayList<IMemoryMap.MemoryRegion>> cur_maps =
+        new HashMap<String,ArrayList<IMemoryMap.MemoryRegion>>();
+    private final ArrayList<IMemoryMap.MemoryRegion> target_map =
+        new ArrayList<IMemoryMap.MemoryRegion>();
+    private TCFNodeExecContext node;
+    private IMemory.MemoryContext mem_ctx;
+    private ILaunchConfiguration cfg;
+    private final HashSet<String> loaded_files = new HashSet<String>();
+    private String mem_map_id;
+
+    private final IStructuredContentProvider content_provider = new IStructuredContentProvider() {
+
+        public Object[] getElements(Object input) {
+            ArrayList<IMemoryMap.MemoryRegion> res = new ArrayList<IMemoryMap.MemoryRegion>();
+            ArrayList<IMemoryMap.MemoryRegion> lst = cur_maps.get((String)input);
+            if (lst != null) res.addAll(lst);
+            res.addAll(target_map);
+            return res.toArray();
+        }
+
+        public void dispose() {
+        }
+
+        public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+        }
+    };
+
+    private class MapLabelProvider extends LabelProvider implements ITableLabelProvider, ITableColorProvider {
+
+        public Image getColumnImage(Object element, int column) {
+            return null;
+        }
+
+        public String getColumnText(Object element, int column) {
+            TCFMemoryRegion r = (TCFMemoryRegion)element;
+            switch (column) {
+            case 0:
+                return r.getFileName();
+            case 1:
+            case 2:
+                {
+                    BigInteger x = column == 1 ? r.addr : r.size;
+                    if (x == null) return "";
+                    String s = x.toString(16);
+                    int sz = mem_ctx.getAddressSize() * 2;
+                    int l = sz - s.length();
+                    if (l < 0) l = 0;
+                    if (l > 16) l = 16;
+                    return "0x0000000000000000".substring(0, 2 + l) + s;
+                }
+            case 3:
+                {
+                    int n = r.getFlags();
+                    StringBuffer bf = new StringBuffer();
+                    if ((n & IMemoryMap.FLAG_READ) != 0) bf.append('r');
+                    if ((n & IMemoryMap.FLAG_WRITE) != 0) bf.append('w');
+                    if ((n & IMemoryMap.FLAG_EXECUTE) != 0) bf.append('x');
+                    return bf.toString();
+                }
+            case 4:
+                {
+                    Number n = r.getOffset();
+                    if (n != null) {
+                        BigInteger x = n instanceof BigInteger ? (BigInteger)n : new BigInteger(n.toString());
+                        String s = x.toString(16);
+                        int l = 16 - s.length();
+                        if (l < 0) l = 0;
+                        if (l > 16) l = 16;
+                        return "0x0000000000000000".substring(0, 2 + l) + s;
+                    }
+                    String s = r.getSectionName();
+                    if (s != null) return s;
+                    return "";
+                }
+            }
+            return "";
+        }
+
+        public Color getBackground(Object element, int columnIndex) {
+            return map_table.getBackground();
+        }
+
+        public Color getForeground(Object element, int columnIndex) {
+            TCFMemoryRegion r = (TCFMemoryRegion)element;
+            if (r.getProperties().get(IMemoryMap.PROP_ID) != null) {
+                String fnm = r.getFileName();
+                if (fnm != null && loaded_files.contains(fnm)) {
+                    return map_table.getDisplay().getSystemColor(SWT.COLOR_DARK_GREEN);
+                }
+                return map_table.getDisplay().getSystemColor(SWT.COLOR_DARK_BLUE);
+            }
+            return map_table.getForeground();
+        }
+
+        public String getText(Object element) {
+            return element.toString();
+        }
+    }
+
+    public MemoryMapWidget(Composite composite, TCFNode node) {
+        if (node != null) {
+            model = node.getModel();
+            channel = node.getChannel();
+            selection = node;
+        }
+        else {
+            model = null;
+            channel = null;
+            selection = null;
+        }
+        createContextText(composite);
+        createMemoryMapTable(composite);
+        table_viewer.setInput(ctx_text.getText());
+    }
+
+    public String getMemoryMapID() {
+        return mem_map_id;
+    }
+
+    private void createContextText(Composite parent) {
+        Font font = parent.getFont();
+        Composite composite = new Composite(parent, SWT.NONE);
+        GridLayout layout = new GridLayout(2, false);
+        composite.setFont(font);
+        composite.setLayout(layout);
+        composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+        Label props_label = new Label(composite, SWT.WRAP);
+        props_label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
+        props_label.setFont(font);
+        props_label.setText("&Debug context:");
+
+        ctx_text = new Combo(composite, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
+        ctx_text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+        ctx_text.setFont(font);
+        ctx_text.addModifyListener(new ModifyListener() {
+            public void modifyText(ModifyEvent e) {
+                table_viewer.setInput(ctx_text.getText());
+            }
+        });
+    }
+
+    private void createMemoryMapTable(Composite parent) {
+        Font font = parent.getFont();
+
+        Composite composite = new Composite(parent, SWT.NONE);
+        GridLayout layout = new GridLayout(2, false);
+        composite.setFont(font);
+        composite.setLayout(layout);
+        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+        map_table = new Table(composite,
+                SWT.SINGLE | SWT.BORDER | SWT.FULL_SELECTION |
+                SWT.H_SCROLL | SWT.V_SCROLL);
+        map_table.setFont(font);
+        GridData data = new GridData(GridData.FILL_BOTH);
+        data.widthHint = SIZING_TABLE_WIDTH;
+        data.heightHint = SIZING_TABLE_HEIGHT;
+        map_table.setLayoutData(data);
+
+        int w = SIZING_TABLE_WIDTH / (column_names.length + 12);
+        for (int i = 0; i < column_names.length; i++) {
+            final TableColumn column = new TableColumn(map_table, SWT.LEAD, i);
+            column.setMoveable(false);
+            column.setText(column_names[i]);
+            switch (i) {
+            case 0:
+                column.setWidth(w * 10);
+                break;
+            case 1:
+            case 2:
+            case 4:
+                column.setWidth(w * 2);
+                break;
+            default:
+                column.setWidth(w);
+                break;
+            }
+        }
+        map_table.setHeaderVisible(true);
+        map_table.setLinesVisible(true);
+        map_table.addSelectionListener(new SelectionAdapter() {
+            @Override
+            public void widgetDefaultSelected(SelectionEvent e) {
+                IMemoryMap.MemoryRegion r = (IMemoryMap.MemoryRegion)((IStructuredSelection)
+                        table_viewer.getSelection()).getFirstElement();
+                if (r == null) return;
+                editRegion(r);
+            }
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                update_map_buttons.run();
+            }
+        });
+
+        table_viewer = new TableViewer(map_table);
+        table_viewer.setUseHashlookup(true);
+        table_viewer.setColumnProperties(column_names);
+
+        table_viewer.setContentProvider(content_provider);
+
+        table_viewer.setLabelProvider(new MapLabelProvider());
+
+        createMapButtons(composite);
+    }
+
+    private void createMapButtons(Composite parent) {
+        Font font = parent.getFont();
+        Composite composite = new Composite(parent, SWT.NONE);
+        GridLayout layout = new GridLayout();
+        composite.setFont(font);
+        composite.setLayout(layout);
+        composite.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL));
+        Menu menu = new Menu(map_table);
+        SelectionAdapter sel_adapter = null;
+
+        final Button button_add = new Button(composite, SWT.PUSH);
+        button_add.setText("&Add...");
+        button_add.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
+        button_add.addSelectionListener(sel_adapter = new SelectionAdapter() {
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                String id = ctx_text.getText();
+                if (id == null || id.length() == 0) return;
+                Map<String,Object> props = new HashMap<String,Object>();
+                Image image = ImageCache.getImage(ImageCache.IMG_MEMORY_MAP);
+                if (new MemoryMapItemDialog(map_table.getShell(), image, props, true).open() == Window.OK) {
+                    props.put(IMemoryMap.PROP_ID, id);
+                    ArrayList<IMemoryMap.MemoryRegion> lst = cur_maps.get(id);
+                    if (lst == null) cur_maps.put(id, lst = new ArrayList<IMemoryMap.MemoryRegion>());
+                    lst.add(new TCFMemoryRegion(props));
+                    table_viewer.refresh();
+                }
+            }
+        });
+        final MenuItem item_add = new MenuItem(menu, SWT.PUSH);
+        item_add.setText("&Add...");
+        item_add.addSelectionListener(sel_adapter);
+
+        final Button button_edit = new Button(composite, SWT.PUSH);
+        button_edit.setText("E&dit...");
+        button_edit.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
+        button_edit.addSelectionListener(sel_adapter = new SelectionAdapter() {
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                IMemoryMap.MemoryRegion r = (IMemoryMap.MemoryRegion)((IStructuredSelection)
+                        table_viewer.getSelection()).getFirstElement();
+                if (r == null) return;
+                editRegion(r);
+            }
+        });
+        final MenuItem item_edit = new MenuItem(menu, SWT.PUSH);
+        item_edit.setText("E&dit...");
+        item_edit.addSelectionListener(sel_adapter);
+
+        final Button button_remove = new Button(composite, SWT.PUSH);
+        button_remove.setText("&Remove");
+        button_remove.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
+        button_remove.addSelectionListener(sel_adapter = new SelectionAdapter() {
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                String id = ctx_text.getText();
+                if (id == null || id.length() == 0) return;
+                IMemoryMap.MemoryRegion r = (IMemoryMap.MemoryRegion)((IStructuredSelection)
+                        table_viewer.getSelection()).getFirstElement();
+                if (r == null) return;
+                ArrayList<IMemoryMap.MemoryRegion> lst = cur_maps.get(id);
+                if (lst != null && lst.remove(r)) table_viewer.refresh();
+            }
+        });
+        final MenuItem item_remove = new MenuItem(menu, SWT.PUSH);
+        item_remove.setText("&Remove");
+        item_remove.addSelectionListener(sel_adapter);
+
+        map_table.setMenu(menu);
+
+        update_map_buttons = new Runnable() {
+            public void run() {
+                IMemoryMap.MemoryRegion r = (IMemoryMap.MemoryRegion)((IStructuredSelection)
+                        table_viewer.getSelection()).getFirstElement();
+                boolean manual = r != null && r.getProperties().get(IMemoryMap.PROP_ID) != null;
+                button_add.setEnabled(mem_map_id != null);
+                button_edit.setEnabled(r != null);
+                button_remove.setEnabled(manual);
+                item_add.setEnabled(mem_map_id != null);
+                item_edit.setEnabled(r != null);
+                item_remove.setEnabled(manual);
+            }
+        };
+        update_map_buttons.run();
+    }
+
+    private void editRegion(IMemoryMap.MemoryRegion r) {
+        String id = ctx_text.getText();
+        if (id == null || id.length() == 0) return;
+        Map<String,Object> props = r.getProperties();
+        boolean enable_editing = props.get(IMemoryMap.PROP_ID) != null;
+        if (enable_editing) props = new HashMap<String,Object>(props);
+        Image image = ImageCache.getImage(ImageCache.IMG_MEMORY_MAP);
+        if (new MemoryMapItemDialog(map_table.getShell(), image, props, enable_editing).open() == Window.OK && enable_editing) {
+            ArrayList<IMemoryMap.MemoryRegion> lst = cur_maps.get(id);
+            if (lst != null) {
+                int n = lst.indexOf(r);
+                if (n >= 0) {
+                    lst.set(n, new TCFMemoryRegion(props));
+                    table_viewer.refresh();
+                }
+            }
+        }
+    }
+
+    private void readMemoryMapAttribute() throws Exception {
+        cur_maps.clear();
+        new TCFTask<Boolean>() {
+            public void run() {
+                try {
+                    TCFLaunchDelegate.getMemMapsAttribute(cur_maps, cfg);
+                    done(true);
+                }
+                catch (Exception e) {
+                    error(e);
+                }
+            }
+        }.getE();
+    }
+
+    private void writeMemoryMapAttribute(ILaunchConfigurationWorkingCopy copy) throws Exception {
+        String s = null;
+        final ArrayList<IMemoryMap.MemoryRegion> lst = new ArrayList<IMemoryMap.MemoryRegion>();
+        for (ArrayList<IMemoryMap.MemoryRegion> x : cur_maps.values()) lst.addAll(x);
+        if (lst.size() > 0) {
+            s = new TCFTask<String>() {
+                public void run() {
+                    try {
+                        done(JSON.toJSON(lst));
+                    }
+                    catch (IOException e) {
+                        error(e);
+                    }
+                }
+            }.getIO();
+        }
+        copy.setAttribute(TCFLaunchDelegate.ATTR_MEMORY_MAP, s);
+    }
+
+    public void loadData(ILaunchConfiguration cfg) {
+        this.cfg = cfg;
+        cur_maps.clear();
+        org_maps.clear();
+        target_map.clear();
+        mem_map_id = channel == null ? null : new TCFTask<String>(channel) {
+            public void run() {
+                TCFDataCache<TCFNodeExecContext> mem_cache = model.searchMemoryContext(selection);
+                if (mem_cache == null) {
+                    error(new Exception("Context does not provide memory access"));
+                    return;
+                }
+                if (!mem_cache.validate(this)) return;
+                if (mem_cache.getError() != null) {
+                    error(mem_cache.getError());
+                    return;
+                }
+                node = mem_cache.getData();
+                if (node != null) {
+                    TCFDataCache<TCFNodeExecContext.MemoryRegion[]> dc = node.getMemoryMap();
+                    if (!dc.validate(this)) return;
+                    if (dc.getError() != null) {
+                        error(dc.getError());
+                        return;
+                    }
+                    if (dc.getData() != null) {
+                        for (TCFNodeExecContext.MemoryRegion m : dc.getData()) {
+                            Map<String,Object> props = m.region.getProperties();
+                            if (props.get(IMemoryMap.PROP_ID) != null) {
+                                String fnm = m.region.getFileName();
+                                if (fnm != null) loaded_files.add(fnm);
+                            }
+                            else {
+                                target_map.add(new TCFMemoryRegion(props));
+                            }
+                        }
+                    }
+                }
+                String id = null;
+                if (node != null) {
+                    mem_ctx = node.getMemoryContext().getData();
+                    if (mem_ctx != null) {
+                        id = mem_ctx.getName();
+                        if (id == null) {
+                            id = mem_ctx.getID();
+                        }
+                        else {
+                            // Get full name
+                            TCFNodeExecContext p = node;
+                            ArrayList<String> lst = new ArrayList<String>();
+                            lst.add(id);
+                            while (p.getParent() instanceof TCFNodeExecContext) {
+                                p = (TCFNodeExecContext)p.getParent();
+                                TCFDataCache<IRunControl.RunControlContext> run_ctx_cache = p.getRunContext();
+                                if (!run_ctx_cache.validate(this)) return;
+                                IRunControl.RunControlContext run_ctx_data = run_ctx_cache.getData();
+                                String name = null;
+                                if (run_ctx_data != null) name = run_ctx_data.getName();
+                                if (name == null) name = "";
+                                lst.add(name);
+                            }
+                            StringBuffer bf = new StringBuffer();
+                            for (int i = lst.size(); i > 0; i--) {
+                                bf.append('/');
+                                bf.append(lst.get(i - 1));
+                            }
+                            id = bf.toString();
+                        }
+                    }
+                }
+                done(id);
+            }
+        }.getE();
+        try {
+            readMemoryMapAttribute();
+        }
+        catch (Throwable x) {
+            Activator.log("Invalid launch cofiguration attribute", x);
+        }
+        for (String id : cur_maps.keySet()) {
+            org_maps.put(id, new ArrayList<IMemoryMap.MemoryRegion>(cur_maps.get(id)));
+        }
+        // Update controls
+        ctx_text.removeAll();
+        if (mem_map_id != null && cur_maps.get(mem_map_id) == null) ctx_text.add(mem_map_id);
+        for (String id : cur_maps.keySet()) ctx_text.add(id);
+        if (mem_map_id != null) ctx_text.setText(mem_map_id);
+        table_viewer.setInput(mem_map_id == null ? "" : mem_map_id);
+        update_map_buttons.run();
+    }
+
+    public boolean saveData(ILaunchConfigurationWorkingCopy copy) throws Exception {
+        if (mem_map_id == null) return false;
+        boolean loaded_files_ok = true;
+        ArrayList<IMemoryMap.MemoryRegion> lst = cur_maps.get(mem_map_id);
+        if (lst != null) {
+            for (IMemoryMap.MemoryRegion r : lst) {
+                String fnm = r.getFileName();
+                if (fnm != null && !loaded_files.contains(fnm)) loaded_files_ok = false;
+            }
+            if (lst.size() == 0) cur_maps.remove(mem_map_id);
+        }
+        if (!loaded_files_ok || !org_maps.equals(cur_maps)) {
+            writeMemoryMapAttribute(copy);
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFMemoryMapTab.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFMemoryMapTab.java
new file mode 100644
index 000000000..a369fe92a
--- /dev/null
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFMemoryMapTab.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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
+ *
+ * Contributors:
+ *     Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.tm.internal.tcf.debug.ui.launch;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
+import org.eclipse.debug.ui.DebugUITools;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.tm.internal.tcf.debug.ui.commands.MemoryMapWidget;
+import org.eclipse.tm.internal.tcf.debug.ui.model.TCFNode;
+
+public class TCFMemoryMapTab extends AbstractLaunchConfigurationTab {
+
+    private MemoryMapWidget widget;
+
+    public void createControl(Composite parent) {
+        TCFNode node = null;
+        IAdaptable adaptable = DebugUITools.getDebugContext();
+        if (adaptable != null) node = (TCFNode)adaptable.getAdapter(TCFNode.class);
+        Composite composite = new Composite(parent, SWT.NONE);
+        GridLayout layout = new GridLayout(1, false);
+        composite.setFont(parent.getFont());
+        composite.setLayout(layout);
+        composite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true, 1, 1));
+        widget = new MemoryMapWidget(composite, node);
+        setControl(composite);
+    }
+
+    public void setDefaults(ILaunchConfigurationWorkingCopy cfg) {
+    }
+
+    public void initializeFrom(ILaunchConfiguration cfg) {
+        setErrorMessage(null);
+        setMessage(null);
+        widget.loadData(cfg);
+    }
+
+    public void performApply(ILaunchConfigurationWorkingCopy cfg) {
+        try {
+            widget.saveData(cfg);
+        }
+        catch (Throwable x) {
+            setErrorMessage("Cannot update memory map: " + x);
+        }
+    }
+
+    public String getName() {
+        return "Symbol Files";
+    }
+}
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFPathMapTab.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFPathMapTab.java
index 559518dd0..a44c736be 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFPathMapTab.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFPathMapTab.java
@@ -137,10 +137,9 @@ public class TCFPathMapTab extends AbstractLaunchConfigurationTab {
     }
 
     public void createControl(Composite parent) {
-        Font font = parent.getFont();
         Composite composite = new Composite(parent, SWT.NONE);
         GridLayout layout = new GridLayout(1, false);
-        composite.setFont(font);
+        composite.setFont(parent.getFont());
         composite.setLayout(layout);
         composite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true, 1, 1));
         createTable(composite);
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFTabGroup.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFTabGroup.java
index 2311fce0e..1db24c9fd 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFTabGroup.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFTabGroup.java
@@ -28,6 +28,7 @@ public class TCFTabGroup extends AbstractLaunchConfigurationTabGroup {
             new TCFTargetTab(),
             new TCFArgumentsTab(),
             new EnvironmentTab(),
+            new TCFMemoryMapTab(),
             new TCFPathMapTab(),
             new SourceLookupTab(),
             new CommonTab()
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFTargetTab.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFTargetTab.java
index d655192a4..a33d6d89a 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFTargetTab.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFTargetTab.java
@@ -53,19 +53,16 @@ import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.tm.internal.tcf.debug.launch.TCFLaunchDelegate;
 import org.eclipse.tm.internal.tcf.debug.launch.TCFLocalAgent;
 import org.eclipse.tm.internal.tcf.debug.launch.TCFUserDefPeer;
-import org.eclipse.tm.internal.tcf.debug.model.TCFMemoryRegion;
 import org.eclipse.tm.internal.tcf.debug.tests.TCFTestSuite;
 import org.eclipse.tm.internal.tcf.debug.ui.Activator;
 import org.eclipse.tm.internal.tcf.debug.ui.ImageCache;
 import org.eclipse.tm.internal.tcf.debug.ui.launch.setup.SetupWizardDialog;
 import org.eclipse.tm.tcf.protocol.IChannel;
-import org.eclipse.tm.tcf.protocol.IChannel.IChannelListener;
 import org.eclipse.tm.tcf.protocol.IPeer;
-import org.eclipse.tm.tcf.protocol.JSON;
 import org.eclipse.tm.tcf.protocol.Protocol;
 import org.eclipse.tm.tcf.services.ILocator;
 import org.eclipse.tm.tcf.services.IMemoryMap;
-import org.eclipse.tm.tcf.services.IPathMap.PathMapRule;
+import org.eclipse.tm.tcf.services.IPathMap;
 import org.eclipse.tm.tcf.util.TCFTask;
 
 
@@ -648,7 +645,7 @@ public class TCFTargetTab extends AbstractLaunchConfigurationTab {
                 else {
                     final IChannel channel = parent.peer.openChannel();
                     parent.channel = channel;
-                    parent.channel.addChannelListener(new IChannelListener() {
+                    parent.channel.addChannelListener(new IChannel.IChannelListener() {
                         boolean opened = false;
                         boolean closed = false;
                         public void congestionLevel(int level) {
@@ -992,28 +989,14 @@ public class TCFTargetTab extends AbstractLaunchConfigurationTab {
         Protocol.invokeLater(new Runnable() {
             public void run() {
                 try {
-                    List<PathMapRule> path_map = null;
+                    List<IPathMap.PathMapRule> path_map = null;
                     for (ILaunchConfigurationTab t : getLaunchConfigurationDialog().getTabs()) {
                         if (t instanceof TCFPathMapTab) path_map = ((TCFPathMapTab)t).getPathMap();
                     }
                     HashMap<String,ArrayList<IMemoryMap.MemoryRegion>> mem_map = null;
                     if (mem_map_cfg != null) {
-                        @SuppressWarnings("unchecked")
-                        Collection<Map<String,Object>> list = (Collection<Map<String,Object>>)JSON.parseOne(mem_map_cfg.getBytes("UTF-8"));
-                        if (list != null) {
-                            mem_map = new HashMap<String,ArrayList<IMemoryMap.MemoryRegion>>();
-                            for (Map<String,Object> m : list) {
-                                String id = (String)m.get(IMemoryMap.PROP_ID);
-                                if (id != null) {
-                                    ArrayList<IMemoryMap.MemoryRegion> l = mem_map.get(id);
-                                    if (l == null) {
-                                        l = new ArrayList<IMemoryMap.MemoryRegion>();
-                                        mem_map.put(id, l);
-                                    }
-                                    l.add(new TCFMemoryRegion(m));
-                                }
-                            }
-                        }
+                        mem_map = new HashMap<String,ArrayList<IMemoryMap.MemoryRegion>>();
+                        TCFLaunchDelegate.parseMemMapsAttribute(mem_map, mem_map_cfg);
                     }
                     test[0] = new TCFTestSuite(peer, done, path_map, mem_map);
                 }