public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
From: pmuldoon@sourceware.org
To: frysk-cvs@sourceware.org
Subject: [SCM]  master: On unsupported arch, do not check watchpoints in handleTrapped.
Date: Wed, 14 May 2008 14:45:00 -0000	[thread overview]
Message-ID: <20080514144507.22261.qmail@sourceware.org> (raw)

The branch, master has been updated
       via  9da8189a51b382e4d3e46fbf770808d8592e357e (commit)
      from  dd462ac1a619d28bd4410625b5c30f01d1ef4546 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 9da8189a51b382e4d3e46fbf770808d8592e357e
Author: Phil Muldoon <pmuldoon@redhat.com>
Date:   Wed May 14 15:43:48 2008 +0100

    On unsupported arch, do not check watchpoints in handleTrapped.
    
    2008-05-14  Phil Muldoon  <pmuldoon@redhat.com>
    
    	* WatchpointFunctionFactory.java (getWatchpointFunctions): Return null
    	on unknown arch, do not pass along exception.
    
    2008-05-14  Phil Muldoon  <pmuldoon@redhat.com>
    
    	* LinuxPtraceTaskState.java (Running.checkWatchpoint): Check watchpoint
    	factory does not return null.

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/frysk/isa/watchpoints/ChangeLog         |    5 +++++
 .../isa/watchpoints/WatchpointFunctionFactory.java |    9 ++++++++-
 frysk-core/frysk/proc/live/ChangeLog               |    5 +++++
 .../frysk/proc/live/LinuxPtraceTaskState.java      |    4 ++++
 4 files changed, 22 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 8c86788..d530ec2 100644
--- a/frysk-core/frysk/isa/watchpoints/ChangeLog
+++ b/frysk-core/frysk/isa/watchpoints/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-14  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* WatchpointFunctionFactory.java (getWatchpointFunctions): Return null
+	on unknown arch, do not pass along exception.
+
 2008-05-13  Phil Muldoon  <pmuldoon@redhat.com>
 
 	* IA32WatchpointFunctions.java (setWatchpoint): Add alignment check.
diff --git a/frysk-core/frysk/isa/watchpoints/WatchpointFunctionFactory.java b/frysk-core/frysk/isa/watchpoints/WatchpointFunctionFactory.java
index da434ce..fe8b81b 100644
--- a/frysk-core/frysk/isa/watchpoints/WatchpointFunctionFactory.java
+++ b/frysk-core/frysk/isa/watchpoints/WatchpointFunctionFactory.java
@@ -53,6 +53,13 @@ public class WatchpointFunctionFactory {
 	;
 
     public static WatchpointFunctions getWatchpointFunctions(ISA isa) {
-	return (WatchpointFunctions) watchpointTables.get(isa);
+	WatchpointFunctions function;
+	try {
+	    function =  (WatchpointFunctions) watchpointTables.get(isa);
+	} catch  (RuntimeException e) {
+	    return null;
+	}
+	
+	return function;
     }
 }
diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog
index fe2cff5..5c4a96f 100644
--- a/frysk-core/frysk/proc/live/ChangeLog
+++ b/frysk-core/frysk/proc/live/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-14  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* LinuxPtraceTaskState.java (Running.checkWatchpoint): Check watchpoint
+	factory does not return null.
+
 2008-05-12  Phil Muldoon  <pmuldoon@redhat.com>
 
 	* LinuxPtraceProc.java (requestAddWatchObserver): Call addFailed
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
index 0556c3c..d8c61a3 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
@@ -932,6 +932,10 @@ abstract class LinuxPtraceTaskState extends State {
 	    // First test if this is a watchpoint event.
 	    WatchpointFunctions watchpointFunction = WatchpointFunctionFactory.
 	    	getWatchpointFunctions(task.getISA());
+
+	    if (watchpointFunction == null) {
+		return blockers;
+	    }
 	    for (int i=0; i<watchpointFunction.getWatchpointCount();  i++) {
 		// Test if a watchpoint has fired
 		if (watchpointFunction.hasWatchpointTriggered(task, i)) {


hooks/post-receive
--
frysk system monitor/debugger


                 reply	other threads:[~2008-05-14 14:45 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080514144507.22261.qmail@sourceware.org \
    --to=pmuldoon@sourceware.org \
    --cc=frysk-cvs@sourceware.org \
    --cc=frysk@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).