Patch: `class$' runtime patch again

[Tom Tromey <tromey at cygnus dot com>]

My old `class$' runtime patch was fairly messed up.
Here is the new version of the patch.

Tom

Index: ChangeLog
===================================================================
RCS file: /cvs/java/libgcj/libjava/ChangeLog,v
retrieving revision 1.473
diff -u -r1.473 ChangeLog
--- ChangeLog	2000/08/30 20:42:31	1.473
+++ ChangeLog	2000/09/10 23:23:08
@@ -1,3 +1,50 @@
+2000-09-09  Tom Tromey  <tromey@cygnus.com>
+
+	* java/lang/Class.h (Object): Added `class$' field.
+	* java/lang/Object.h (Object): Added `class$' field.
+	* defineclass.cc (ClassClass): Use `class$' form.
+	(ClassObject): Likewise.
+	* resolve.cc (ClassObject): Use `class$' form.
+	(ObjectClass): Likewise.
+	* interpret.cc (ClassError): Removed.
+	* java/net/natPlainDatagramSocketImpl.cc (BooleanClass): Use
+	`class$' form.
+	(IntegerClass): Likewise.
+	* java/net/natPlainSocketImpl.cc (BooleanClass): Use `class$'
+	form.
+	* java/lang/natClassLoader.cc (CloneableClass): Use `class$' form.
+	(ObjectClass, ClassClass, VMClassLoaderClass, ClassLoaderClass,
+	SerializableClass): Likewise.
+	Include Serializable.h, Cloneable.h.
+	* java/lang/natSystem.cc (SystemClass): Removed.
+	(init_properties): Use `class$' form.
+	* java/lang/natObject.cc (CloneableClass): Removed.
+	(clone): Use `class$' form.
+	* java/lang/natClass.cc (CloneableClass): Use `class$' form.
+	(ObjectClass, ErrorClass, ClassClass, MethodClass, FieldClass,
+	ConstructorClass): Likewise.
+	* java/lang/reflect/natMethod.cc (ObjectClass): Use `class$' form.
+	(ClassClass, VoidClass, ByteClass, ShortClass, CharacterClass,
+	IntegerClass, LongClass, FloatClass, DoubleClass): Likewise.
+	* java/io/natObjectInputStream.cc (ObjectClass): Use `class$'
+	form.
+	(ClassClass): Likewise.
+	* include/jvm.h (StringClass): Use `class$' form.
+	* prims.cc (ObjectClass): Removed.
+	(_Jv_RunMain): Use `class$' form.
+	(_Jv_AllocObject): Likewise.
+	* jni.cc (ClassClass): Use `class$' form.
+	(ThrowableClass): Likewise.
+	(ObjectClass): Likewise.
+	(MethodClass): Likewise.
+	(ThreadGroupClass): Likewise.
+	(NativeThreadClass): Likewise.
+	* boehm.cc (ObjectClass): Removed.
+	(ClassClass): Removed.
+	(_Jv_MarkObj): Use `class$' form.
+	* gcj/field.h (JvFieldIsRef): Use `class$' form.
+	Include RawData.h.
+
 2000-08-30  Tom Tromey  <tromey@cygnus.com>
 
 	* Makefile.in: Rebuilt.
Index: boehm.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/boehm.cc,v
retrieving revision 1.20
diff -u -r1.20 boehm.cc
--- boehm.cc	2000/05/06 23:32:52	1.20
+++ boehm.cc	2000/09/10 23:23:09
@@ -48,11 +48,6 @@
 	  && (ptr_t) (Obj) <= GC_greatest_plausible_heap_addr) \
         PUSH_CONTENTS (Obj, Top, Limit, Source, Exit)
 
-#define ObjectClass _CL_Q34java4lang6Object
-extern java::lang::Class ObjectClass;
-#define ClassClass _CL_Q34java4lang5Class
-extern java::lang::Class ClassClass;
-
 
 
 // Nonzero if this module has been initialized.
@@ -99,7 +94,7 @@
   p = (ptr_t) klass;
   MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, obj, o2label);
 
-  if (__builtin_expect (klass == &ClassClass, false))
+  if (__builtin_expect (klass == &java::lang::Class::class$, false))
     {
       jclass c = (jclass) addr;
 
@@ -238,7 +233,7 @@
       // Note: occasionally `klass' can be null.  For instance, this
       // can happen if a GC occurs between the point where an object
       // is allocated and where the vtbl slot is set.
