From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29579 invoked by alias); 2 Apr 2008 16:21:55 -0000 Received: (qmail 29561 invoked by uid 22791); 2 Apr 2008 16:21:52 -0000 X-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org (qpsmtpd/0.31) with ESMTP; Wed, 02 Apr 2008 16:21:35 +0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id m32GLXi3012325 for ; Wed, 2 Apr 2008 12:21:33 -0400 Received: from pobox-2.corp.redhat.com (pobox-2.corp.redhat.com [10.11.255.15]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m32GLWL5011766 for ; Wed, 2 Apr 2008 12:21:33 -0400 Received: from localhost.localdomain (vpn-14-26.rdu.redhat.com [10.11.14.26]) by pobox-2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m32GLVE9026923 for ; Wed, 2 Apr 2008 12:21:31 -0400 Message-ID: <47F3B28A.7080102@redhat.com> Date: Wed, 02 Apr 2008 16:21:00 -0000 From: Phil Muldoon User-Agent: Thunderbird 2.0.0.12 (X11/20080226) MIME-Version: 1.0 To: frysk@sourceware.org Subject: Re: [SCM] master: Refactor Watchpoint -> WatchpointFunctions, {Arch}Watchpoint -> {Arch}WatchpointFunctions References: <20080402161812.25624.qmail@sourceware.org> In-Reply-To: <20080402161812.25624.qmail@sourceware.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 X-IsSubscribed: yes Mailing-List: contact frysk-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-owner@sourceware.org X-SW-Source: 2008-q2/txt/msg00011.txt.bz2 pmuldoon@sourceware.org wrote: I've renamed these as the previous name Watchpoint.java did not specify the nature of the class. Also the name Watchpoint was needed to convey a model of a watchpoint, not the functions that set the watchpoint. The new Watchpoint.java class to convey information on the watchpoint if forthcoming. > The branch, master has been updated > via 67ca0747166b7e823d4f9f2f1b8f581c01be2735 (commit) > from faa0a714fa42575226a1d6cd805d8541929beca1 (commit) > > Those revisions listed above that are new to this repository have > not appeared on any other notification email. > > - Log ----------------------------------------------------------------- > commit 67ca0747166b7e823d4f9f2f1b8f581c01be2735 > Author: Phil Muldoon > Date: Wed Apr 2 17:17:20 2008 +0100 > > Refactor Watchpoint -> WatchpointFunctions, {Arch}Watchpoint -> {Arch}WatchpointFunctions > > 2008-04-02 Phil Muldoon > > * Watchpoint.java: Refactor to WatchpointFunctions.java > * IA32Watchpoint.java: Refactor to IA32WatchpointFunctions.java > * X8664Watchpoint.java: Refactor to X8664WatchpointFunctions.java > * WatchpointFactory.java: Refactor to WatchpointFunctionFactory.javs > * TestWatchpoints.java: Update. > > ----------------------------------------------------------------------- > > Summary of changes: > frysk-core/frysk/isa/watchpoints/ChangeLog | 8 ++++++++ > ...atchpoint.java => IA32WatchpointFunctions.java} | 4 ++-- > .../frysk/isa/watchpoints/TestWatchpoint.java | 7 ++++--- > ...Factory.java => WatchpointFunctionFactory.java} | 10 +++++----- > .../{Watchpoint.java => WatchpointFunctions.java} | 2 +- > ...tchpoint.java => X8664WatchpointFunctions.java} | 4 ++-- > 6 files changed, 22 insertions(+), 13 deletions(-) > rename frysk-core/frysk/isa/watchpoints/{IA32Watchpoint.java => IA32WatchpointFunctions.java} (99%) > rename frysk-core/frysk/isa/watchpoints/{WatchpointFactory.java => WatchpointFunctionFactory.java} (90%) > rename frysk-core/frysk/isa/watchpoints/{Watchpoint.java => WatchpointFunctions.java} (99%) > rename frysk-core/frysk/isa/watchpoints/{X8664Watchpoint.java => X8664WatchpointFunctions.java} (99%) > > First 500 lines of diff: > diff --git a/frysk-core/frysk/isa/watchpoints/ChangeLog b/frysk-core/frysk/isa/watchpoints/ChangeLog > index f53652b..e3f419a 100644 > --- a/frysk-core/frysk/isa/watchpoints/ChangeLog > +++ b/frysk-core/frysk/isa/watchpoints/ChangeLog > @@ -1,3 +1,11 @@ > +2008-04-02 Phil Muldoon > + > + * Watchpoint.java: Refactor to WatchpointFunctions.java > + * IA32Watchpoint.java: Refactor to IA32WatchpointFunctions.java > + * X8664Watchpoint.java: Refactor to X8664WatchpointFunctions.java > + * WatchpointFactory.java: Refactor to WatchpointFunctionFactory.javs > + * TestWatchpoints.java: Update. > + > 2008-04-01 Phil Muldoon > > * Watchpoint.java (hasWatchpointTriggered): Define. > diff --git a/frysk-core/frysk/isa/watchpoints/IA32Watchpoint.java b/frysk-core/frysk/isa/watchpoints/IA32WatchpointFunctions.java > similarity index 99% > rename from frysk-core/frysk/isa/watchpoints/IA32Watchpoint.java > rename to frysk-core/frysk/isa/watchpoints/IA32WatchpointFunctions.java > index 5f97636..15117c5 100644 > --- a/frysk-core/frysk/isa/watchpoints/IA32Watchpoint.java > +++ b/frysk-core/frysk/isa/watchpoints/IA32WatchpointFunctions.java > @@ -42,11 +42,11 @@ package frysk.isa.watchpoints; > import frysk.isa.registers.IA32Registers; > import frysk.proc.Task; > > -class IA32Watchpoint extends Watchpoint { > +class IA32WatchpointFunctions extends WatchpointFunctions { > > // Architecture Watchpoint Count. Number of usable > // Address-Breakpoint Registers (DR0-DR3) > - public IA32Watchpoint () { > + public IA32WatchpointFunctions () { > noOfWatchpoints = 4; > } > > diff --git a/frysk-core/frysk/isa/watchpoints/TestWatchpoint.java b/frysk-core/frysk/isa/watchpoints/TestWatchpoint.java > index e218689..49e5ceb 100644 > --- a/frysk-core/frysk/isa/watchpoints/TestWatchpoint.java > +++ b/frysk-core/frysk/isa/watchpoints/TestWatchpoint.java > @@ -58,7 +58,7 @@ public class TestWatchpoint extends TestLib { > Task task = proc.getMainTask(); > long address = 0x1000; > long debugControlRegister; > - Watchpoint wp = WatchpointFactory.getWatchpoint(task.getISA()); > + WatchpointFunctions wp = WatchpointFunctionFactory.getWatchpoint(task.getISA()); > long savedDebugControlRegister = wp.readControlRegister(task); > for (int i=0; i<4; i++) { > > @@ -111,7 +111,7 @@ public class TestWatchpoint extends TestLib { > Task task = proc.getMainTask(); > long address = 0x1000; > long debugControlRegister; > - Watchpoint wp = WatchpointFactory.getWatchpoint(task.getISA()); > + WatchpointFunctions wp = WatchpointFunctionFactory.getWatchpoint(task.getISA()); > long savedDebugControlRegister = wp.readControlRegister(task); > for (int i=0; i<4; i++) { > > @@ -166,7 +166,8 @@ public class TestWatchpoint extends TestLib { > Task task = proc.getMainTask(); > long address = 0x0; > long debugControlRegister; > - Watchpoint wp = WatchpointFactory.getWatchpoint(task.getISA()); > + WatchpointFunctions wp = WatchpointFunctionFactory.getWatchpoint(task.getISA()); > + > long savedDebugControlRegister = wp.readControlRegister(task); > > for (int i=0; i<4; i++) { > diff --git a/frysk-core/frysk/isa/watchpoints/WatchpointFactory.java b/frysk-core/frysk/isa/watchpoints/WatchpointFunctionFactory.java > similarity index 90% > rename from frysk-core/frysk/isa/watchpoints/WatchpointFactory.java > rename to frysk-core/frysk/isa/watchpoints/WatchpointFunctionFactory.java > index 9c738da..bf8211f 100644 > --- a/frysk-core/frysk/isa/watchpoints/WatchpointFactory.java > +++ b/frysk-core/frysk/isa/watchpoints/WatchpointFunctionFactory.java > @@ -46,13 +46,13 @@ import frysk.isa.ISAMap; > * Watchpoint call database. > */ > > -public class WatchpointFactory { > +public class WatchpointFunctionFactory { > private static final ISAMap watchpointTables = new ISAMap("watchpoint table") > - .put(ISA.IA32, new IA32Watchpoint()) > - .put(ISA.X8664, new X8664Watchpoint()) > + .put(ISA.IA32, new IA32WatchpointFunctions()) > + .put(ISA.X8664, new X8664WatchpointFunctions()) > ; > > - public static Watchpoint getWatchpoint(ISA isa) { > - return (Watchpoint) watchpointTables.get(isa); > + public static WatchpointFunctions getWatchpoint(ISA isa) { > + return (WatchpointFunctions) watchpointTables.get(isa); > } > } > diff --git a/frysk-core/frysk/isa/watchpoints/Watchpoint.java b/frysk-core/frysk/isa/watchpoints/WatchpointFunctions.java > similarity index 99% > rename from frysk-core/frysk/isa/watchpoints/Watchpoint.java > rename to frysk-core/frysk/isa/watchpoints/WatchpointFunctions.java > index a0ef202..30e23fc 100644 > --- a/frysk-core/frysk/isa/watchpoints/Watchpoint.java > +++ b/frysk-core/frysk/isa/watchpoints/WatchpointFunctions.java > @@ -42,7 +42,7 @@ package frysk.isa.watchpoints; > > import frysk.proc.Task; > > -public abstract class Watchpoint { > +public abstract class WatchpointFunctions { > > // Architecture Watchpoint Count. Number of usable > // Address-Breakpoint Registers > diff --git a/frysk-core/frysk/isa/watchpoints/X8664Watchpoint.java b/frysk-core/frysk/isa/watchpoints/X8664WatchpointFunctions.java > similarity index 99% > rename from frysk-core/frysk/isa/watchpoints/X8664Watchpoint.java > rename to frysk-core/frysk/isa/watchpoints/X8664WatchpointFunctions.java > index 1df98a5..ee992ab 100644 > --- a/frysk-core/frysk/isa/watchpoints/X8664Watchpoint.java > +++ b/frysk-core/frysk/isa/watchpoints/X8664WatchpointFunctions.java > @@ -42,11 +42,11 @@ package frysk.isa.watchpoints; > import frysk.isa.registers.X8664Registers; > import frysk.proc.Task; > > -class X8664Watchpoint extends Watchpoint { > +class X8664WatchpointFunctions extends WatchpointFunctions { > > // Architecture Watchpoint Count. Number of usable > // Address-Breakpoint Registers (DR0-DR3) > - public X8664Watchpoint () { > + public X8664WatchpointFunctions () { > noOfWatchpoints = 4; > } > > > > hooks/post-receive > -- > frysk system monitor/debugger >