From 538639f4ab33f1a9f8c347a8f1e2369fdc4989e4 Mon Sep 17 00:00:00 2001
From: Kyle Galloway <kgallowa@redhat.com>
Date: Thu, 17 May 2007 18:36:12 +0000
Subject: [PATCH] VMFrame.java (<init>): Add parameter for "this" pointer.

2007-05-17  Kyle Galloway <kgallowa@redhat.com>

	* gnu/classpath/jdwp/VMFrame.java (<init>): Add parameter for "this"
	pointer.
	* gnu/classpath/jdwp/VMFrame.h: Regenerated.
	* classpath/lib/gnu/classpath/jdwp/VMFrame.class: Rebuilt.
	* gnu/classpath/jdwp/natVMVirtualMachine.cc (getFrame): Use new
	VMFrame constructor.

From-SVN: r124806
---
 libjava/ChangeLog                             |   9 +++++++++
 .../lib/gnu/classpath/jdwp/VMFrame.class      | Bin 1160 -> 1210 bytes
 libjava/gnu/classpath/jdwp/VMFrame.h          |   2 +-
 libjava/gnu/classpath/jdwp/VMFrame.java       |   4 +++-
 .../gnu/classpath/jdwp/natVMVirtualMachine.cc |  16 +++++++++++++---
 5 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1aae32413bfa..b4c913b4f521 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-17  Kyle Galloway <kgallowa@redhat.com>
+
+	* gnu/classpath/jdwp/VMFrame.java (<init>): Add parameter for "this"
+	pointer.
+	* gnu/classpath/jdwp/VMFrame.h: Regenerated.
+	* classpath/lib/gnu/classpath/jdwp/VMFrame.class: Rebuilt.
+	* gnu/classpath/jdwp/natVMVirtualMachine.cc (getFrame): Use new
+	VMFrame constructor.
+
 2007-05-16  David Daney  <ddaney@avtrex.com>
 
 	* include/java-stack.h (_Jv_FrameInfo): Remove union definition.
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/VMFrame.class b/libjava/classpath/lib/gnu/classpath/jdwp/VMFrame.class
index cf8f695204e4f85c4c2ba339fdff0dc28614b1b0..ce46cf0b91b303b5dfd416634f49525e98f0ba8a 100644
GIT binary patch
delta 440
zc-n1`y-EW?6ot?1PhiF+C<bI#qA~tY)HNoGPhcU6znz6_BnnG3M8(1;ij8fU%7+jl
zxCkkH06}{z-$cASflXnWdk^Q{@7$S3-r?foxAP95h}D+(Vw<h+wV|yrxC#7PaB=4E
zRKn`XwMw&f!ND-*U;vKVU^T%{FN5>yalI0%Hv3Ue##QqkCQ_6&D&LTig$N@u7r~XT
z6_MxK5wb5dHZV@r)2rLCunUeoq_K|-4#+=5jwWT;aTF$y2eg`mpeMv?3WJmqt7+ma
zt!BU-LKtQ-r|wLz6dy@x;7A8LTHD<~#xM`5djSjNGc00BeVSgg$2I<Qq<t(?9VYEl
j*E9KwY&-c`7ryNa7qODSMgqIfJvgu3hrV=4ua*A*2Anc!

delta 412
zc-q^=*}=(m>ff$?3=9m03?>t~&M{g{ylFOBk<ol|5@XKfTa0(PI2jlj^m!P#8F(gd
zXDY7GWngAt1u7TS+Rh-NrM;CwTuWgqgQS)u%T@;IjX((|23a5}23F+Dz{23qz{wE6
zz{e2CAi@yDAO{rH0*V3+V321}U|;~V6dAaHwt!el3<5wCKrCgT9u}ae3WF+;6b6dv
z18FCaGFGiE4AL9mcCmr=MuN@e0kc^lW-~G}s4=L6X$=NVpg1GYZtcncnWgFx`tmXL
r0oghXx=6OdEY(A|v;wPU17KjnG&8|9ORhy|RsxGQV%2Q~R%Q$UpU@{_

diff --git a/libjava/gnu/classpath/jdwp/VMFrame.h b/libjava/gnu/classpath/jdwp/VMFrame.h
index 0108e7b96d57..737f39de28bd 100644
--- a/libjava/gnu/classpath/jdwp/VMFrame.h
+++ b/libjava/gnu/classpath/jdwp/VMFrame.h
@@ -33,7 +33,7 @@ class gnu::classpath::jdwp::VMFrame : public ::java::lang::Object
 {
 
 public:
-  VMFrame(::java::lang::Thread *, jlong, ::gnu::classpath::jdwp::util::Location *);
+  VMFrame(::java::lang::Thread *, jlong, ::gnu::classpath::jdwp::util::Location *, ::java::lang::Object *);
   virtual ::gnu::classpath::jdwp::util::Location * getLocation();
   virtual ::gnu::classpath::jdwp::value::Value * getValue(jint, jbyte);
   virtual void setValue(jint, ::gnu::classpath::jdwp::value::Value *);
diff --git a/libjava/gnu/classpath/jdwp/VMFrame.java b/libjava/gnu/classpath/jdwp/VMFrame.java
index 4b144af75c31..de2640c85fff 100644
--- a/libjava/gnu/classpath/jdwp/VMFrame.java
+++ b/libjava/gnu/classpath/jdwp/VMFrame.java
@@ -74,11 +74,13 @@ public class VMFrame
    * @param frame_id a long, the jframeID of this frame
    * @param frame_loc a Location, the location of this frame
    */
-  public VMFrame(Thread thr, long frame_id, Location frame_loc)
+  public VMFrame(Thread thr, long frame_id, Location frame_loc,
+                 Object frame_obj)
   {
     thread = thr;
     id = frame_id;
     loc = frame_loc;
+    obj = frame_obj;
   }
   
   /**
diff --git a/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc b/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
index 7fee49bee4c9..db33781378e5 100644
--- a/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
+++ b/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
@@ -618,12 +618,22 @@ getFrame (Thread *thread, jlong frameID)
   VMMethod *meth 
     = getClassMethod (klass, reinterpret_cast<jlong> (info.method));
   
+  jobject this_obj;
+  
   if (info.location == -1)
-    loc = new Location (meth, 0);
+    {
+      loc = new Location (meth, 0);
+      this_obj = NULL;
+    }
   else
-    loc = new Location (meth, info.location);
+    {
+      loc = new Location (meth, info.location);
+      _Jv_InterpFrame *iframe = reinterpret_cast<_Jv_InterpFrame *> (vm_frame);
+      this_obj = iframe->get_this_ptr ();
+    }
   
-  return new VMFrame (thread, reinterpret_cast<jlong> (vm_frame), loc); 
+  return new VMFrame (thread, reinterpret_cast<jlong> (vm_frame), loc,
+                      this_obj); 
 }
 
 jint
-- 
2.47.2