From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18411 invoked by alias); 7 May 2008 15:23:52 -0000 Received: (qmail 18347 invoked by uid 9708); 7 May 2008 15:23:52 -0000 Date: Wed, 07 May 2008 15:23:00 -0000 Message-ID: <20080507152352.18332.qmail@sourceware.org> From: tthomas@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Merge branch 'master' of ssh://sourceware.org/git/frysk X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 12cea45ad5e923dce81131eab960b85d65eeb690 X-Git-Newrev: a058347d11f607149992b34bba5be94ad4cc3355 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/msg00193.txt.bz2 The branch, master has been updated via a058347d11f607149992b34bba5be94ad4cc3355 (commit) via 8cc70a3388b24b69a0b8459b2750ff70265ad0b4 (commit) from 12cea45ad5e923dce81131eab960b85d65eeb690 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit a058347d11f607149992b34bba5be94ad4cc3355 Merge: 8cc70a3388b24b69a0b8459b2750ff70265ad0b4 12cea45ad5e923dce81131eab960b85d65eeb690 Author: Teresa Thomas Date: Wed May 7 11:25:02 2008 -0400 Merge branch 'master' of ssh://sourceware.org/git/frysk commit 8cc70a3388b24b69a0b8459b2750ff70265ad0b4 Author: Teresa Thomas Date: Wed May 7 11:24:37 2008 -0400 Fix exception message when watch set on unsupported sizes. frysk-core/frysk/isa/watchpoints/ChangeLog: 2008-05-07 Teresa Thomas * IA32WatchpointFunctions.java (setWatchpoint): Fix exception message. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/isa/watchpoints/ChangeLog | 5 +++++ .../isa/watchpoints/IA32WatchpointFunctions.java | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/isa/watchpoints/ChangeLog b/frysk-core/frysk/isa/watchpoints/ChangeLog index be0d350..961ea10 100644 --- a/frysk-core/frysk/isa/watchpoints/ChangeLog +++ b/frysk-core/frysk/isa/watchpoints/ChangeLog @@ -1,3 +1,8 @@ +2008-05-07 Teresa Thomas + + * IA32WatchpointFunctions.java (setWatchpoint): Fix + exception message. + 2008-04-09 Phil Muldoon * TestWatchpoint.java (testWatchpointTrigger): Move diff --git a/frysk-core/frysk/isa/watchpoints/IA32WatchpointFunctions.java b/frysk-core/frysk/isa/watchpoints/IA32WatchpointFunctions.java index 42d2fce..ce962aa 100644 --- a/frysk-core/frysk/isa/watchpoints/IA32WatchpointFunctions.java +++ b/frysk-core/frysk/isa/watchpoints/IA32WatchpointFunctions.java @@ -132,7 +132,7 @@ class IA32WatchpointFunctions extends WatchpointFunctions { } else throw new RuntimeException("Invalid size for watchpoint " + - "range. Has to be 1, 2, 4 or 8"); + "range. Has to be 1, 2 or 4"); } hooks/post-receive -- frysk system monitor/debugger