From 8bf41e44e7ffb124a1a7dee61a26bca4d627aae1 Mon Sep 17 00:00:00 2001 From: kgallowa Date: Thu, 8 Feb 2007 18:01:56 +0000 Subject: 2007-02-06 Kyle Galloway * include/java-interp.h (_Jv_InterpFrame): obj_ptr field added to hold "this" pointer for frame. (_Jv_InterpFrame::get_this_ptr): New method. * interpret-run.cc: Copy the "this" pointer into obj_ptr. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121717 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/interpret-run.cc | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'libjava/interpret-run.cc') diff --git a/libjava/interpret-run.cc b/libjava/interpret-run.cc index 12d0b9a5683..8a4d204090f 100644 --- a/libjava/interpret-run.cc +++ b/libjava/interpret-run.cc @@ -349,6 +349,15 @@ details. */ */ memcpy ((void*) locals, (void*) args, meth->args_raw_size); +#ifdef DEBUG + // Get the object pointer for this method, after checking that it is + // non-static. + _Jv_Method *method = meth->get_method (); + + if ((method->accflags & java::lang::reflect::Modifier::STATIC) == 0) + frame_desc.obj_ptr = locals[0].o; +#endif + _Jv_word *pool_data = meth->defining_class->constants.data; /* These three are temporaries for common code used by several -- cgit v1.2.3