From 07c44120908389df6951779b11220bbb34254e4e Mon Sep 17 00:00:00 2001
From: fnasser <fnasser>
Date: Thu, 4 May 2000 16:08:37 +0000
Subject: [PATCH] 2000-05-04  Fernando Nasser  <fnasser@cygnus.com>

	* regwin.itb (build_win, update): Safer test for editable.
---
 gdb/gdbtk/library/ChangeLog  |  4 ++++
 gdb/gdbtk/library/regwin.itb | 29 ++++-------------------------
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/gdb/gdbtk/library/ChangeLog b/gdb/gdbtk/library/ChangeLog
index 302d4cec09..86f3807bcc 100644
--- a/gdb/gdbtk/library/ChangeLog
+++ b/gdb/gdbtk/library/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-04  Fernando Nasser  <fnasser@cygnus.com>
+
+	* regwin.itb (build_win, update): Safer test for editable.
+
 2000-05-01  Fernando Nasser  <fnasser@cygnus.com>
 
 	* regwin.itb (build_win): Adjust size of columns independently, force
diff --git a/gdb/gdbtk/library/regwin.itb b/gdb/gdbtk/library/regwin.itb
index f1a727e28f..2629117763 100644
--- a/gdb/gdbtk/library/regwin.itb
+++ b/gdb/gdbtk/library/regwin.itb
@@ -98,8 +98,10 @@ body RegWin::build_win {} {
         set format r
         set reg_display($r,format) r
         set reg_display($r,typed) 1
+        set reg_display($r,editable) 0
       } else {
         set format $reg_display($r,format)
+        set reg_display($r,editable) 1
       }
       if {[catch {gdb_fetch_registers $format $r} values($r)]} {
         set values($r) ""
@@ -108,18 +110,6 @@ body RegWin::build_win {} {
       }
     }
 
-    # Check if we can edit this value
-    if {[catch {gdb_cmd "set \$$reg_display($r,name)=$valtest"} rst]} {
-      set reg_display($r,editable) 0
-    } else {
-      set reg_display($r,editable) 1
-    }
-    catch {gdb_fetch_registers {} $r} valtest2
-    if {$valtest2 != $valtest} {
-      tk_messageBox -icon error -type ok -message "Register value clobbered!" \
-        -title "Internal Error" -parent [winfo toplevel $itk_interior]
-    }
-
     set l [string length $values($r)]
     if {$l > $vmax($col)} {
       set vmax($col) $l
@@ -628,8 +618,10 @@ body RegWin::update {} {
         set format r
         set reg_display($r,format) r
         set reg_display($r,typed) 1
+        set reg_display($r,editable) 0
       } else {
         set format $reg_display($r,format)
+        set reg_display($r,editable) 1
       }
       if {[catch {gdb_fetch_registers $format $r} values($r)]} {
         set values($r) ""
@@ -638,19 +630,6 @@ body RegWin::update {} {
       }
     }
 
-    # Check if we can edit this value
-    if {[catch {gdb_cmd "set \$$reg_display($r,name)=$valtest"} rst]} {
-      set reg_display($r,editable) 0
-    } else {
-      set reg_display($r,editable) 1
-    }
-    # Make sure we did not changed the original value with the test above
-    catch {gdb_fetch_registers {} $r} valtest2
-    if {$valtest2 != $valtest} {
-      tk_messageBox -icon error -type ok -message "Register value clobbered!" \
-        -title "Internal Error" -parent [winfo toplevel $itk_interior]
-    }
-
     set l [string length $values($r)]
     if {$l > $vmax($col)} {
       set vmax($col) $l
-- 
2.11.0