FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

link.cc (ensure_class_linked): Conditionally compile _Jv_IsInterpretedClass on INTERPRETER.

Browse source 
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.

From-SVN: r91375
This commit is contained in:
Andrew Haley 2004-11-27 12:37:32 +00:00 • committed by Andrew Haley
parent 02a854f970
commit 1daa567cf8
4 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libjava/ChangeLog
View file

@ -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> 2004-11-25 Tom Tromey <tromey@redhat.com>
* gnu/gcj/util/natDebug.cc (getField): Don't qualify name. * gnu/gcj/util/natDebug.cc (getField): Don't qualify name.

3
libjava/include/java-interp.h
View file

@ -45,9 +45,6 @@ int _Jv_count_arguments (_Jv_Utf8Const *signature,
jboolean staticp = true); jboolean staticp = true);
void _Jv_VerifyMethod (_Jv_InterpMethod *method); 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 interpreter is written in C++, primarily because it makes it easy for
* the entire thing to be "friend" with class Class. */ * the entire thing to be "friend" with class Class. */

3
libjava/include/jvm.h
View file

@ -555,4 +555,7 @@ extern void (*_Jv_JVMPI_Notify_THREAD_START) (JVMPI_Event *event);
extern void (*_Jv_JVMPI_Notify_THREAD_END) (JVMPI_Event *event); extern void (*_Jv_JVMPI_Notify_THREAD_END) (JVMPI_Event *event);
#endif #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__ */ #endif /* __JAVA_JVM_H__ */

11
libjava/link.cc
View file

@ -1422,7 +1422,9 @@ _Jv_Linker::ensure_class_linked (jclass klass)
// a reference to a class we can't access. This can validly // a reference to a class we can't access. This can validly
// occur in an obscure case involving the InnerClasses // occur in an obscure case involving the InnerClasses
// attribute. // attribute.
#ifdef INTERPRETER
if (! _Jv_IsInterpretedClass (klass)) if (! _Jv_IsInterpretedClass (klass))
#endif
{ {
// Resolve class constants first, since other constant pool // Resolve class constants first, since other constant pool
// entries may rely on these. // 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. // We use a somewhat bogus test for the ABI here.
char *abi; char *abi;
#ifdef INTERPRETER
if (_Jv_IsInterpretedClass (klass)) if (_Jv_IsInterpretedClass (klass))
#else
if (false)
#endif
abi = "bytecode"; abi = "bytecode";
else if (klass->state == JV_STATE_PRELOADING) else if (klass->state == JV_STATE_PRELOADING)
abi = "BC-compiled"; abi = "BC-compiled";
@ -1714,7 +1720,10 @@ _Jv_Linker::wait_for_state (jclass klass, int state)
if (gcj::verbose_class_flag if (gcj::verbose_class_flag
&& (klass->state == JV_STATE_COMPILED && (klass->state == JV_STATE_COMPILED
|| klass->state == JV_STATE_PRELOADING) || klass->state == JV_STATE_PRELOADING)
&& ! _Jv_IsInterpretedClass (klass)) #ifdef INTERPRETER
&& ! _Jv_IsInterpretedClass (klass)
#endif
)
print_class_loaded (klass); print_class_loaded (klass);
try try