diff options
| -rw-r--r-- | libjava/ChangeLog | 9 | ||||
| -rw-r--r-- | libjava/include/java-interp.h | 3 | ||||
| -rw-r--r-- | libjava/include/jvm.h | 3 | ||||
| -rw-r--r-- | libjava/link.cc | 11 |
4 files changed, 22 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 2589211..529e2a2 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,12 @@ +2004-11-27 Andrew Haley <aph@redhat.com> + + * link.cc (ensure_class_linked): Conditionally compile + _Jv_IsInterpretedClass on INTERPRETER. + (print_class_loaded): Likewise. + (wait_for_state): Likewise. + * include/jvm.h (ROUND): Move to here from include/java-interp.h. + * include/java-interp.h (ROUND): Remove. + 2004-11-25 Tom Tromey <tromey@redhat.com> * gnu/gcj/util/natDebug.cc (getField): Don't qualify name. diff --git a/libjava/include/java-interp.h b/libjava/include/java-interp.h index c8e041a..4126c2f 100644 --- a/libjava/include/java-interp.h +++ b/libjava/include/java-interp.h @@ -45,9 +45,6 @@ int _Jv_count_arguments (_Jv_Utf8Const *signature, jboolean staticp = true); void _Jv_VerifyMethod (_Jv_InterpMethod *method); -/* FIXME: this should really be defined in some more generic place */ -#define ROUND(V, A) (((((unsigned) (V))-1) | ((A)-1))+1) - /* the interpreter is written in C++, primarily because it makes it easy for * the entire thing to be "friend" with class Class. */ diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h index a3d06e7..ff2c9b1e 100644 --- a/libjava/include/jvm.h +++ b/libjava/include/jvm.h @@ -555,4 +555,7 @@ extern void (*_Jv_JVMPI_Notify_THREAD_START) (JVMPI_Event *event); extern void (*_Jv_JVMPI_Notify_THREAD_END) (JVMPI_Event *event); #endif +/* FIXME: this should really be defined in some more generic place */ +#define ROUND(V, A) (((((unsigned) (V))-1) | ((A)-1))+1) + #endif /* __JAVA_JVM_H__ */ diff --git a/libjava/link.cc b/libjava/link.cc index 39ade14..e611b76 100644 --- a/libjava/link.cc +++ b/libjava/link.cc @@ -1422,7 +1422,9 @@ _Jv_Linker::ensure_class_linked (jclass klass) // a reference to a class we can't access. This can validly // occur in an obscure case involving the InnerClasses // attribute. +#ifdef INTERPRETER if (! _Jv_IsInterpretedClass (klass)) +#endif { // Resolve class constants first, since other constant pool // entries may rely on these. @@ -1677,7 +1679,11 @@ _Jv_Linker::print_class_loaded (jclass klass) // We use a somewhat bogus test for the ABI here. char *abi; +#ifdef INTERPRETER if (_Jv_IsInterpretedClass (klass)) +#else + if (false) +#endif abi = "bytecode"; else if (klass->state == JV_STATE_PRELOADING) abi = "BC-compiled"; @@ -1714,7 +1720,10 @@ _Jv_Linker::wait_for_state (jclass klass, int state) if (gcj::verbose_class_flag && (klass->state == JV_STATE_COMPILED || klass->state == JV_STATE_PRELOADING) - && ! _Jv_IsInterpretedClass (klass)) +#ifdef INTERPRETER + && ! _Jv_IsInterpretedClass (klass) +#endif + ) print_class_loaded (klass); try |