diff options
| author | kgallowa <kgallowa@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-02-08 18:01:56 +0000 |
|---|---|---|
| committer | kgallowa <kgallowa@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-02-08 18:01:56 +0000 |
| commit | 8bf41e44e7ffb124a1a7dee61a26bca4d627aae1 (patch) | |
| tree | 62949050654147577945d70db07dfdbfacbe1feb | |
| parent | 199c981a9524ea890ecd043243571f67ad856501 (diff) | |
| download | ppe42-gcc-8bf41e44e7ffb124a1a7dee61a26bca4d627aae1.tar.gz ppe42-gcc-8bf41e44e7ffb124a1a7dee61a26bca4d627aae1.zip | |
2007-02-06 Kyle Galloway <kgallowa@redhat.com>
* 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
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/include/java-interp.h | 9 | ||||
| -rw-r--r-- | libjava/interpret-run.cc | 9 |
3 files changed, 25 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d99393be56d..e3fc1325495 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2007-02-07 Kyle Galloway <kgallowa@redhat.com> + + * 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. + 2007-02-07 Keith Seitz <keiths@redhat.com> * include/java-interp.h (_Jv_Frame::depth): diff --git a/libjava/include/java-interp.h b/libjava/include/java-interp.h index ce2fac273c4..2b3ae7cd6f7 100644 --- a/libjava/include/java-interp.h +++ b/libjava/include/java-interp.h @@ -387,6 +387,9 @@ public: _Jv_word *locals; char *locals_type; + // Object pointer for this frame ("this") + jobject obj_ptr; + _Jv_InterpFrame (void *meth, java::lang::Thread *thr, jclass proxyCls = NULL) : _Jv_Frame (reinterpret_cast<_Jv_MethodBase *> (meth), thr, frame_interpreter) @@ -394,12 +397,18 @@ public: next_interp = (_Jv_InterpFrame *) thr->interp_frame; proxyClass = proxyCls; thr->interp_frame = (gnu::gcj::RawData *) this; + obj_ptr = NULL; } ~_Jv_InterpFrame () { thread->interp_frame = (gnu::gcj::RawData *) next_interp; } + + jobject get_this_ptr () + { + return obj_ptr; + } }; // A native frame in the call stack really just a placeholder 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 |
