expr.c (invoke_build_dtable): Renamed dtable -> vtable.

	* expr.c (invoke_build_dtable): Renamed dtable -> vtable.
	* decl.c (init_decl_processing): Renamed dtable -> vtable.
	* class.c (make_class_data): Renamed dtable -> vtable, and
	dtable_method_count -> vtable_method_count.

From-SVN: r24267

4 files changed, 15 insertions, 8 deletions

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index b005ce4..4c89850 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,10 @@
+1998-12-11  Tom Tromey  <tromey@cygnus.com>
+
+	* expr.c (invoke_build_dtable): Renamed dtable -> vtable.
+	* decl.c (init_decl_processing): Renamed dtable -> vtable.
+	* class.c (make_class_data): Renamed dtable -> vtable, and
+	dtable_method_count -> vtable_method_count.
+
 Thu Dec 10 20:00:54 1998  Alexandre Petit-Bianco  <apbianco@sendai.cygnus.com>
 
 	* decl.c (long_zero_node, float_zero_node, double_zero_node): New
diff --git a/gcc/java/class.c b/gcc/java/class.c
index 8deff6e..76f2cb2 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -1078,9 +1078,9 @@ make_class_data (type)
 
   START_RECORD_CONSTRUCTOR (temp, object_type_node);
 #if 0
-  PUSH_FIELD_VALUE (temp, "dtable", NULL_TREE);
+  PUSH_FIELD_VALUE (temp, "vtable", NULL_TREE);
 #else
-  PUSH_FIELD_VALUE (temp, "dtable",
+  PUSH_FIELD_VALUE (temp, "vtable",
 		    build1 (ADDR_EXPR, dtable_ptr_type, class_dtable_decl));
 #endif
   PUSH_FIELD_VALUE (temp, "sync_info", null_pointer_node);
@@ -1103,7 +1103,7 @@ make_class_data (type)
   PUSH_FIELD_VALUE (cons, "methods",
 		    build1 (ADDR_EXPR, method_ptr_type_node, methods_decl));
   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, "vtable_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));
@@ -1111,7 +1111,7 @@ make_class_data (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));
-  PUSH_FIELD_VALUE (cons, "dtable",
+  PUSH_FIELD_VALUE (cons, "vtable",
 		    dtable_decl == NULL_TREE ? null_pointer_node
 		    : build1 (ADDR_EXPR, dtable_ptr_type, dtable_decl));
   PUSH_FIELD_VALUE (cons, "interfaces", interfaces);
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index e0fbcfb..5f93a06 100644
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -581,7 +581,7 @@ init_decl_processing ()
   dtable_type = make_node (RECORD_TYPE);
   dtable_ptr_type = build_pointer_type (dtable_type);
 
-  PUSH_FIELD (object_type_node, field, "dtable", dtable_ptr_type);
+  PUSH_FIELD (object_type_node, field, "vtable", dtable_ptr_type);
   PUSH_FIELD (object_type_node, field, "sync_info", ptr_type_node);
   for (t = TYPE_FIELDS (object_type_node); t != NULL_TREE; t = TREE_CHAIN (t))
     FIELD_PRIVATE (t) = 1;
@@ -609,12 +609,12 @@ init_decl_processing ()
   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, "method_count", short_type_node);
-  PUSH_FIELD (class_type_node, field, "dtable_method_count", short_type_node);
+  PUSH_FIELD (class_type_node, field, "vtable_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);
   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, "vtable", 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);
diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index e97569d..8e4c468 100644
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -1392,7 +1392,7 @@ invoke_build_dtable (is_invoke_interface, arg_list)
 	       object_type_node : TREE_VALUE (arg_list));
   
   if (dtable_ident == NULL_TREE)
-    dtable_ident = get_identifier ("dtable");
+    dtable_ident = get_identifier ("vtable");
   dtable = build1 (INDIRECT_REF, object_type_node, objectref );
   dtable = build (COMPONENT_REF, dtable_ptr_type, dtable,
 		  lookup_field (&object_type_node, dtable_ident));