diff options
| author | Tom Tromey <tromey@cygnus.com> | 1998-10-30 00:35:32 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 1998-10-30 00:35:32 +0000 |
| commit | 9cfceb60cded797ae431d53e30b279afb161d3c1 (patch) | |
| tree | 299473034cd88f8a96a4600141440dc773f50ce1 /gcc/java | |
| parent | 8b83b2a74d04968a5cc09150acd6f442d044f91d (diff) | |
| download | gcc-9cfceb60cded797ae431d53e30b279afb161d3c1.zip gcc-9cfceb60cded797ae431d53e30b279afb161d3c1.tar.gz gcc-9cfceb60cded797ae431d53e30b279afb161d3c1.tar.bz2 | |
class.c (make_class_data): Renamed fields: nmethods to method_count, method_count to dtable_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
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/java/class.c | 8 | ||||
| -rw-r--r-- | gcc/java/decl.c | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 2f4383e..3ebdedc 100644 --- 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 4a382b9..d0fb94b 100644 --- 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 a49f22b..6c44d15 100644 --- 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); |