Ticket #8286: variable_address.patch

src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp

@@ -16 +16 @@
 
 #include <AutoDeleter.h>
 #include <AutoLocker.h>
+#include <ControlLook.h>
 
 #include "table/TableColumns.h"
 
@@ -29 +30 @@
 #include "StackFrame.h"
 #include "StackFrameValues.h"
 #include "TableCellValueRenderer.h"
+#include "TargetAddressTableColumn.h"
 #include "Team.h"
 #include "Thread.h"
 #include "Tracing.h"
@@ -1043 +1045 @@
 int32
 VariablesView::VariableTableModel::CountColumns() const
 {
-    return 2;
+    return 3;
 }
 
 
@@ -1102 +1104 @@
 
     switch (columnIndex) {
         case 0:
-            _value.SetTo(node->Name(), B_VARIANT_DONT_COPY_DATA);
+        {
+            if (node->NodeChild()->LocationResolutionState()
+                == VALUE_NODE_UNRESOLVED) {
+                return false;
+            }
+            ValueLocation* location = node->NodeChild()->Location();
+            if (location == NULL)
+                return false;
+
+            ValuePieceLocation piece = location->PieceAt(0);
+            if (piece.type != VALUE_PIECE_LOCATION_MEMORY)
+                return false;
+            _value.SetTo(piece.address);
             return true;
+        }
         case 1:
+            _value.SetTo(node->Name(), B_VARIANT_DONT_COPY_DATA);
+            return true;
+        case 2:
             if (node->GetValue() == NULL)
                 return false;
 
@@ -1725 +1743 @@
     fVariableTable->SetSortingEnabled(false);
 
     // columns
-    fVariableTable->AddColumn(new StringTableColumn(0, "Variable", 80, 40, 1000,
+    float addressWidth = be_plain_font->StringWidth("0x00000000")
+        + be_control_look->DefaultLabelSpacing() * 2 + 5;
+
+    fVariableTable->AddColumn(new TargetAddressTableColumn(0, "Address",
+        addressWidth, 40, 1000, B_TRUNCATE_END, B_ALIGN_RIGHT));
+    fVariableTable->AddColumn(new StringTableColumn(1, "Variable", 80, 40, 1000,
         B_TRUNCATE_END, B_ALIGN_LEFT));
-    fVariableTable->AddColumn(new VariableValueColumn(1, "Value", 80, 40, 1000,
+    fVariableTable->AddColumn(new VariableValueColumn(2, "Value", 80, 40, 1000,
         B_TRUNCATE_END, B_ALIGN_RIGHT));
 
     fVariableTableModel = new VariableTableModel;