X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fjv-typeprint.c;h=df46debece361c71261da2eec00c4cc5330f76cb;hb=9f1b45b0da430a7a7abf9e54acbe6f2ef9d3a763;hp=13fc958d2a4590f5c031ba7351d2cb095bee7381;hpb=d6a843b5945deb4cb2df9b07c4f9b19e6fba01de;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/jv-typeprint.c b/gdb/jv-typeprint.c index 13fc958d2a..df46debece 100644 --- a/gdb/jv-typeprint.c +++ b/gdb/jv-typeprint.c @@ -1,6 +1,5 @@ /* Support for printing Java types for GDB, the GNU debugger. - Copyright (C) 1997, 1998, 1999, 2000, 2007, 2008 - Free Software Foundation, Inc. + Copyright (C) 1997-2014 Free Software Foundation, Inc. This file is part of GDB. @@ -23,22 +22,26 @@ #include "gdbtypes.h" #include "value.h" #include "demangle.h" +#include "gdb-demangle.h" #include "jv-lang.h" -#include "gdb_string.h" +#include #include "typeprint.h" #include "c-lang.h" #include "cp-abi.h" +#include "cp-support.h" +#include "gdb_assert.h" /* Local functions */ static void java_type_print_base (struct type * type, struct ui_file *stream, int show, - int level); + int level, + const struct type_print_options *flags); static void java_type_print_derivation_info (struct ui_file *stream, struct type *type) { - char *name; + const char *name; int i; int n_bases; int prev; @@ -83,14 +86,14 @@ java_type_print_derivation_info (struct ui_file *stream, struct type *type) static void java_type_print_base (struct type *type, struct ui_file *stream, int show, - int level) + int level, const struct type_print_options *flags) { int i; int len; char *mangled_name; char *demangled_name; - QUIT; + QUIT; wrap_here (" "); if (type == NULL) @@ -114,13 +117,15 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show, switch (TYPE_CODE (type)) { case TYPE_CODE_PTR: - java_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level); + java_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level, + flags); break; case TYPE_CODE_STRUCT: if (TYPE_TAG_NAME (type) != NULL && TYPE_TAG_NAME (type)[0] == '[') { /* array type */ char *name = java_demangle_type_signature (TYPE_TAG_NAME (type)); + fputs_filtered (name, stream); xfree (name); break; @@ -169,7 +174,7 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show, && is_cplus_marker ((TYPE_FIELD_NAME (type, i))[5])) continue; - /* Don't print the dummy field "class". */ + /* Don't print the dummy field "class". */ if (strncmp (TYPE_FIELD_NAME (type, i), "class", 5) == 0) continue; @@ -190,24 +195,24 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show, java_print_type (TYPE_FIELD_TYPE (type, i), TYPE_FIELD_NAME (type, i), - stream, show - 1, level + 4); + stream, show - 1, level + 4, flags); fprintf_filtered (stream, ";\n"); } - /* If there are both fields and methods, put a space between. */ + /* If there are both fields and methods, put a space between. */ len = TYPE_NFN_FIELDS (type); if (len) fprintf_filtered (stream, "\n"); - /* Print out the methods */ + /* Print out the methods. */ for (i = 0; i < len; i++) { struct fn_field *f; int j; - char *method_name; - char *name; + const char *method_name; + const char *name; int is_constructor; int n_overloads; @@ -219,13 +224,24 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show, for (j = 0; j < n_overloads; j++) { - char *physname; + const char *real_physname; + char *physname, *p; int is_full_physname_constructor; - physname = TYPE_FN_FIELD_PHYSNAME (f, j); + real_physname = TYPE_FN_FIELD_PHYSNAME (f, j); + + /* The physname will contain the return type + after the final closing parenthesis. Strip it off. */ + p = strrchr (real_physname, ')'); + gdb_assert (p != NULL); + ++p; /* Keep the trailing ')'. */ + physname = alloca (p - real_physname + 1); + memcpy (physname, real_physname, p - real_physname); + physname[p - real_physname] = '\0'; is_full_physname_constructor - = (is_constructor_name (physname) + = (TYPE_FN_FIELD_CONSTRUCTOR (f, j) + || is_constructor_name (physname) || is_destructor_name (physname)); QUIT; @@ -268,11 +284,11 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show, /* Build something we can demangle. */ mangled_name = gdb_mangle_name (type, i, j); else - mangled_name = TYPE_FN_FIELD_PHYSNAME (f, j); + mangled_name = physname; demangled_name = - cplus_demangle (mangled_name, - DMGL_ANSI | DMGL_PARAMS | DMGL_JAVA); + gdb_demangle (mangled_name, + DMGL_ANSI | DMGL_PARAMS | DMGL_JAVA); if (demangled_name == NULL) demangled_name = xstrdup (mangled_name); @@ -311,22 +327,20 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show, break; default: - c_type_print_base (type, stream, show, level); + c_type_print_base (type, stream, show, level, flags); } } /* LEVEL is the depth to indent lines by. */ -extern void c_type_print_varspec_suffix (struct type *, struct ui_file *, - int, int, int); - void -java_print_type (struct type *type, char *varstring, struct ui_file *stream, - int show, int level) +java_print_type (struct type *type, const char *varstring, + struct ui_file *stream, int show, int level, + const struct type_print_options *flags) { int demangled_args; - java_type_print_base (type, stream, show, level); + java_type_print_base (type, stream, show, level, flags); if (varstring != NULL && *varstring != '\0') { @@ -335,8 +349,8 @@ java_print_type (struct type *type, char *varstring, struct ui_file *stream, } /* For demangled function names, we have the arglist as part of the name, - so don't print an additional pair of ()'s */ + so don't print an additional pair of ()'s. */ demangled_args = varstring != NULL && strchr (varstring, '(') != NULL; - c_type_print_varspec_suffix (type, stream, show, 0, demangled_args); + c_type_print_varspec_suffix (type, stream, show, 0, demangled_args, flags); }