From 0aa75869cbeb02e436061c336ce358d6a9a84c2a Mon Sep 17 00:00:00 2001 From: kgallowa Date: Thu, 17 May 2007 18:36:12 +0000 Subject: 2007-05-17 Kyle Galloway * gnu/classpath/jdwp/VMFrame.java (): 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@124806 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc') diff --git a/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc b/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc index 7fee49bee4c..db33781378e 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 (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 (vm_frame), loc); + return new VMFrame (thread, reinterpret_cast (vm_frame), loc, + this_obj); } jint -- cgit v1.2.3