From cc0c8dbc9363a9355c3ab81588b583f1a49a58b0 Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Tue, 20 Feb 2007 14:08:49 +0000 Subject: [PATCH] * gnu/classpath/jdwp/natVMVirtualMachine.cc (jdwpClassPrepareCB): Move class status stuff to ... (getClassStatus): ... here. From-SVN: r122164 --- libjava/ChangeLog | 6 +++ .../gnu/classpath/jdwp/natVMVirtualMachine.cc | 39 ++++++++++--------- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8e52bc41cfb..088f5eb7908 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2007-02-20 Keith Seitz + + * gnu/classpath/jdwp/natVMVirtualMachine.cc + (jdwpClassPrepareCB): Move class status stuff to ... + (getClassStatus): ... here. + 2007-02-20 Gary Benson * gnu/awt/xlib/XEventLoop.h: Regenerated. diff --git a/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc b/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc index c47d440ea2f..3ea5f9a76d6 100644 --- a/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc +++ b/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc @@ -453,9 +453,25 @@ gnu::classpath::jdwp::VMVirtualMachine::getAllLoadedClasses (void) jint gnu::classpath::jdwp::VMVirtualMachine:: -getClassStatus (MAYBE_UNUSED jclass klass) +getClassStatus (jclass klass) { - return 0; + jint flags = 0; + jvmtiError err = _jdwp_jvmtiEnv->GetClassStatus (klass, &flags); + if (err != JVMTI_ERROR_NONE) + throw_jvmti_error (err); + + using namespace gnu::classpath::jdwp::event; + jint status = 0; + if (flags & JVMTI_CLASS_STATUS_VERIFIED) + status |= ClassPrepareEvent::STATUS_VERIFIED; + if (flags & JVMTI_CLASS_STATUS_PREPARED) + status |= ClassPrepareEvent::STATUS_PREPARED; + if (flags & JVMTI_CLASS_STATUS_ERROR) + status |= ClassPrepareEvent::STATUS_ERROR; + if (flags & JVMTI_CLASS_STATUS_INITIALIZED) + status |= ClassPrepareEvent::STATUS_INITIALIZED; + + return status; } JArray * @@ -812,27 +828,12 @@ jdwpBreakpointCB (jvmtiEnv *env, MAYBE_UNUSED JNIEnv *jni_env, } static void JNICALL -jdwpClassPrepareCB (jvmtiEnv *env, MAYBE_UNUSED JNIEnv *jni_env, +jdwpClassPrepareCB (MAYBE_UNUSED jvmtiEnv *env, MAYBE_UNUSED JNIEnv *jni_env, jthread thread, jclass klass) { using namespace gnu::classpath::jdwp; - jint flags = 0; - jvmtiError err = env->GetClassStatus (klass, &flags); - if (err != JVMTI_ERROR_NONE) - throw_jvmti_error (err); - - using namespace gnu::classpath::jdwp::event; - jint status = 0; - if (flags & JVMTI_CLASS_STATUS_VERIFIED) - status |= ClassPrepareEvent::STATUS_VERIFIED; - if (flags & JVMTI_CLASS_STATUS_PREPARED) - status |= ClassPrepareEvent::STATUS_PREPARED; - if (flags & JVMTI_CLASS_STATUS_ERROR) - status |= ClassPrepareEvent::STATUS_ERROR; - if (flags & JVMTI_CLASS_STATUS_INITIALIZED) - status |= ClassPrepareEvent::STATUS_INITIALIZED; - + jint status = VMVirtualMachine::getClassStatus (klass); event::ClassPrepareEvent *event = new event::ClassPrepareEvent (thread, klass, status); Jdwp::notify (event); -- 2.30.2