2010-04-04 Stan Shebs <stan@codesourcery.com>

[deliverable/binutils-gdb.git] / gdb / jv-lang.h

diff --git a/gdb/jv-lang.h b/gdb/jv-lang.h
index 51bada293f46751e8a23e4fdfd6ddf487f6b322e..95d63842d2baf1ff970cf3684dea87d01602eb06 100644 (file)
--- a/gdb/jv-lang.h
+++ b/gdb/jv-lang.h
@@ -1,6 +1,6 @@
 /* Java language support definitions for GDB, the GNU debugger.
 
-   Copyright (C) 1997, 1998, 1999, 2000, 2005, 2007, 2008
+   Copyright (C) 1997, 1998, 1999, 2000, 2005, 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -27,38 +27,41 @@ 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_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 *);