git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Kyle Galloway 2007-05-17 18:36:12 +00:00 committed by Kyle Galloway
parent dabde9906e
commit 538639f4ab
5 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libjava/ChangeLog
View File

@ -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> 2007-05-16 David Daney <ddaney@avtrex.com>
* include/java-stack.h (_Jv_FrameInfo): Remove union definition. * include/java-stack.h (_Jv_FrameInfo): Remove union definition.

BIN
libjava/classpath/lib/gnu/classpath/jdwp/VMFrame.class
View File

Binary file not shown.

2
libjava/gnu/classpath/jdwp/VMFrame.h
View File

@ -33,7 +33,7 @@ class gnu::classpath::jdwp::VMFrame : public ::java::lang::Object
{ {
public: 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::util::Location * getLocation();
virtual ::gnu::classpath::jdwp::value::Value * getValue(jint, jbyte); virtual ::gnu::classpath::jdwp::value::Value * getValue(jint, jbyte);
virtual void setValue(jint, ::gnu::classpath::jdwp::value::Value *); virtual void setValue(jint, ::gnu::classpath::jdwp::value::Value *);

4
libjava/gnu/classpath/jdwp/VMFrame.java
View File

@ -74,11 +74,13 @@ public class VMFrame
* @param frame_id a long, the jframeID of this frame * @param frame_id a long, the jframeID of this frame
* @param frame_loc a Location, the location 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; thread = thr;
id = frame_id; id = frame_id;
loc = frame_loc; loc = frame_loc;
obj = frame_obj;
} }
/** /**

20
libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
View File

@ -618,12 +618,22 @@ getFrame (Thread *thread, jlong frameID)
VMMethod *meth VMMethod *meth
= getClassMethod (klass, reinterpret_cast<jlong> (info.method)); = getClassMethod (klass, reinterpret_cast<jlong> (info.method));
if (info.location == -1) jobject this_obj;
loc = new Location (meth, 0);
else
loc = new Location (meth, info.location);
return new VMFrame (thread, reinterpret_cast<jlong> (vm_frame), loc); if (info.location == -1)
{
loc = new Location (meth, 0);
this_obj = NULL;
}
else
{
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,
this_obj);
} }
jint jint