This is the mail archive of the frysk@sourceware.org mailing list for the frysk project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [SCM] master: Revert commit 00345416a6028de2e659b7a01d3b1c54adca694f. Resolve Changelog conflict.

pmuldoon@sourceware.org wrote:

This reverts the watchpoints interface code in the ISA class, and it's implementing classes.

Normally I stay away from revert as it removes tracks instead of defining a change of direction. This is a change in direction, and I've moved watchpoints into isa/watchpoints subdirectory. I reverted as I am the only one affected by this (code still under development), and it was juts a simpler fix to the codebase.

Regards

Phil

The branch, master has been updated
       via  9ef6466d481de2a984018cdefc4722d65bbf690a (commit)
      from  91c313424052de804959314bd179a5ade351da23 (commit)

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

- Log -----------------------------------------------------------------
commit 9ef6466d481de2a984018cdefc4722d65bbf690a
Author: Phil Muldoon <pmuldoon@redhat.com>
Date:   Mon Mar 31 11:21:56 2008 +0100

Revert commit 00345416a6028de2e659b7a01d3b1c54adca694f. Resolve Changelog conflict.
Revert "2008-03-26 Phil Muldoon <pmuldoon@redhat.com>"
This reverts commit 00345416a6028de2e659b7a01d3b1c54adca694f.
Conflicts:
frysk-core/frysk/proc/live/ChangeLog

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

Summary of changes:
 frysk-core/frysk/proc/live/ChangeLog       |    9 ------
 frysk-core/frysk/proc/live/Isa.java        |   28 --------------------
 frysk-core/frysk/proc/live/IsaPowerPC.java |   37 --------------------------
 frysk-core/frysk/proc/live/LinuxIA32.java  |   39 +---------------------------
 frysk-core/frysk/proc/live/LinuxX8664.java |   35 -------------------------
 5 files changed, 1 insertions(+), 147 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog
