From 1d336a099d6c7f97e4fe1eec00d3906abf3dc617 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 6 Oct 2000 01:49:32 +0000 Subject: natField.cc (BooleanClass): Don't define. * java/lang/reflect/natField.cc (BooleanClass): Don't define. * java/lang/reflect/natArray.cc (BooleanClass): Don't define. * 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. From-SVN: r36740 --- libjava/java/lang/reflect/natArray.cc | 5 +---- libjava/java/lang/reflect/natField.cc | 7 ++----- libjava/java/lang/reflect/natMethod.cc | 32 ++++++++++++-------------------- 3 files changed, 15 insertions(+), 29 deletions(-) (limited to 'libjava/java/lang/reflect') diff --git a/libjava/java/lang/reflect/natArray.cc b/libjava/java/lang/reflect/natArray.cc index 4bce9ce8c0a..b5a2124fb6d 100644 --- a/libjava/java/lang/reflect/natArray.cc +++ b/libjava/java/lang/reflect/natArray.cc @@ -25,9 +25,6 @@ details. */ #include #include -#define BooleanClass _CL_Q34java4lang7Boolean -extern java::lang::Class BooleanClass; - jobject java::lang::reflect::Array::newInstance (jclass componentType, jint length) { @@ -215,7 +212,7 @@ java::lang::reflect::Array::get (jobject array, jint index) return new java::lang::Character (elements ((jcharArray) array) [index]); if (elementType == JvPrimClass (boolean)) { - _Jv_InitClass (&BooleanClass); + _Jv_InitClass (&java::lang::Boolean::class$); if (elements ((jbooleanArray) array) [index]) return java::lang::Boolean::TRUE; else diff --git a/libjava/java/lang/reflect/natField.cc b/libjava/java/lang/reflect/natField.cc index 3cd296c7021..57421d690b4 100644 --- a/libjava/java/lang/reflect/natField.cc +++ b/libjava/java/lang/reflect/natField.cc @@ -1,6 +1,6 @@ // natField.cc - Implementation of java.lang.reflect.Field native methods. -/* Copyright (C) 1998, 1999 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -26,9 +26,6 @@ details. */ #include #include -#define BooleanClass _CL_Q34java4lang7Boolean -extern java::lang::Class BooleanClass; - jint java::lang::reflect::Field::getModifiers () { @@ -255,7 +252,7 @@ java::lang::reflect::Field::get (jclass caller, jobject obj) return new java::lang::Character (* (jchar*) addr); if (fld->type == JvPrimClass (boolean)) { - _Jv_InitClass (&BooleanClass); + _Jv_InitClass (&java::lang::Boolean::class$); if (* (jboolean*) addr) return java::lang::Boolean::TRUE; else diff --git a/libjava/java/lang/reflect/natMethod.cc b/libjava/java/lang/reflect/natMethod.cc index 0f829debd30..0e83e0d2511 100644 --- a/libjava/java/lang/reflect/natMethod.cc +++ b/libjava/java/lang/reflect/natMethod.cc @@ -38,31 +38,23 @@ details. */ #include #include -#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 #include -#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 { -- cgit v1.2.3