From dc3e238402fb30b11240fdb4582716c7c88d7fff Mon Sep 17 00:00:00 2001
From: Randy Rohrbach <Randy.Rohrbach@Windriver.com>
Date: Mon, 20 Aug 2007 15:25:39 +0000
Subject: [PATCH] Bugzilla 200566 - providing type and attribute information
 for registers and bitfields in the expressions view.

---
 .../register/RegisterBitFieldLayoutNode.java     | 14 ++++++++++++++
 .../register/RegisterGroupLayoutNode.java        |  2 ++
 .../viewmodel/register/RegisterLayoutNode.java   | 16 ++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterBitFieldLayoutNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterBitFieldLayoutNode.java
index 72ba3a00cdb..34d3095e54d 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterBitFieldLayoutNode.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterBitFieldLayoutNode.java
@@ -323,6 +323,20 @@ public class RegisterBitFieldLayoutNode extends AbstractExpressionLayoutNode<IBi
                                 update.setLabel(getData().getName(), idx);
                             } else if (IDebugVMConstants.COLUMN_ID__VALUE.equals(localColumns[idx])) {
                                 weAreExtractingFormattedData = true;
+                            } else if (IDebugVMConstants.COLUMN_ID__TYPE.equals(localColumns[idx])) {
+                                IBitFieldDMData data = getData();
+                                String typeStr      = "Unsigned"; //$NON-NLS-1$
+                                String ReadAttrStr  = "ReadNone"; //$NON-NLS-1$
+                                String WriteAddrStr = "WriteNone"; //$NON-NLS-1$
+                                
+                                     if ( data.isReadOnce() ) { ReadAttrStr = "ReadOnce"; } //$NON-NLS-1$
+                                else if ( data.isReadable() ) { ReadAttrStr = "Readable"; } //$NON-NLS-1$
+                                
+                                     if ( data.isReadOnce() ) { WriteAddrStr = "WriteOnce"; } //$NON-NLS-1$
+                                else if ( data.isReadable() ) { WriteAddrStr = "Writeable"; } //$NON-NLS-1$
+                                
+                                typeStr += " - " + ReadAttrStr + "/" + WriteAddrStr; //$NON-NLS-1$ //$NON-NLS-2$
+                                update.setLabel(typeStr, idx);
                             } else if (IDebugVMConstants.COLUMN_ID__DESCRIPTION.equals(localColumns[idx])) {
                                 update.setLabel(getData().getDescription(), idx);
                             } else if (IDebugVMConstants.COLUMN_ID__EXPRESSION.equals(localColumns[idx])) {
diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterGroupLayoutNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterGroupLayoutNode.java
index 13bb314d2e4..54e50c28698 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterGroupLayoutNode.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterGroupLayoutNode.java
@@ -189,6 +189,8 @@ public class RegisterGroupLayoutNode extends AbstractExpressionLayoutNode<IRegis
             update.setLabel("", idx); //$NON-NLS-1$
         } else if (IDebugVMConstants.COLUMN_ID__DESCRIPTION.equals(columnId)) {
             update.setLabel(dmData.getDescription(), idx);
+        } else if (IDebugVMConstants.COLUMN_ID__TYPE.equals(columnId)) {
+            update.setLabel("", idx); //$NON-NLS-1$
         } else if (IDebugVMConstants.COLUMN_ID__EXPRESSION.equals(columnId)) {
             IVMContext vmc = (IVMContext)update.getElement();
             IExpression expression = (IExpression)vmc.getAdapter(IExpression.class);
diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterLayoutNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterLayoutNode.java
index ae4532c8b60..2d8e4e33b37 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterLayoutNode.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterLayoutNode.java
@@ -324,6 +324,22 @@ public class RegisterLayoutNode extends AbstractExpressionLayoutNode<IRegisterDM
                                 update.setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_OBJS_REGISTER), idx);
                             } else if (IDebugVMConstants.COLUMN_ID__VALUE.equals(localColumns[idx])) {
                                 weAreExtractingFormattedData = true;
+                            } else if (IDebugVMConstants.COLUMN_ID__TYPE.equals(localColumns[idx])) {
+                                IRegisterDMData data = getData();
+                                String typeStr      = "Unsigned"; //$NON-NLS-1$
+                                String ReadAttrStr  = "ReadNone"; //$NON-NLS-1$
+                                String WriteAddrStr = "WriteNone"; //$NON-NLS-1$
+                                
+                                if ( data.isFloat() ) { typeStr = "Floating Point"; } //$NON-NLS-1$ 
+                                
+                                     if ( data.isReadOnce() ) { ReadAttrStr = "ReadOnce"; } //$NON-NLS-1$
+                                else if ( data.isReadable() ) { ReadAttrStr = "Readable"; } //$NON-NLS-1$
+                                
+                                     if ( data.isReadOnce() ) { WriteAddrStr = "WriteOnce"; } //$NON-NLS-1$
+                                else if ( data.isReadable() ) { WriteAddrStr = "Writeable"; } //$NON-NLS-1$
+                                
+                                typeStr += " - " + ReadAttrStr + "/" + WriteAddrStr; //$NON-NLS-1$ //$NON-NLS-2$
+                                update.setLabel(typeStr, idx);
                             } else if (IDebugVMConstants.COLUMN_ID__DESCRIPTION.equals(localColumns[idx])) {
                                 update.setLabel(getData().getDescription(), idx);
                             } else if (IDebugVMConstants.COLUMN_ID__EXPRESSION.equals(localColumns[idx])) {