* gdbtypes.h (make_function_type): Remove OBJFILE parameter.

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

diff --git a/gdb/jv-lang.c b/gdb/jv-lang.c
index 8a5a8f9c06683e4d184be6cb3275cb369585f6ad..f53c656f68373246085232c902727b8dd0e25d7a 100644 (file)
--- a/gdb/jv-lang.c
+++ b/gdb/jv-lang.c
@@ -1,6 +1,6 @@
 /* Java language support routines for GDB, the GNU debugger.
 
 /* Java language support routines for GDB, the GNU debugger.
 

-   Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, 2007, 2008
+   Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, 2007, 2008, 2009

    Free Software Foundation, Inc.
 
    This file is part of GDB.
    Free Software Foundation, Inc.
 
    This file is part of GDB.


@@ -61,7 +61,8 @@ static char *get_java_utf8_name (struct obstack *obstack, struct value *name);
 static int java_class_is_primitive (struct value *clas);
 static struct value *java_value_string (char *ptr, int len);
 
 static int java_class_is_primitive (struct value *clas);
 static struct value *java_value_string (char *ptr, int len);
 

-static void java_emit_char (int c, struct ui_file * stream, int quoter);
+static void java_emit_char (int c, struct type *type,
+                           struct ui_file * stream, int quoter);

 
 static char *java_class_name_from_physname (const char *physname);
 
 
 static char *java_class_name_from_physname (const char *physname);
 


@@ -189,7 +190,7 @@ java_lookup_class (char *name)
   TYPE_CODE (type) = TYPE_CODE_STRUCT;
   INIT_CPLUS_SPECIFIC (type);
   TYPE_TAG_NAME (type) = obsavestring (name, strlen (name), &objfile->objfile_obstack);
   TYPE_CODE (type) = TYPE_CODE_STRUCT;
   INIT_CPLUS_SPECIFIC (type);
   TYPE_TAG_NAME (type) = obsavestring (name, strlen (name), &objfile->objfile_obstack);

-  TYPE_FLAGS (type) |= TYPE_FLAG_STUB;
+  TYPE_STUB (type) = 1;

   TYPE ? = addr;
   return type;
 #else
   TYPE ? = addr;
   return type;
 #else


@@ -210,8 +211,7 @@ get_java_utf8_name (struct obstack *obstack, struct value *name)
   CORE_ADDR data_addr;
   temp = value_struct_elt (&temp, NULL, "length", NULL, "structure");
   name_length = (int) value_as_long (temp);
   CORE_ADDR data_addr;
   temp = value_struct_elt (&temp, NULL, "length", NULL, "structure");
   name_length = (int) value_as_long (temp);

-  data_addr = VALUE_ADDRESS (temp) + value_offset (temp)
-    + TYPE_LENGTH (value_type (temp));
+  data_addr = value_address (temp) + TYPE_LENGTH (value_type (temp));

   chrs = obstack_alloc (obstack, name_length + 1);
   chrs[name_length] = '\0';
   read_memory (data_addr, (gdb_byte *) chrs, name_length);
   chrs = obstack_alloc (obstack, name_length + 1);
   chrs[name_length] = '\0';
   read_memory (data_addr, (gdb_byte *) chrs, name_length);


@@ -266,7 +266,7 @@ type_from_class (struct value *clas)
        return NULL;
       clas = value_ind (clas);
     }
        return NULL;
       clas = value_ind (clas);
     }

-  addr = VALUE_ADDRESS (clas) + value_offset (clas);
+  addr = value_address (clas);

 
 #if 0
   get_java_class_symtab ();
 
 #if 0
   get_java_class_symtab ();


@@ -302,7 +302,10 @@ type_from_class (struct value *clas)
   if (type != NULL)
     return type;
 
   if (type != NULL)
     return type;
 

-  type = alloc_type (objfile);
+  /* Do not use the "fake" dynamics objfile to own dynamically generated
+     types, as it does not provide an architecture, and it would not help
+     manage the lifetime of these types anyway.  */
+  type = alloc_type (NULL);

   TYPE_CODE (type) = TYPE_CODE_STRUCT;
   INIT_CPLUS_SPECIFIC (type);
 
   TYPE_CODE (type) = TYPE_CODE_STRUCT;
   INIT_CPLUS_SPECIFIC (type);
 


@@ -421,8 +424,7 @@ java_link_class_type (struct type *type, struct value *clas)
 
   fields = NULL;
   nfields--;                   /* First set up dummy "class" field. */
 
   fields = NULL;
   nfields--;                   /* First set up dummy "class" field. */

