From 18fcc4961b6dc27d676b02c1147feaf852d88dca Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 20 Apr 2000 22:24:33 +0000 Subject: re GNATS libgcj/212 (build is broken on Linux/Alpha) Fix for PR libgcj/212: * gcj/javaprims.h (_Jv_word, _Jv_word2): Removed definitions. * include/jvm.h (_Jv_word, _Jv_word2): Define. * java/lang/Class.h (_Jv_word): Declare. From-SVN: r33292 --- libjava/include/jvm.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'libjava/include/jvm.h') diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h index 625a11e..c9cae93 100644 --- a/libjava/include/jvm.h +++ b/libjava/include/jvm.h @@ -31,6 +31,35 @@ struct _Jv_VTable void *method[1]; }; +union _Jv_word +{ + jobject o; + jint i; // Also stores smaller integral types. + jfloat f; + jint ia[1]; // Half of _Jv_word2. + void* p; + +#if SIZEOF_VOID_P == 8 + // We can safely put a long or a double in here without increasing + // the size of _Jv_Word; we take advantage of this in the interpreter. + jlong l; + jdouble d; +#endif + + jclass clazz; + jstring string; + struct _Jv_Field *field; + struct _Jv_Utf8Const *utf8; + struct _Jv_ResolvedMethod *rmethod; +}; + +union _Jv_word2 +{ + jint ia[2]; + jlong l; + jdouble d; +}; + /* Extract a character from a Java-style Utf8 string. * PTR points to the current character. * LIMIT points to the end of the Utf8 string. -- cgit v1.1