class.c (make_class_data): Renamed fields: nmethods to method_count, method_count...

	* class.c (make_class_data): Renamed fields: nmethods to
	method_count, method_count to dtable_method_count.  Always set
	`state' field to 0.
	* decl.c (init_decl_processing): Likewise.

From-SVN: r23449

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 2f4383ed21c5a58e2aa3a746cd9fd055e3004961..3ebdedc18d766bb885020bd08f2893517644b211 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,10 @@
+1998-10-30  Tom Tromey  <tromey@cygnus.com>
+
+       * class.c (make_class_data): Renamed fields: nmethods to
+       method_count, method_count to dtable_method_count.  Always set
+       `state' field to 0.
+       * decl.c (init_decl_processing): Likewise.
+
 Wed Oct 28 08:03:31 1998  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 
        * class.c (layout_class): Don't mangle <finit>, produce

diff --git a/gcc/java/class.c b/gcc/java/class.c
index 4a382b99506ca52d37ed9ed00ade52fef3b27ac7..d0fb94b26240b1f08b5b73cf6ecf51b6506330f2 100644 (file)
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -1089,8 +1089,8 @@ make_class_data (type)
   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, "method_count", TYPE_NVIRTUALS (type));
+  PUSH_FIELD_VALUE (cons, "method_count",  build_int_2 (method_count, 0));
+  PUSH_FIELD_VALUE (cons, "dtable_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));
@@ -1105,9 +1105,7 @@ make_class_data (type)
   PUSH_FIELD_VALUE (cons, "interfaces", interfaces);
   PUSH_FIELD_VALUE (cons, "loader", null_pointer_node);
   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);
+  PUSH_FIELD_VALUE (cons, "state", integer_zero_node);
 
   PUSH_FIELD_VALUE (cons, "thread", null_pointer_node);
 

diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index a49f22b31fd874a96018c4d2a78d1c36cbb80c74..6c44d15efb0c1038acc8bfe4b77b7ac48201d498 100644 (file)
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -589,8 +589,8 @@ init_decl_processing ()
   PUSH_FIELD (class_type_node, field, "superclass", 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, "method_count", short_type_node);
+  PUSH_FIELD (class_type_node, field, "dtable_method_count", short_type_node);
   PUSH_FIELD (class_type_node, field, "fields", field_ptr_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);