decl.c (init_decl_processing): Renamed fields.

	* decl.c (init_decl_processing): Renamed fields.
	* class.c (make_class_data): Renamed bfsize, nfields, nsfields,
	interface_len, msize fields.
	* class.c (make_class_data): Removed subclass_head and
	subclass_next fields.
	* decl.c (init_decl_processing): Removed subclass_head and
	subclass_next fields.

From-SVN: r23395

gcc/java/ChangeLog

+1998-10-28  Tom Tromey  <tromey@cygnus.com>
+
+	* decl.c (init_decl_processing): Renamed fields.
+	* class.c (make_class_data): Renamed bfsize, nfields, nsfields,
+	interface_len, msize fields.
+
+	* class.c (make_class_data): Removed subclass_head and
+	subclass_next fields.
+	* decl.c (init_decl_processing): Removed subclass_head and
+	subclass_next fields.
+
 Wed Oct 28 00:46:15 1998  Jeffrey A Law  (law@cygnus.com)
 
 	* jcf-write.c (emit_load_or_store): Avoid implicit int arguments.
 	* mangle.c (emit_unicode_mangled_name): Similarly.
-	
+
 Sun Oct 25 14:58:05 1998  H.J. Lu  (hjl@gnu.org)
 
 	* Make-lang.in (jv-scan$(exeext)): Add stamp-objlist to

gcc/java/class.c

@@ -1086,26 +1086,25 @@ make_class_data (type)
 		    build_int_2 (get_access_flags_from_decl (type_decl), 0));
 
   PUSH_FIELD_VALUE (cons, "superclass", super);
-  PUSH_FIELD_VALUE (cons, "subclass_head", null_pointer_node);
-  PUSH_FIELD_VALUE (cons, "subclass_next", null_pointer_node);
   PUSH_FIELD_VALUE (cons, "constants", constant_pool_constructor);
   PUSH_FIELD_VALUE (cons, "methods",
 		    build1 (ADDR_EXPR, method_ptr_type_node, methods_decl));
   PUSH_FIELD_VALUE (cons, "nmethods",  build_int_2 (method_count, 0));
-  PUSH_FIELD_VALUE (cons, "msize", TYPE_NVIRTUALS (type));
+  PUSH_FIELD_VALUE (cons, "method_count", TYPE_NVIRTUALS (type));
   PUSH_FIELD_VALUE (cons, "fields",
 		    fields_decl == NULL_TREE ? null_pointer_node
 		    : build1 (ADDR_EXPR, field_ptr_type_node, fields_decl));
-  PUSH_FIELD_VALUE (cons, "bfsize", size_in_bytes (type));
-  PUSH_FIELD_VALUE (cons, "nfields", build_int_2 (field_count, 0));
-  PUSH_FIELD_VALUE (cons, "nsfields", build_int_2 (static_field_count, 0));
+  PUSH_FIELD_VALUE (cons, "size_in_bytes", size_in_bytes (type));
+  PUSH_FIELD_VALUE (cons, "field_count", build_int_2 (field_count, 0));
+  PUSH_FIELD_VALUE (cons, "static_field_count",
+		    build_int_2 (static_field_count, 0));
   /* For now, we let Kaffe fill in the dtable.  */
   PUSH_FIELD_VALUE (cons, "dtable",
 		    dtable_decl == NULL_TREE ? null_pointer_node
 		    : build1 (ADDR_EXPR, dtable_ptr_type, dtable_decl));
   PUSH_FIELD_VALUE (cons, "interfaces", interfaces);
   PUSH_FIELD_VALUE (cons, "loader", null_pointer_node);
-  PUSH_FIELD_VALUE (cons, "interface_len", build_int_2 (interface_len, 0));
+  PUSH_FIELD_VALUE (cons, "interface_count", build_int_2 (interface_len, 0));
   PUSH_FIELD_VALUE (cons, "state",
 		    flag_assume_compiled ? integer_four_node
 		    : integer_two_node);

gcc/java/decl.c

@@ -585,21 +585,19 @@ init_decl_processing ()
   PUSH_FIELD (class_type_node, field, "name", utf8const_ptr_type);
   PUSH_FIELD (class_type_node, field, "accflags", access_flags_type_node);
   PUSH_FIELD (class_type_node, field, "superclass", class_ptr_type);
-  PUSH_FIELD (class_type_node, field, "subclass_head", class_ptr_type);
-  PUSH_FIELD (class_type_node, field, "subclass_next", class_ptr_type);
   PUSH_FIELD (class_type_node, field, "constants", constants_type_node);
   PUSH_FIELD (class_type_node, field, "methods", method_ptr_type_node);
   PUSH_FIELD (class_type_node, field, "nmethods", short_type_node);
-  PUSH_FIELD (class_type_node, field, "msize", short_type_node);
+  PUSH_FIELD (class_type_node, field, "method_count", short_type_node);
   PUSH_FIELD (class_type_node, field, "fields", field_ptr_type_node);
-  PUSH_FIELD (class_type_node, field, "bfsize", int_type_node);
-  PUSH_FIELD (class_type_node, field, "nfields", short_type_node);
-  PUSH_FIELD (class_type_node, field, "nsfields", short_type_node);
+  PUSH_FIELD (class_type_node, field, "size_in_bytes", int_type_node);
+  PUSH_FIELD (class_type_node, field, "field_count", short_type_node);
+  PUSH_FIELD (class_type_node, field, "static_field_count", short_type_node);
   PUSH_FIELD (class_type_node, field, "dtable", dtable_ptr_type);
   PUSH_FIELD (class_type_node, field, "interfaces",
 	      build_pointer_type (class_ptr_type));
   PUSH_FIELD (class_type_node, field, "loader", ptr_type_node);
-  PUSH_FIELD (class_type_node, field, "interface_len", short_type_node);
+  PUSH_FIELD (class_type_node, field, "interface_count", short_type_node);
   PUSH_FIELD (class_type_node, field, "state", byte_type_node);
   PUSH_FIELD (class_type_node, field, "thread", ptr_type_node);
   for (t = TYPE_FIELDS (class_type_node);  t != NULL_TREE;  t = TREE_CHAIN (t))