Attachment 302171 Details for Bug 440508 – 6029-backport.patch

[patch] 6029-backport.patch

6029-backport.patch (text/plain), 4.05 KB, created by Mark Wielaard on 2008-04-11 21:12:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Wielaard

Created: 2008-04-11 21:12:54 UTC

Size: 4.05 KB

patch

obsolete

>diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTask.java b/frysk-core/frysk/proc/live/LinuxPtraceTask.java
>index f1a559b..afe5a27 100644
>--- a/frysk-core/frysk/proc/live/LinuxPtraceTask.java
>+++ b/frysk-core/frysk/proc/live/LinuxPtraceTask.java
>@@ -939,9 +939,33 @@ public class LinuxPtraceTask extends LiveTask {
>      */
>     int notifyCodeBreakpoint(long address) {
> 	fine.log(this, "notifyCodeBreakpoint address", address);
>-	Collection observers = ((LinuxPtraceProc)getProc()).breakpoints.getCodeObservers(address);
>+	LinuxPtraceProc proc = (LinuxPtraceProc) getProc();
>+	Collection observers = proc.breakpoints.getCodeObservers(address);
> 	if (observers == null)
> 	    return -1;
>+
>+	// Sanity check
>+	if (steppingBreakpoint != null)
>+	  throw new RuntimeException("Already breakpoint stepping: "
>+				     + steppingBreakpoint);
>+
>+	// Reset pc, some architectures might leave the pc right after
>+	// the breakpoint, but since we haven't actually executed the
>+	// real instruction yet we want it to be at the actual address
>+	// of the original instruction.
>+	setPC(address);
>+
>+	// All logic for determining how and where to step the              
>+	// Breakpoint is determined by Proc and                             
>+	// Breakpoint.prepareStep() (called in sendContinue).               
>+	Breakpoint bp = Breakpoint.create(address,proc);
>+
>+	// TODO: This should really move us to a new TaskState.             
>+	// Currently we rely on the Task.steppingBreakpoint                 
>+	// being set and the Breakpoint/Instruction having all              
>+	// the state necessary.                                             
>+	steppingBreakpoint = bp;
>+
> 	Iterator i = observers.iterator();
> 	while (i.hasNext()) {
> 	    TaskObserver.Code observer = (TaskObserver.Code) i.next();
>diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
>index 07c9bd5..83ee8dc 100644
>--- a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
>+++ b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
>@@ -723,26 +723,6 @@ abstract class LinuxPtraceTaskState extends State {
> 	    this.insyscall = insyscall;
> 	}
> 	
>-	void setupSteppingBreakpoint(LinuxPtraceTask task, long address) {
>-	    // Reset pc, this should maybe be moved into the Breakpoint,
>-	    // but if the breakpoint gets removed before we step it, and
>-	    // the architecture puts the pc just behind the breakpoint
>-	    // address, then there is no good other place to get at the
>-	    // original pc location.
>-	    task.setPC(address);
>-
>-	    // All logic for determining how and where to step the
>-	    // Breakpoint is determined by Proc and
>-	    // Breakpoint.prepareStep() (called in sendContinue).
>-	    Breakpoint bp = Breakpoint.create(address,((LinuxPtraceProc)task.getProc()));
>-	
>-	    // TODO: This should really move us to a new TaskState.
>-	    // Currently we rely on the Task.steppingBreakpoint
>-	    // being set and the Breakpoint/Instruction having all
>-	    // the state necessary.
>-	    task.steppingBreakpoint = bp;
>-	}
>-      
>         /**
> 	 * Tells the LinuxPtraceTask to continue, keeping in kind pending
> 	 * breakpoints, with or without syscall tracing.
>@@ -966,9 +946,6 @@ abstract class LinuxPtraceTaskState extends State {
> 		long address = isa.getBreakpointAddress(task);
> 		int blockers = task.notifyCodeBreakpoint(address);
> 		if (blockers >= 0) {
>-		    // Prepare for stepping the breakpoint
>-		    setupSteppingBreakpoint(task, address);
>-		  
> 		    if (blockers == 0)
> 			return sendContinue(task, Signal.NONE);
> 		    else
>@@ -1095,13 +1072,6 @@ abstract class LinuxPtraceTaskState extends State {
> 		long address = isa.getBreakpointAddress(task);
> 		int blockers = task.notifyCodeBreakpoint(address);
> 		if (blockers >= 0) {
>-		    // Sanity check
>-		    if (task.steppingBreakpoint != null)
>-			throw new RuntimeException("Already breakpoint stepping: "
>-						   + task.steppingBreakpoint);
>-	      
>-		    // Prepare for stepping the breakpoint
>-		    setupSteppingBreakpoint(task, address);
> 	      
> 		    if (blockers == 0)
> 			return sendContinue(task, Signal.NONE);

Actions: View | Diff

Attachments on bug 440508: 302171