X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fjv-lang.h;h=9694107eb7920c952a2b990cc2c5c01c0bf997b9;hb=6caf069d241a7789d53b771d0b3e1c6d32150e0c;hp=f434aca17c9583f4a9b78f56fcaa5b62a1385ab6;hpb=197e01b6dcd118b70ed3621b62b2ff3fa929d50f;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/jv-lang.h b/gdb/jv-lang.h
index f434aca17c..9694107eb7 100644
--- a/gdb/jv-lang.h
+++ b/gdb/jv-lang.h
@@ -1,13 +1,13 @@
 /* Java language support definitions for GDB, the GNU debugger.
 
-   Copyright (C) 1997, 1998, 1999, 2000, 2005 Free Software Foundation,
-   Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2005, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -16,59 +16,61 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef JV_LANG_H
 #define JV_LANG_H
 
 struct value;
 
-extern int java_parse (void);	/* Defined in jv-exp.y */
+extern int java_parse (void);		/* Defined in jv-exp.y */
 
 extern void java_error (char *);	/* Defined in jv-exp.y */
 
-/* sizeof (struct Object) */
-#define JAVA_OBJECT_SIZE (get_java_object_header_size ())
-
-extern struct type *java_int_type;
-extern struct type *java_byte_type;
-extern struct type *java_short_type;
-extern struct type *java_long_type;
-extern struct type *java_boolean_type;
-extern struct type *java_char_type;
-extern struct type *java_float_type;
-extern struct type *java_double_type;
-extern struct type *java_void_type;
+struct builtin_java_type
+{
+  struct type *builtin_int;
+  struct type *builtin_byte;
+  struct type *builtin_short;
+  struct type *builtin_long;
+  struct type *builtin_boolean;
+  struct type *builtin_char;
+  struct type *builtin_float;
+  struct type *builtin_double;
+  struct type *builtin_void;
+};
+
+extern const struct builtin_java_type *builtin_java_type (struct gdbarch *);
 
 extern int java_val_print (struct type *, const gdb_byte *, int, CORE_ADDR,
-			   struct ui_file *, int, int, int,
-			   enum val_prettyprint);
+			   struct ui_file *, int,
+			   const struct value *,
+			   const struct value_print_options *);
 
-extern int java_value_print (struct value *, struct ui_file *, int,
-			     enum val_prettyprint);
+extern int java_value_print (struct value *, struct ui_file *,
+			     const struct value_print_options *);
 
 extern struct value *java_class_from_object (struct value *);
 
-extern struct type *type_from_class (struct value *);
+extern struct type *type_from_class (struct gdbarch *, struct value *);
 
-extern struct type *java_primitive_type (int signature);
+extern struct type *java_primitive_type (struct gdbarch *, int signature);
 
-extern struct type *java_primitive_type_from_name (char *, int);
+extern struct type *java_primitive_type_from_name (struct gdbarch *,
+						   char *, int);
 
 extern struct type *java_array_type (struct type *, int);
 
 extern struct type *get_java_object_type (void);
-extern int get_java_object_header_size (void);
+extern int get_java_object_header_size (struct gdbarch *);
 
 extern struct type *java_lookup_class (char *);
 
 extern int is_object_type (struct type *);
 
 /* Defined in jv-typeprint.c */
-extern void java_print_type (struct type *, char *, struct ui_file *, int,
-			     int);
+extern void java_print_type (struct type *, const char *,
+			     struct ui_file *, int, int);
 
 extern char *java_demangle_type_signature (char *);