From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14530 invoked by alias); 28 May 2008 19:23:37 -0000 Received: (qmail 14478 invoked by uid 9708); 28 May 2008 19:23:36 -0000 Date: Wed, 28 May 2008 19:23:00 -0000 Message-ID: <20080528192336.14463.qmail@sourceware.org> From: tthomas@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Maintain previous value of watched variable in WatchpointObserver. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 3a848ec1396198a762420c60d340cf0cf77b2b11 X-Git-Newrev: 81647a994c50b61d87ec8ff4eedc079990f7e4bb Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q2/txt/msg00299.txt.bz2 The branch, master has been updated via 81647a994c50b61d87ec8ff4eedc079990f7e4bb (commit) from 3a848ec1396198a762420c60d340cf0cf77b2b11 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 81647a994c50b61d87ec8ff4eedc079990f7e4bb Author: Teresa Thomas Date: Wed May 28 15:25:44 2008 -0400 Maintain previous value of watched variable in WatchpointObserver. frysk-core/frysk/rt/ChangeLog: 2008-05-28 Teresa Thomas * WatchObserverInstaller.java (WatchpointObserver): Maintain oldValue here. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/rt/ChangeLog | 3 +++ frysk-core/frysk/rt/WatchObserverInstaller.java | 11 ++++------- 2 files changed, 7 insertions(+), 7 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/rt/ChangeLog b/frysk-core/frysk/rt/ChangeLog index abf6639..82cf8e7 100644 --- a/frysk-core/frysk/rt/ChangeLog +++ b/frysk-core/frysk/rt/ChangeLog @@ -1,5 +1,8 @@ 2008-05-28 Teresa Thomas + * WatchObserverInstaller.java (WatchpointObserver): + Maintain oldValue here. + * WatchObserverInstaller.java (oldValue): Make static. * WatchObserverInstaller.java: New file. diff --git a/frysk-core/frysk/rt/WatchObserverInstaller.java b/frysk-core/frysk/rt/WatchObserverInstaller.java index 885f43c..3d0bfd6 100644 --- a/frysk-core/frysk/rt/WatchObserverInstaller.java +++ b/frysk-core/frysk/rt/WatchObserverInstaller.java @@ -61,11 +61,6 @@ public class WatchObserverInstaller { private static int watchpointsInUse = 0; - // Maintain oldValue statically so that changes made to a - // a value being watched by multiple watchpoints are - // are reflected in all watch observers. - private static String oldValue = ""; - Expression expr; String exprString; SteppingEngine ste; @@ -137,6 +132,7 @@ public class WatchObserverInstaller { String exprString; SteppingEngine ste; PrintWriter writer; + String oldValue; Task task; WatchpointObserver(Expression expr, String exprStr, Task task, @@ -146,8 +142,9 @@ public class WatchObserverInstaller { this.ste = ste; this.writer = writer; this.task = task; + this.oldValue = ""; + } - public Action updateHit(Task task, long address, int length) { String newValue = expr.getValue().toPrint @@ -173,7 +170,7 @@ public class WatchObserverInstaller { watchpointsInUse++; // XXX: getValue may modify inferior. oldValue = expr.getValue().toPrint - (Format.NATURAL, task.getMemory()); + (Format.NATURAL, task.getMemory()); } public void deletedFrom(Object observable) { hooks/post-receive -- frysk system monitor/debugger