From 434942d97839fe237d170b00b008cae182f8560d Mon Sep 17 00:00:00 2001
From: Keith Seitz <keiths@redhat.com>
Date: Fri, 20 Apr 2007 17:08:44 +0000
Subject: [PATCH] BreakpointManager.java (newBreakpoint): Install the new
 breakpoint into the bytecode.

        * gnu/gcj/jvmti/BreakpointManager.java (newBreakpoint):
        Install the new breakpoint into the bytecode.
        (deleteBreakpoint): Remove the breakpoint from the bytecode.
        * classpath/lib/gnu/gcj/jvmti/BreakpointManager.class:
        Regenerate.
        * gnu/gcj/jvmti/natBreakpoint.cc (initialize_native):
        Don't install the breakpoint here.

From-SVN: r123997
---
 libjava/ChangeLog                             |  10 ++++++++++
 .../lib/gnu/gcj/jvmti/BreakpointManager.class | Bin 1275 -> 1362 bytes
 libjava/gnu/gcj/jvmti/BreakpointManager.java  |  10 ++++++++--
 libjava/gnu/gcj/jvmti/natBreakpoint.cc        |   3 +--
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6e916a71b63..b29a44312e2 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,13 @@
+2007-04-20  Keith Seitz  <keiths@redhat.com>
+
+	* gnu/gcj/jvmti/BreakpointManager.java (newBreakpoint):
+	Install the new breakpoint into the bytecode.
+	(deleteBreakpoint): Remove the breakpoint from the bytecode.
+	* classpath/lib/gnu/gcj/jvmti/BreakpointManager.class:
+	Regenerate.
+	* gnu/gcj/jvmti/natBreakpoint.cc (initialize_native):
+	Don't install the breakpoint here.
+
 2007-04-19  Keith Seitz  <keiths@redhat.com>
 
 	* interpret-run.cc [insn_breakpoint]: Save the original
diff --git a/libjava/classpath/lib/gnu/gcj/jvmti/BreakpointManager.class b/libjava/classpath/lib/gnu/gcj/jvmti/BreakpointManager.class
index c0bf97744a7bae1853f82a34011a43f0c451320e..2f35c7fbee47867ac7314abbc6ca628260a44b8c 100644
GIT binary patch
delta 492
zcmYk1PfG$(6vfZe(QulO(iCkHrPMUbwEvb$(xz4IBxvJe2+1@|+PY~S!O&M|ofQ@d
zQ7u}uY~LpdqBEmR&G0VozIV=fzx(a_l;w|~r)K~e6g%>@P*p?~#2^a{RqLm%O06ct
zix~w8B=tve=U!5<j1>X<q1F<J>94}0U)nq=87kHktQ%HmQ#)>)X@+ydIHG)n@={Z)
z9Gx_(b^Xou)jo%lKalD{-4BHy5XwnCM9l3}&JmEhn7)Pk9{zyY#LEHchI$)DS$%M@
z&SMy9?iVn@2@=R+jHgLRtSQWL8D9!>TsCSWbfkIfgHNR?!w?ruVF+FV7XzfMo{`4e
zi!V^g;dqBP;OJs?07I@^xkGgyBxnwir@ugmBD1y-MTyzl|6sBfOxA*ln*<VFeiO@J
r*<{yeInb}9$sL2?Z)lls0=s-`&&&?P&OT^m2d!-PAX^}Bk`{gecPv4;

delta 422
zcmYk1O-lk%6o#MCJCdU&iTRb7ku}+u+ILbd+SwnFAcPi!M3f=YriDMC<@|@%Sy7M>
zt)o@@pdZmLh)&Zm#)WgwJ?FgdbMBk*6*OMHAD@5<)t+&s4aJ!XGmUA#YPZo!m?f4q
z0&VN0b#B?0zT&t>q-k|_+t%UnS?lPuV-RO8%=+(~ziHVYzW4400Xbmy$?oU!59F$<
z&xDgsR`naAcO=t#THRBqr`5HL`WTTILrGjDM2Q4t3bI#BDzi@AWQL-=#8@gt(S*n{
z$GmhCqF)fDPLOViJeoA2A$#a@rv`ZC;ssu=_oVlS9>y>EmZ-K#vg2U$PA%nOQyw<r
uz?8sN7;{+%E-Pbys?pl&Gugq%452_x-1q)DXFTVO=NxsNH8z~xHh%z*SvFAs

diff --git a/libjava/gnu/gcj/jvmti/BreakpointManager.java b/libjava/gnu/gcj/jvmti/BreakpointManager.java
index 205bf6d8a5b..5ef1b08d4df 100644
--- a/libjava/gnu/gcj/jvmti/BreakpointManager.java
+++ b/libjava/gnu/gcj/jvmti/BreakpointManager.java
@@ -1,6 +1,6 @@
 // BreakpointManager.java - A convenience class for dealing with breakpoints
 
-/* Copyright (C) 2006  Free Software Foundation
+/* Copyright (C) 2006, 2007  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -45,6 +45,7 @@ public class BreakpointManager
   {
     Breakpoint bp = new Breakpoint (method, location);
     Location loc = new Location (method, location);
+    bp.install ();
     _instance._breakpoints.put (loc, bp);
     return bp;
   }
@@ -58,7 +59,12 @@ public class BreakpointManager
   public static void deleteBreakpoint (long method, long location)
   {
     Location loc = new Location (method, location);
-    _instance._breakpoints.remove (loc);
+    Breakpoint bp = (Breakpoint) _instance._breakpoints.get (loc);
+    if (bp != null)
+      {
+	bp.remove ();
+	_instance._breakpoints.remove (loc);
+      }
   }
 
   /**
diff --git a/libjava/gnu/gcj/jvmti/natBreakpoint.cc b/libjava/gnu/gcj/jvmti/natBreakpoint.cc
index ab9de417bb8..2a85a939b92 100644
--- a/libjava/gnu/gcj/jvmti/natBreakpoint.cc
+++ b/libjava/gnu/gcj/jvmti/natBreakpoint.cc
@@ -1,6 +1,6 @@
 // natBreakpoint.cc - C++ side of Breakpoint
 
-/* Copyright (C) 2006  Free Software Foundation
+/* Copyright (C) 2006, 2007  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -39,7 +39,6 @@ gnu::gcj::jvmti::Breakpoint::initialize_native ()
   pc_t code = imeth->get_insn (location);
   data = (RawDataManaged *) JvAllocBytes (sizeof (*code));
   memcpy (data, code, sizeof (*code));
-  install ();
 }
 
 void