Commit 78857b4e by Tom Tromey Committed by Tom Tromey

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
parent a9aefc1e
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> 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 * decl.c (long_zero_node, float_zero_node, double_zero_node): New
......
...@@ -1078,9 +1078,9 @@ make_class_data (type) ...@@ -1078,9 +1078,9 @@ make_class_data (type)
START_RECORD_CONSTRUCTOR (temp, object_type_node); START_RECORD_CONSTRUCTOR (temp, object_type_node);
#if 0 #if 0
PUSH_FIELD_VALUE (temp, "dtable", NULL_TREE); PUSH_FIELD_VALUE (temp, "vtable", NULL_TREE);
#else #else
PUSH_FIELD_VALUE (temp, "dtable", PUSH_FIELD_VALUE (temp, "vtable",
build1 (ADDR_EXPR, dtable_ptr_type, class_dtable_decl)); build1 (ADDR_EXPR, dtable_ptr_type, class_dtable_decl));
#endif #endif
PUSH_FIELD_VALUE (temp, "sync_info", null_pointer_node); PUSH_FIELD_VALUE (temp, "sync_info", null_pointer_node);
...@@ -1103,7 +1103,7 @@ make_class_data (type) ...@@ -1103,7 +1103,7 @@ make_class_data (type)
PUSH_FIELD_VALUE (cons, "methods", PUSH_FIELD_VALUE (cons, "methods",
build1 (ADDR_EXPR, method_ptr_type_node, methods_decl)); 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, "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", PUSH_FIELD_VALUE (cons, "fields",
fields_decl == NULL_TREE ? null_pointer_node fields_decl == NULL_TREE ? null_pointer_node
: build1 (ADDR_EXPR, field_ptr_type_node, fields_decl)); : build1 (ADDR_EXPR, field_ptr_type_node, fields_decl));
...@@ -1111,7 +1111,7 @@ make_class_data (type) ...@@ -1111,7 +1111,7 @@ make_class_data (type)
PUSH_FIELD_VALUE (cons, "field_count", build_int_2 (field_count, 0)); PUSH_FIELD_VALUE (cons, "field_count", build_int_2 (field_count, 0));
PUSH_FIELD_VALUE (cons, "static_field_count", PUSH_FIELD_VALUE (cons, "static_field_count",
build_int_2 (static_field_count, 0)); build_int_2 (static_field_count, 0));
PUSH_FIELD_VALUE (cons, "dtable", PUSH_FIELD_VALUE (cons, "vtable",
dtable_decl == NULL_TREE ? null_pointer_node dtable_decl == NULL_TREE ? null_pointer_node
: build1 (ADDR_EXPR, dtable_ptr_type, dtable_decl)); : build1 (ADDR_EXPR, dtable_ptr_type, dtable_decl));
PUSH_FIELD_VALUE (cons, "interfaces", interfaces); PUSH_FIELD_VALUE (cons, "interfaces", interfaces);
......
...@@ -581,7 +581,7 @@ init_decl_processing () ...@@ -581,7 +581,7 @@ init_decl_processing ()
dtable_type = make_node (RECORD_TYPE); dtable_type = make_node (RECORD_TYPE);
dtable_ptr_type = build_pointer_type (dtable_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); 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)) for (t = TYPE_FIELDS (object_type_node); t != NULL_TREE; t = TREE_CHAIN (t))
FIELD_PRIVATE (t) = 1; FIELD_PRIVATE (t) = 1;
...@@ -609,12 +609,12 @@ init_decl_processing () ...@@ -609,12 +609,12 @@ init_decl_processing ()
PUSH_FIELD (class_type_node, field, "constants", constants_type_node); 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, "methods", method_ptr_type_node);
PUSH_FIELD (class_type_node, field, "method_count", 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, "vtable_method_count", short_type_node);
PUSH_FIELD (class_type_node, field, "fields", field_ptr_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, "size_in_bytes", int_type_node);
PUSH_FIELD (class_type_node, field, "field_count", short_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, "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", PUSH_FIELD (class_type_node, field, "interfaces",
build_pointer_type (class_ptr_type)); build_pointer_type (class_ptr_type));
PUSH_FIELD (class_type_node, field, "loader", ptr_type_node); PUSH_FIELD (class_type_node, field, "loader", ptr_type_node);
......
...@@ -1392,7 +1392,7 @@ invoke_build_dtable (is_invoke_interface, arg_list) ...@@ -1392,7 +1392,7 @@ invoke_build_dtable (is_invoke_interface, arg_list)
object_type_node : TREE_VALUE (arg_list)); object_type_node : TREE_VALUE (arg_list));
if (dtable_ident == NULL_TREE) if (dtable_ident == NULL_TREE)
dtable_ident = get_identifier ("dtable"); dtable_ident = get_identifier ("vtable");
dtable = build1 (INDIRECT_REF, object_type_node, objectref ); dtable = build1 (INDIRECT_REF, object_type_node, objectref );
dtable = build (COMPONENT_REF, dtable_ptr_type, dtable, dtable = build (COMPONENT_REF, dtable_ptr_type, dtable,
lookup_field (&object_type_node, dtable_ident)); lookup_field (&object_type_node, dtable_ident));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment