From 45d5d5ca5d94e8690843688cef1e320aca18d39e Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Tue, 23 Jun 2009 18:11:09 +0000 Subject: * jv-lang.h (JAVA_OBJECT_SIZE): Remove. (get_java_object_header_size): Add GDBARCH parameter. * jv-lang.c (get_java_object_header_size): Add GDBARCH parameter. Use it instead of current_gdbarch. (evaluate_subexp_java): Replace JAVA_OBJECT_SIZE with call to get_java_object_header_size. * jv-valprint.c (java_value_print): Likewise. --- gdb/jv-lang.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gdb/jv-lang.h') diff --git a/gdb/jv-lang.h b/gdb/jv-lang.h index b658ca3..df97d3f 100644 --- a/gdb/jv-lang.h +++ b/gdb/jv-lang.h @@ -27,9 +27,6 @@ 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; @@ -58,7 +55,7 @@ extern struct type *java_primitive_type_from_name (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 *); -- cgit v1.1