-  SET_FIELD_PHYSADDR (TYPE_FIELD (type, nfields),
-                     VALUE_ADDRESS (clas) + value_offset (clas));
+  SET_FIELD_PHYSADDR (TYPE_FIELD (type, nfields), value_address (clas));

   TYPE_FIELD_NAME (type, nfields) = "class";
   TYPE_FIELD_TYPE (type, nfields) = value_type (clas);
   SET_TYPE_FIELD_PRIVATE (type, nfields);
   TYPE_FIELD_NAME (type, nfields) = "class";
   TYPE_FIELD_TYPE (type, nfields) = value_type (clas);
   SET_TYPE_FIELD_PRIVATE (type, nfields);


@@ -439,7 +441,9 @@ java_link_class_type (struct type *type, struct value *clas)
        }
       else
        {                       /* Re-use field value for next field. */
        }
       else
        {                       /* Re-use field value for next field. */

-         VALUE_ADDRESS (field) += TYPE_LENGTH (value_type (field));
+         CORE_ADDR addr
+           = value_address (field) + TYPE_LENGTH (value_type (field));
+         set_value_address (field, addr);

          set_value_lazy (field, 1);
        }
       temp = field;
          set_value_lazy (field, 1);
        }
       temp = field;


@@ -509,7 +513,9 @@ java_link_class_type (struct type *type, struct value *clas)
        }
       else
        {                       /* Re-use method value for next method. */
        }
       else
        {                       /* Re-use method value for next method. */

-         VALUE_ADDRESS (method) += TYPE_LENGTH (value_type (method));
+         CORE_ADDR addr
+           = value_address (method) + TYPE_LENGTH (value_type (method));
+         set_value_address (method, addr);

          set_value_lazy (method, 1);
        }
 
          set_value_lazy (method, 1);
        }
 


@@ -556,7 +562,8 @@ java_link_class_type (struct type *type, struct value *clas)
        }
       fn_fields[k].physname = "";
       fn_fields[k].is_stub = 1;
        }
       fn_fields[k].physname = "";
       fn_fields[k].is_stub = 1;

-      fn_fields[k].type = make_function_type (java_void_type, NULL);   /* FIXME */
+      /* FIXME */
+      fn_fields[k].type = lookup_function_type (java_void_type);

       TYPE_CODE (fn_fields[k].type) = TYPE_CODE_METHOD;
     }
 
       TYPE_CODE (fn_fields[k].type) = TYPE_CODE_METHOD;
     }
 


@@ -585,11 +592,11 @@ get_java_object_type (void)
 }
 
 int
 }
 
 int

-get_java_object_header_size (void)
+get_java_object_header_size (struct gdbarch *gdbarch)

 {
   struct type *objtype = get_java_object_type ();
   if (objtype == NULL)
 {
   struct type *objtype = get_java_object_type ();
   if (objtype == NULL)

-    return (2 * gdbarch_ptr_bit (current_gdbarch) / TARGET_CHAR_BIT);
+    return (2 * gdbarch_ptr_bit (gdbarch) / TARGET_CHAR_BIT);

   else
     return TYPE_LENGTH (objtype);
 }
   else
     return TYPE_LENGTH (objtype);
 }


@@ -775,7 +782,7 @@ java_array_type (struct type *type, int dims)
 
   while (dims-- > 0)
     {
 
   while (dims-- > 0)
     {

-      range_type = create_range_type (NULL, builtin_type_int, 0, 0);
+      range_type = create_range_type (NULL, builtin_type_int32, 0, 0);

       /* FIXME  This is bogus!  Java arrays are not gdb arrays! */
       type = create_array_type (NULL, type, range_type);
     }
       /* FIXME  This is bogus!  Java arrays are not gdb arrays! */
       type = create_array_type (NULL, type, range_type);
     }


@@ -796,7 +803,7 @@ java_value_string (char *ptr, int len)
    characters and strings is language specific. */
 
 static void
    characters and strings is language specific. */
 
 static void

