projects
/
platform
/
upstream
/
binutils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
packaging: support aarch64 build
[platform/upstream/binutils.git]
/
gdb
/
jv-typeprint.c
diff --git
a/gdb/jv-typeprint.c
b/gdb/jv-typeprint.c
index
8d9ebfd
..
24f62ef
100644
(file)
--- a/
gdb/jv-typeprint.c
+++ b/
gdb/jv-typeprint.c
@@
-1,6
+1,5
@@
/* Support for printing Java types for GDB, the GNU debugger.
/* Support for printing Java types for GDB, the GNU debugger.
- Copyright (C) 1997, 1998, 1999, 2000, 2007, 2008, 2009, 2010, 2011
- Free Software Foundation, Inc.
+ Copyright (C) 1997-2014 Free Software Foundation, Inc.
This file is part of GDB.
This file is part of GDB.
@@
-23,23
+22,24
@@
#include "gdbtypes.h"
#include "value.h"
#include "demangle.h"
#include "gdbtypes.h"
#include "value.h"
#include "demangle.h"
+#include "gdb-demangle.h"
#include "jv-lang.h"
#include "jv-lang.h"
-#include "gdb_string.h"
#include "typeprint.h"
#include "c-lang.h"
#include "cp-abi.h"
#include "typeprint.h"
#include "c-lang.h"
#include "cp-abi.h"
-#include "
gdb_asse
rt.h"
+#include "
cp-suppo
rt.h"
/* Local functions */
static void java_type_print_base (struct type * type,
struct ui_file *stream, int show,
/* 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)
{
static void
java_type_print_derivation_info (struct ui_file *stream, struct type *type)
{
- char *name;
+ c
onst c
har *name;
int i;
int n_bases;
int prev;
int i;
int n_bases;
int prev;
@@
-84,7
+84,7
@@
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,
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;
{
int i;
int len;
@@
-115,7
+115,8
@@
java_type_print_base (struct type *type, struct ui_file *stream, int show,
switch (TYPE_CODE (type))
{
case TYPE_CODE_PTR:
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:
break;
case TYPE_CODE_STRUCT:
@@
-192,7
+193,7
@@
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),
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");
}
fprintf_filtered (stream, ";\n");
}
@@
-208,8
+209,8
@@
java_type_print_base (struct type *type, struct ui_file *stream, int show,
{
struct fn_field *f;
int j;
{
struct fn_field *f;
int j;
- char *method_name;
- char *name;
+ c
onst c
har *method_name;
+ c
onst c
har *name;
int is_constructor;
int n_overloads;
int is_constructor;
int n_overloads;
@@
-237,7
+238,8
@@
java_type_print_base (struct type *type, struct ui_file *stream, int show,
physname[p - real_physname] = '\0';
is_full_physname_constructor
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;
|| is_destructor_name (physname));
QUIT;
@@
-283,8
+285,8
@@
java_type_print_base (struct type *type, struct ui_file *stream, int show,
mangled_name = physname;
demangled_name =
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);
if (demangled_name == NULL)
demangled_name = xstrdup (mangled_name);
@@
-323,22
+325,20
@@
java_type_print_base (struct type *type, struct ui_file *stream, int show,
break;
default:
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. */
}
}
/* 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, const char *varstring,
void
java_print_type (struct type *type, const char *varstring,
- struct ui_file *stream, int show, int level)
+ struct ui_file *stream, int show, int level,
+ const struct type_print_options *flags)
{
int demangled_args;
{
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')
{
if (varstring != NULL && *varstring != '\0')
{
@@
-350,5
+350,5
@@
java_print_type (struct type *type, const char *varstring,
so don't print an additional pair of ()'s. */
demangled_args = varstring != NULL && strchr (varstring, '(') != NULL;
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
);
}
}