diff options
| author | Kyle Galloway <kgallowa@redhat.com> | 2007-05-17 18:36:12 +0000 |
|---|---|---|
| committer | Kyle Galloway <kgallowa@gcc.gnu.org> | 2007-05-17 18:36:12 +0000 |
| commit | 538639f4ab33f1a9f8c347a8f1e2369fdc4989e4 (patch) | |
| tree | fa89c6238ec855905d0d047acc3527b216df5fc3 | |
| parent | dabde9906ec76eb9debcc3162a827178878c5949 (diff) | |
| download | gcc-538639f4ab33f1a9f8c347a8f1e2369fdc4989e4.zip gcc-538639f4ab33f1a9f8c347a8f1e2369fdc4989e4.tar.gz gcc-538639f4ab33f1a9f8c347a8f1e2369fdc4989e4.tar.bz2 | |
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
| -rw-r--r-- | libjava/ChangeLog | 9 | ||||
| -rw-r--r-- | libjava/classpath/lib/gnu/classpath/jdwp/VMFrame.class | bin | 1160 -> 1210 bytes | |||
| -rw-r--r-- | libjava/gnu/classpath/jdwp/VMFrame.h | 2 | ||||
| -rw-r--r-- | libjava/gnu/classpath/jdwp/VMFrame.java | 4 | ||||
| -rw-r--r-- | libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc | 16 |
5 files changed, 26 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 1aae324..b4c913b 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 Binary files differindex cf8f695..ce46cf0 100644 --- a/libjava/classpath/lib/gnu/classpath/jdwp/VMFrame.class +++ b/libjava/classpath/lib/gnu/classpath/jdwp/VMFrame.class diff --git a/libjava/gnu/classpath/jdwp/VMFrame.h b/libjava/gnu/classpath/jdwp/VMFrame.h index 0108e7b..737f39d 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 4b144af..de2640c 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 7fee49b..db33781 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 |