-java_emit_char (int c, struct ui_file *stream, int quoter)
+java_emit_char (int c, struct type *type, struct ui_file *stream, int quoter)

 {
   switch (c)
     {
 {
   switch (c)
     {


@@ -896,7 +903,7 @@ evaluate_subexp_java (struct type *expect_type, struct expression *exp,
          if (noside == EVAL_AVOID_SIDE_EFFECTS)
            return value_zero (el_type, VALUE_LVAL (arg1));
          address = value_as_address (arg1);
          if (noside == EVAL_AVOID_SIDE_EFFECTS)
            return value_zero (el_type, VALUE_LVAL (arg1));
          address = value_as_address (arg1);

-         address += JAVA_OBJECT_SIZE;
+         address += get_java_object_header_size (exp->gdbarch);

          read_memory (address, buf4, 4);
          length = (long) extract_signed_integer (buf4, 4);
          index = (long) value_as_long (arg2);
          read_memory (address, buf4, 4);
          length = (long) extract_signed_integer (buf4, 4);
          index = (long) value_as_long (arg2);


@@ -938,7 +945,7 @@ evaluate_subexp_java (struct type *expect_type, struct expression *exp,
 standard:
   return evaluate_subexp_standard (expect_type, exp, pos, noside);
 nosideret:
 standard:
   return evaluate_subexp_standard (expect_type, exp, pos, noside);
 nosideret:

-  return value_from_longest (builtin_type_long, (LONGEST) 1);
+  return value_from_longest (builtin_type_int8, (LONGEST) 1);

 }
 
 static char *java_demangle (const char *mangled, int options)
 }
 
 static char *java_demangle (const char *mangled, int options)


@@ -1040,6 +1047,51 @@ const struct op_print java_op_print_tab[] =
   {NULL, 0, 0, 0}
 };
 
   {NULL, 0, 0, 0}
 };
 

+enum java_primitive_types
+{
+  java_primitive_type_int,
+  java_primitive_type_short,
+  java_primitive_type_long,
+  java_primitive_type_byte,
+  java_primitive_type_boolean,
+  java_primitive_type_char,
+  java_primitive_type_float,
+  java_primitive_type_double,
+  java_primitive_type_void,
+  nr_java_primitive_types
+};
+
+static void
+java_language_arch_info (struct gdbarch *gdbarch,
+                        struct language_arch_info *lai)
+{
+  lai->string_char_type = java_char_type;
+  lai->primitive_type_vector
+    = GDBARCH_OBSTACK_CALLOC (gdbarch, nr_java_primitive_types + 1,
+                              struct type *);
+  lai->primitive_type_vector [java_primitive_type_int]
+    = java_int_type;
+  lai->primitive_type_vector [java_primitive_type_short]
+    = java_short_type;
+  lai->primitive_type_vector [java_primitive_type_long]
+    = java_long_type;
+  lai->primitive_type_vector [java_primitive_type_byte]
+    = java_byte_type;
+  lai->primitive_type_vector [java_primitive_type_boolean]
+    = java_boolean_type;
+  lai->primitive_type_vector [java_primitive_type_char]
+    = java_char_type;
+  lai->primitive_type_vector [java_primitive_type_float]
+    = java_float_type;
+  lai->primitive_type_vector [java_primitive_type_double]
+    = java_double_type;
+  lai->primitive_type_vector [java_primitive_type_void]
+    = java_void_type;
+
+  lai->bool_type_symbol = "boolean";
+  lai->bool_type_default = java_boolean_type;
+}
+

 const struct exp_descriptor exp_descriptor_java = 
 {
   print_subexp_standard,
 const struct exp_descriptor exp_descriptor_java = 
 {
   print_subexp_standard,


@@ -1057,6 +1109,7 @@ const struct language_defn java_language_defn =
   type_check_off,
   case_sensitive_on,
   array_row_major,
   type_check_off,
   case_sensitive_on,
   array_row_major,

+  macro_expansion_no,

   &exp_descriptor_java,
   java_parse,
   java_error,
   &exp_descriptor_java,
   java_parse,
   java_error,


@@ -1065,6 +1118,7 @@ const struct language_defn java_language_defn =
   c_printstr,                  /* Function to print string constant */
   java_emit_char,              /* Function to print a single character */
   java_print_type,             /* Print a type using appropriate syntax */
   c_printstr,                  /* Function to print string constant */
   java_emit_char,              /* Function to print a single character */
   java_print_type,             /* Print a type using appropriate syntax */

+  default_print_typedef,       /* Print a typedef using appropriate syntax */

   java_val_print,              /* Print a value using appropriate syntax */
   java_value_print,            /* Print a top-level value */
   NULL,                                /* Language specific skip_trampoline */
   java_val_print,              /* Print a value using appropriate syntax */
   java_value_print,            /* Print a top-level value */
   NULL,                                /* Language specific skip_trampoline */


@@ -1078,9 +1132,10 @@ const struct language_defn java_language_defn =
   0,                           /* String lower bound */
   default_word_break_characters,
   default_make_symbol_completion_list,
   0,                           /* String lower bound */
   default_word_break_characters,
   default_make_symbol_completion_list,

-  c_language_arch_info,
+  java_language_arch_info,

   default_print_array_index,
   default_pass_by_reference,
   default_print_array_index,
   default_pass_by_reference,

+  default_get_string,

   LANG_MAGIC
 };
 
   LANG_MAGIC
 };