From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25751 invoked by alias); 2 Apr 2008 16:18:22 -0000 Received: (qmail 25640 invoked by uid 9514); 2 Apr 2008 16:18:12 -0000 Date: Wed, 02 Apr 2008 16:18:00 -0000 Message-ID: <20080402161812.25624.qmail@sourceware.org> From: pmuldoon@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Refactor Watchpoint -> WatchpointFunctions, {Arch}Watchpoint -> {Arch}WatchpointFunctions X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: faa0a714fa42575226a1d6cd805d8541929beca1 X-Git-Newrev: 67ca0747166b7e823d4f9f2f1b8f581c01be2735 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/msg00020.txt.bz2 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