index 5343cbf..0820243 100644
--- a/frysk-core/frysk/proc/live/ChangeLog
+++ b/frysk-core/frysk/proc/live/ChangeLog
@@ -2,15 +2,6 @@
* LinuxPtraceProc.java (getExeFile): New.
-2008-03-26 Phil Muldoon <pmuldoon@redhat.com>
-
- * Isa.java (setWatchpoint): New Interface
- (deleteWatchpoint): Ditto.
- (getWatchpointCount): Ditto.
- * LinuxX8664.java: Add above interfaces.
- * LinuxIA32.java: Ditto.
- * IsaPowerPC.java: Ditto.
-
2008-03-18 Andrew Cagney <cagney@redhat.com>
* LinuxPtraceHost.java (removeProc(LinuxPtraceProc)): Replace
diff --git a/frysk-core/frysk/proc/live/Isa.java b/frysk-core/frysk/proc/live/Isa.java
index 3ea7fba..41bb1c0 100644
--- a/frysk-core/frysk/proc/live/Isa.java
+++ b/frysk-core/frysk/proc/live/Isa.java
@@ -51,34 +51,6 @@ import inua.eio.ByteBuffer;
public interface Isa {
-
- /**
- * Builds a watchpoint. Takes a task, an address, a - * range and a register index.
- *
- * @return boolean whether the watchpoint
- * was set succesfully.
- */
- boolean setWatchpoint(Task task, long addr, - long range, int index);
-
- /**
- * Deletes a watchpoint. Takes a task, and a - * register index.
- *
- * @return boolean whether the watchpoint
- * was deleted succesfully.
- */
- boolean deleteWatchpoint(Task task, int index);
-
-
- /**
- * Returns number of watchpoints for this architecture
- *
- * @return int number of usable watchpoints.
- */
- int getWatchpointCount();
-
/**
* Get the breakpoint instruction.
* diff --git a/frysk-core/frysk/proc/live/IsaPowerPC.java b/frysk-core/frysk/proc/live/IsaPowerPC.java
index 39120cf..a69ca46 100644
--- a/frysk-core/frysk/proc/live/IsaPowerPC.java
+++ b/frysk-core/frysk/proc/live/IsaPowerPC.java
@@ -58,43 +58,6 @@ abstract class IsaPowerPC implements Isa {
new Instruction(new byte[] { (byte)0x7d, (byte)0x82, (byte)0x10, (byte)0x08 }, false);
-
- // Architecture Watchpoint Count
- private final int NoOfWatchpoints = 1;
-
- /**
- * Builds a watchpoint. Takes a task, an address a - * range and a register index.
- *
- * @return boolean whether the watchpoint
- * was set succesfully.
- */
- public final boolean setWatchpoint(Task task, long addr, - long range, int index) {
- throw new RuntimeException("Watchpoints not supported on this arch");
- }
-
- /**
- * Deletes a watchpoint. Takes a task and a - * range.
- *
- * @return boolean whether the watchpoint
- * was deleted succesfully.
- */
- public final boolean deleteWatchpoint(Task task, int index) {
- throw new RuntimeException("Watchpoints not supported on this arch");
- }
-
- /**
- * Returns number of watchpoints for this architecture
- *
- * @return int number of usable watchpoints.
- */
- public final int getWatchpointCount() {
- return NoOfWatchpoints;
- }
-
-
/**
* Get the breakpoint instruction of the PowerPC platform.
*/
diff --git a/frysk-core/frysk/proc/live/LinuxIA32.java b/frysk-core/frysk/proc/live/LinuxIA32.java
index 184a5d9..fe11aa5 100644
--- a/frysk-core/frysk/proc/live/LinuxIA32.java
+++ b/frysk-core/frysk/proc/live/LinuxIA32.java
@@ -51,41 +51,7 @@ class LinuxIA32 implements Isa {
private static final Instruction IA32Breakpoint
= new Instruction(new byte[] { (byte)0xcc }, false);
-
- // Architecture Watchpoint Count
- private final int NoOfWatchpoints = 7;
-
- /**
- * Builds a watchpoint. Takes a task, an address, a - * range and a register index.
- *
- * @return boolean whether the watchpoint
- * was set succesfully.
- */
- public final boolean setWatchpoint(Task task, long addr, - long range, int index) {
- throw new RuntimeException("Watchpoints not supported on this arch");
- }
-
- /**
- * Deletes a watchpoint. Takes a task, and a range.
- *
- * @return boolean whether the watchpoint
- * was deleted succesfully.
- */
- public final boolean deleteWatchpoint(Task task, int index) {
- throw new RuntimeException("Watchpoints not supported on this arch");
- }
-
- /**
- * Returns number of watchpoints for this architecture
- *
- * @return int number of usable watchpoints.
- */
- public final int getWatchpointCount() {
- return NoOfWatchpoints;
- }
-
+ /**
* Get the breakpoint instruction for IA32.
*/
@@ -188,13 +154,10 @@ class LinuxIA32 implements Isa {
return result;
}
-
private static LinuxIA32 isa;
static LinuxIA32 isaSingleton () {
if (isa == null)
isa = new LinuxIA32 ();
return isa;
}
-
-
}
diff --git a/frysk-core/frysk/proc/live/LinuxX8664.java b/frysk-core/frysk/proc/live/LinuxX8664.java
index 3dd3dfc..8ee4876 100644
--- a/frysk-core/frysk/proc/live/LinuxX8664.java
+++ b/frysk-core/frysk/proc/live/LinuxX8664.java
@@ -50,41 +50,6 @@ import frysk.proc.Auxv;
class LinuxX8664 implements Isa {
private static final Instruction X8664Breakpoint
= new Instruction(new byte[] { (byte)0xcc }, false);
-
-
- // Architecture Watchpoint Count
- private final int NoOfWatchpoints = 7;
-
- /**
- * Builds a watchpoint. Takes a task, an address, a - * range and a register index.
- *
- * @return boolean whether the watchpoint
- * was set succesfully.
- */
- public final boolean setWatchpoint(Task task, long addr, - long range, int index) {
- throw new RuntimeException("Watchpoints not supported on this arch");
- }
-
- /**
- * Deletes a watchpoint. Takes a task, and a range.
- *
- * @return boolean whether the watchpoint
- * was deleted succesfully.
- */
- public final boolean deleteWatchpoint(Task task, int index) {
- throw new RuntimeException("Watchpoints not supported on this arch");
- }
-
- /**
- * Returns number of watchpoints for this architecture
- *
- * @return int number of usable watchpoints.
- */
- public final int getWatchpointCount() {
- return NoOfWatchpoints;
- }
/**
* Get the breakpoint instruction for X8664.


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

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]