-      while (klass && klass != &ObjectClass)
+      while (klass && klass != &java::lang::Object::class$)
 	{
 	  jfieldID field = JvGetFirstInstanceField (klass);
 	  jint max = JvNumInstanceFields (klass);
Index: defineclass.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/defineclass.cc,v
retrieving revision 1.10
diff -u -r1.10 defineclass.cc
--- defineclass.cc	2000/05/31 22:49:18	1.10
+++ defineclass.cc	2000/09/10 23:23:09
@@ -41,11 +41,6 @@
 #include <java/lang/IncompatibleClassChangeError.h>
 #include <java/lang/reflect/Modifier.h>
 
-#define ClassClass _CL_Q34java4lang5Class
-extern java::lang::Class ClassClass;
-#define ClassObject _CL_Q34java4lang6Object
-extern java::lang::Class ClassObject;
-
 // we don't verify method names that match these.
 static _Jv_Utf8Const *clinit_name = _Jv_makeUtf8Const ("<clinit>", 8);
 static _Jv_Utf8Const *init_name = _Jv_makeUtf8Const ("<init>", 6);
@@ -862,11 +857,12 @@
       // interfaces have java.lang.Object as super.
       if (access_flags & Modifier::INTERFACE)
 	{
-	  def->superclass = (jclass)&ClassObject;
+	  def->superclass = (jclass)&java::lang::Class::class$;
 	}
 
       // FIXME: Consider this carefully!  
-      else if (!_Jv_equalUtf8Consts (def->name, ClassObject.name))
+      else if (!_Jv_equalUtf8Consts (def->name,
+				     java::lang::Class::class$.name))
 	{
 	  throw_no_class_def_found_error ("loading java.lang.Object");
 	}
Index: interpret.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/interpret.cc,v
retrieving revision 1.19
diff -u -r1.19 interpret.cc
--- interpret.cc	2000/08/02 03:25:12	1.19
+++ interpret.cc	2000/09/10 23:23:10
@@ -37,9 +37,6 @@
 
 #include <alloca.h>
 
-#define ClassError _CL_Q34java4lang5Error
-extern java::lang::Class ClassError;
-
 static _Jv_Utf8Const *init_name = _Jv_makeUtf8Const ("<init>", 6);
 
 static void throw_internal_error (char *msg)
Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.32
diff -u -r1.32 jni.cc
--- jni.cc	2000/08/02 03:25:12	1.32
+++ jni.cc	2000/09/10 23:23:11
@@ -46,19 +46,13 @@
 
 #include <java-interp.h>
 
-#define ClassClass _CL_Q34java4lang5Class
-extern java::lang::Class ClassClass;
-#define ObjectClass _CL_Q34java4lang6Object
-extern java::lang::Class ObjectClass;
-
-#define ThrowableClass _CL_Q34java4lang9Throwable
-extern java::lang::Class ThrowableClass;
-#define MethodClass _CL_Q44java4lang7reflect6Method
-extern java::lang::Class MethodClass;
-#define ThreadGroupClass _CL_Q34java4lang11ThreadGroup
-extern java::lang::Class ThreadGroupClass;
-#define NativeThreadClass _CL_Q43gnu3gcj3jni12NativeThread
-extern java::lang::Class ThreadGroupClass;
+// FIXME: remove these defines.
+#define ClassClass java::lang::Class::class$
+#define ObjectClass java::lang::Object::class$
+#define ThrowableClass java::lang::Throwable::class$
+#define MethodClass java::lang::reflect::Method::class$
+#define ThreadGroupClass java::lang::ThreadGroup::class$
+#define NativeThreadClass gnu::gcj::jni::NativeThread::class$
 
 // This enum is used to select different template instantiations in
 // the invocation code.
Index: prims.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/prims.cc,v
retrieving revision 1.35
diff -u -r1.35 prims.cc
--- prims.cc	2000/08/26 19:25:13	1.35
+++ prims.cc	2000/09/10 23:23:12
@@ -67,9 +67,6 @@
 #include <ltdl.h>
 #endif
 
-#define ObjectClass _CL_Q34java4lang6Object
-extern java::lang::Class ObjectClass;
-
 // We allocate a single OutOfMemoryError exception which we keep
 // around for use if we run out of memory.
 static java::lang::OutOfMemoryError *no_memory;
@@ -355,7 +352,7 @@
   // implementation would look for Object.finalize in Object's method
   // table at startup, and then use that information to find the
   // appropriate index in the method vector.
-  if (c->vtable->method[1] != ObjectClass.vtable->method[1])
+  if (c->vtable->method[1] != java::lang::Object::class$.vtable->method[1])
     _Jv_RegisterFinalizer (obj, _Jv_FinalizeObject);
 
 #ifdef ENABLE_JVMPI
@@ -914,7 +911,7 @@
       arg_vec = JvConvertArgv (1, &_Jv_Jar_Class_Path);
 
       main_thread = 
-	new gnu::gcj::runtime::FirstThread (&_CL_Q43gnu3gcj7runtime11FirstThread,
+	new gnu::gcj::runtime::FirstThread (&gnu::gcj::runtime::FirstThread::class$,
 					    arg_vec);
       main_thread->start();
       _Jv_ThreadWait ();
Index: resolve.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/resolve.cc,v
retrieving revision 1.17
diff -u -r1.17 resolve.cc
--- resolve.cc	2000/03/26 20:33:03	1.17
+++ resolve.cc	2000/09/10 23:23:13
@@ -41,12 +41,6 @@
 static void throw_class_format_error (char *msg)
 	__attribute__ ((__noreturn__));
 
-#define ClassObject _CL_Q34java4lang6Object
-extern java::lang::Class ClassObject;
-#define ObjectClass _CL_Q34java4lang6Object
-extern java::lang::Class ObjectClass;
-
-
 static int get_alignment_from_class (jclass);
 
 static _Jv_ResolvedMethod* 
@@ -805,7 +799,8 @@
       /* fall through */
 
     case JV_CONSTANT_ResolvedString:
-      if (! (field->type == &StringClass || field->type == &ObjectClass))
+      if (! (field->type == &StringClass
+	     || field->type == &java::lang::Class::class$))
 	throw_class_format_error ("string initialiser to non-string field");
 
       *(jstring*)addr = pool->data[init].string;
Index: gcj/field.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/gcj/field.h,v
retrieving revision 1.8
diff -u -r1.8 field.h
--- field.h	2000/07/27 23:57:06	1.8
+++ field.h	2000/09/10 23:23:13
@@ -14,6 +14,7 @@
 #include <java/lang/Class.h>
 #include <java/lang/reflect/Field.h>
 #include <java/lang/reflect/Modifier.h>
+#include <gnu/gcj/RawData.h>
 
 #define _Jv_FIELD_UNRESOLVED_FLAG	0x8000
 #define	_Jv_FIELD_CONSTANT_VALUE	0x4000
@@ -179,9 +180,7 @@
 extern inline jboolean
 JvFieldIsRef (jfieldID field)
 {
-  // gnu.gcj.RawData.class is  _CL_Q33gnu3gcj7RawData
-  extern java::lang::Class _CL_Q33gnu3gcj7RawData;
-  return field->isRef () && field->type != &_CL_Q33gnu3gcj7RawData;
+  return field->isRef () && field->type != &gnu::gcj::RawData::class$;
 }
 
 extern inline jobject
Index: include/jvm.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/jvm.h,v
retrieving revision 1.27
diff -u -r1.27 jvm.h
--- jvm.h	2000/08/21 06:05:19	1.27
+++ jvm.h	2000/09/10 23:23:14
@@ -99,8 +99,8 @@
 extern jboolean _Jv_equal (_Jv_Utf8Const *, jstring, jint);
 extern jboolean _Jv_equaln (_Jv_Utf8Const *, jstring, jint);
 
-#define StringClass _CL_Q34java4lang6String
-extern java::lang::Class StringClass;
+// FIXME: remove this define.
+#define StringClass java::lang::String::class$
 
 /* Type of pointer used as finalizer.  */
 typedef void _Jv_FinalizerFunc (jobject);
Index: java/io/natObjectInputStream.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/io/natObjectInputStream.cc,v
retrieving revision 1.1
diff -u -r1.1 natObjectInputStream.cc
--- natObjectInputStream.cc	2000/05/19 17:55:31	1.1
+++ natObjectInputStream.cc	2000/09/10 23:23:14
@@ -1,6 +1,6 @@
 // natObjectInputStream.cc - Native part of ObjectInputStream class.
 
-/* Copyright (C) 1998, 1999  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000  Free Software Foundation
 
    This ObjectInputStream is part of libgcj.
 
@@ -46,10 +46,8 @@
 }
 
 
-#define ObjectClass _CL_Q34java4lang6Object
-extern java::lang::Class ObjectClass;
-#define ClassClass _CL_Q34java4lang5Class
-extern java::lang::Class ClassClass;
+#define ObjectClass java::lang::Object::class$
+#define ClassClass java::lang::Class::class$
 
 void 
 java::io::ObjectInputStream::callConstructor (jclass klass, jobject obj)
Index: java/lang/Class.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Class.h,v
retrieving revision 1.24
diff -u -r1.24 Class.h
--- Class.h	2000/06/15 12:04:50	1.24
+++ Class.h	2000/09/10 23:23:14
@@ -190,6 +190,8 @@
   // finalization
   void finalize ();
 
+  static java::lang::Class class$;
+
 private:   
 
   void checkMemberAccess (jint flags);
Index: java/lang/Object.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Object.h,v
retrieving revision 1.5
diff -u -r1.5 Object.h
--- Object.h	2000/03/07 19:55:26	1.5
+++ Object.h	2000/09/10 23:23:14
@@ -57,6 +57,8 @@
   friend JV_MARKARRAY_DECL;
 #endif
 
+  static java::lang::Class class$;
+
 protected:
   virtual jobject clone (void);
   virtual void finalize (void);
Index: java/lang/natClass.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClass.cc,v
retrieving revision 1.28
diff -u -r1.28 natClass.cc
--- natClass.cc	2000/08/17 21:56:29	1.28
+++ natClass.cc	2000/09/10 23:23:15
@@ -51,20 +51,14 @@
 
 
 
-#define CloneableClass _CL_Q34java4lang9Cloneable
-extern java::lang::Class CloneableClass;
-#define ObjectClass _CL_Q34java4lang6Object
-extern java::lang::Class ObjectClass;
-#define ErrorClass _CL_Q34java4lang5Error
-extern java::lang::Class ErrorClass;
-#define ClassClass _CL_Q34java4lang5Class
-extern java::lang::Class ClassClass;
-#define MethodClass _CL_Q44java4lang7reflect6Method
-extern java::lang::Class MethodClass;
-#define FieldClass _CL_Q44java4lang7reflect5Field
-extern java::lang::Class FieldClass;
-#define ConstructorClass _CL_Q44java4lang7reflect11Constructor
-extern java::lang::Class ConstructorClass;
+// FIXME: remove these.
+#define CloneableClass java::lang::Cloneable::class$
+#define ObjectClass java::lang::Object::class$
+#define ErrorClass java::lang::Error::class$
+#define ClassClass java::lang::Class::class$
+#define MethodClass java::lang::reflect::Method::class$
+#define FieldClass java::lang::reflect::Field::class$
+#define ConstructorClass java::lang::reflect::Constructor::class$
 
 // Some constants we use to look up the class initializer.
 static _Jv_Utf8Const *void_signature = _Jv_makeUtf8Const ("()V", 3);
Index: java/lang/natClassLoader.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClassLoader.cc,v
retrieving revision 1.25
diff -u -r1.25 natClassLoader.cc
--- natClassLoader.cc	2000/07/20 19:31:16	1.25
+++ natClassLoader.cc	2000/09/10 23:23:15
@@ -35,19 +35,17 @@
 #include <java/lang/IncompatibleClassChangeError.h>
 #include <java/lang/reflect/Modifier.h>
 #include <java/lang/Runtime.h>
+#include <java/io/Serializable.h>
+#include <java/lang/Cloneable.h>
 
-#define CloneableClass _CL_Q34java4lang9Cloneable
-extern java::lang::Class CloneableClass;
-#define ObjectClass _CL_Q34java4lang6Object
-extern java::lang::Class ObjectClass;
-#define ClassClass _CL_Q34java4lang5Class
-extern java::lang::Class ClassClass;
-#define VMClassLoaderClass _CL_Q34java4lang17VMClassLoader
-extern java::lang::Class VMClassLoader;
-#define ClassLoaderClass _CL_Q34java4lang11ClassLoader
-extern java::lang::Class ClassLoaderClass;
-#define SerializableClass _CL_Q34java2io12Serializable
-extern java::lang::Class SerializableClass;
+// FIXME: remove these.
+#define CloneableClass java::lang::Cloneable::class$
+#define ObjectClass java::lang::Object::class$
+#define ClassClass java::lang::Class::class$
+#define VMClassLoaderClass gnu::gcj::runtime::VMClassLoader::class$
+#define ClassLoaderClass java::lang::ClassLoader::class$
+#define SerializableClass java::io::Serializable::class$
+
 /////////// java.lang.ClassLoader native methods ////////////
 
 java::lang::ClassLoader *
Index: java/lang/natObject.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natObject.cc,v
retrieving revision 1.12
diff -u -r1.12 natObject.cc
--- natObject.cc	2000/05/05 02:56:14	1.12
+++ natObject.cc	2000/09/10 23:23:16
@@ -28,9 +28,6 @@
 #include <java/lang/Cloneable.h>
 #include <java/lang/Thread.h>
 
-#define CloneableClass _CL_Q34java4lang9Cloneable
-extern java::lang::Class CloneableClass;
-
 
 
 // This is used to represent synchronization information.
@@ -92,7 +89,7 @@
     }
   else
     {
-      if (! CloneableClass.isAssignableFrom(klass))
+      if (! java::lang::Cloneable::class$.isAssignableFrom(klass))
 	JvThrow (new CloneNotSupportedException);
 
       size = klass->size();
Index: java/lang/natSystem.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natSystem.cc,v
retrieving revision 1.24
diff -u -r1.24 natSystem.cc
--- natSystem.cc	2000/08/26 19:25:13	1.24
+++ natSystem.cc	2000/09/10 23:23:16
@@ -37,9 +37,6 @@
 #include <java/io/PrintStream.h>
 #include <java/io/InputStream.h>
 
-#define SystemClass _CL_Q34java4lang6System
-extern java::lang::Class SystemClass;
-
 
 
 void
@@ -202,7 +199,7 @@
 {
   {
     // We only need to synchronize around this gatekeeper.
-    JvSynchronize sync (&SystemClass);
+    JvSynchronize sync (&java::lang::System::class$);
     if (prop_init)
       return;
     prop_init = true;
Index: java/lang/reflect/natMethod.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/reflect/natMethod.cc,v
retrieving revision 1.14
diff -u -r1.14 natMethod.cc
--- natMethod.cc	2000/08/08 03:34:51	1.14
+++ natMethod.cc	2000/09/10 23:23:16
@@ -36,31 +36,23 @@
 #include <gcj/method.h>
 #include <gnu/gcj/RawData.h>
 
-#define ObjectClass _CL_Q34java4lang6Object
-extern java::lang::Class ObjectClass;
-#define ClassClass _CL_Q34java4lang5Class
-extern java::lang::Class ClassClass;
+// FIXME: remove these
+#define ObjectClass java::lang::Object::class$
+#define ClassClass java::lang::Class::class$
 
 #include <stdlib.h>
 
 #include <ffi.h>
 
-#define VoidClass _CL_Q34java4lang4Void
-extern java::lang::Class VoidClass;
-#define ByteClass _CL_Q34java4lang4Byte
-extern java::lang::Class ByteClass;
-#define ShortClass _CL_Q34java4lang5Short
-extern java::lang::Class ShortClass;
-#define CharacterClass _CL_Q34java4lang9Character
-extern java::lang::Class CharacterClass;
-#define IntegerClass _CL_Q34java4lang7Integer
-extern java::lang::Class IntegerClass;
-#define LongClass _CL_Q34java4lang4Long
-extern java::lang::Class LongClass;
-#define FloatClass _CL_Q34java4lang5Float
-extern java::lang::Class FloatClass;
-#define DoubleClass _CL_Q34java4lang6Double
-extern java::lang::Class DoubleClass;
+// FIXME: remove these.
+#define VoidClass java::lang::Void::class$
+#define ByteClass java::lang::Byte::class$
+#define ShortClass java::lang::Short::class$
+#define CharacterClass java::lang::Character::class$
+#define IntegerClass java::lang::Integer::class$
+#define LongClass java::lang::Long::class$
+#define FloatClass java::lang::Float::class$
+#define DoubleClass java::lang::Double::class$
 
 struct cpair
 {
Index: java/net/natPlainDatagramSocketImpl.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/net/natPlainDatagramSocketImpl.cc,v
retrieving revision 1.21
diff -u -r1.21 natPlainDatagramSocketImpl.cc
--- natPlainDatagramSocketImpl.cc	2000/08/11 03:07:59	1.21
+++ natPlainDatagramSocketImpl.cc	2000/09/10 23:23:17
@@ -50,10 +50,9 @@
 #include <java/lang/Boolean.h>
 #include <java/lang/Integer.h>
 
-#define BooleanClass _CL_Q34java4lang7Boolean
-extern java::lang::Class BooleanClass;
-#define IntegerClass _CL_Q34java4lang7Integer
-extern java::lang::Class IntegerClass;
+// FIXME: remove these
+#define BooleanClass java::lang::Boolean::class$
+#define IntegerClass java::lang::Integer::class$
 
 #ifdef DISABLE_JAVA_NET
 
Index: java/net/natPlainSocketImpl.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/net/natPlainSocketImpl.cc,v
retrieving revision 1.20
diff -u -r1.20 natPlainSocketImpl.cc
--- natPlainSocketImpl.cc	2000/08/11 03:07:59	1.20
+++ natPlainSocketImpl.cc	2000/09/10 23:23:17
@@ -49,8 +49,7 @@
 #include <java/lang/Class.h>
 #include <java/lang/Integer.h>
 
-#define BooleanClass _CL_Q34java4lang7Boolean
-extern java::lang::Class BooleanClass;
+#define BooleanClass java::lang::Boolean::class$
 
 #ifdef DISABLE_JAVA_NET