ld relro

[platform/upstream/binutils.git] / gdb / p-lang.c

diff --git a/gdb/p-lang.c b/gdb/p-lang.c
index cd4285d..98fcc3b 100644 (file)
--- a/gdb/p-lang.c
+++ b/gdb/p-lang.c
@@ -1,7 +1,6 @@
 /* Pascal language support routines for GDB, the GNU debugger.
 
 /* Pascal language support routines for GDB, the GNU debugger.
 

-   Copyright (C) 2000, 2002, 2003, 2004, 2005, 2007, 2008
-   Free Software Foundation, Inc.
+   Copyright (C) 2000-2014 Free Software Foundation, Inc.

 
    This file is part of GDB.
 
 
    This file is part of GDB.
 


@@ -21,22 +20,22 @@
 /* This file is derived from c-lang.c */
 
 #include "defs.h"
 /* This file is derived from c-lang.c */
 
 #include "defs.h"

-#include "gdb_string.h"

 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
 #include "parser-defs.h"
 #include "language.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
 #include "parser-defs.h"
 #include "language.h"

+#include "varobj.h"

 #include "p-lang.h"
 #include "valprint.h"
 #include "value.h"
 #include <ctype.h>
 #include "p-lang.h"
 #include "valprint.h"
 #include "value.h"
 #include <ctype.h>

- 
+

 extern void _initialize_pascal_language (void);
 
 
 /* All GPC versions until now (2007-09-27) also define a symbol called
 extern void _initialize_pascal_language (void);
 
 
 /* All GPC versions until now (2007-09-27) also define a symbol called

-   '_p_initialize'. Check for the presence of this symbol first.  */
+   '_p_initialize'.  Check for the presence of this symbol first.  */

 static const char GPC_P_INITIALIZE[] = "_p_initialize";
 
 /* The name of the symbol that GPC uses as the name of the main
 static const char GPC_P_INITIALIZE[] = "_p_initialize";
 
 /* The name of the symbol that GPC uses as the name of the main


@@ -54,28 +53,28 @@ static const char GPC_MAIN_PROGRAM_NAME_2[] = "pascal_main_program";
    so that it finds the even if the program was compiled
    without debugging information.
    According to information supplied by Waldeck Hebisch,
    so that it finds the even if the program was compiled
    without debugging information.
    According to information supplied by Waldeck Hebisch,

-   this should work for all versions posterior to June 2000. */
+   this should work for all versions posterior to June 2000.  */

 
 const char *
 pascal_main_name (void)
 {
 
 const char *
 pascal_main_name (void)
 {

-  struct minimal_symbol *msym;
+  struct bound_minimal_symbol msym;

 
   msym = lookup_minimal_symbol (GPC_P_INITIALIZE, NULL, NULL);
 
   /*  If '_p_initialize' was not found, the main program is likely not
      written in Pascal.  */
 
   msym = lookup_minimal_symbol (GPC_P_INITIALIZE, NULL, NULL);
 
   /*  If '_p_initialize' was not found, the main program is likely not
      written in Pascal.  */

-  if (msym == NULL)
+  if (msym.minsym == NULL)

     return NULL;
 
   msym = lookup_minimal_symbol (GPC_MAIN_PROGRAM_NAME_1, NULL, NULL);
     return NULL;
 
   msym = lookup_minimal_symbol (GPC_MAIN_PROGRAM_NAME_1, NULL, NULL);

-  if (msym != NULL)
+  if (msym.minsym != NULL)

     {
       return GPC_MAIN_PROGRAM_NAME_1;
     }
 
   msym = lookup_minimal_symbol (GPC_MAIN_PROGRAM_NAME_2, NULL, NULL);
     {
       return GPC_MAIN_PROGRAM_NAME_1;
     }
 
   msym = lookup_minimal_symbol (GPC_MAIN_PROGRAM_NAME_2, NULL, NULL);

-  if (msym != NULL)
+  if (msym.minsym != NULL)

     {
       return GPC_MAIN_PROGRAM_NAME_2;
     }
     {
       return GPC_MAIN_PROGRAM_NAME_2;
     }


@@ -86,7 +85,7 @@ pascal_main_name (void)
 }
 
 /* Determines if type TYPE is a pascal string type.
 }
 
 /* Determines if type TYPE is a pascal string type.

-   Returns 1 if the type is a known pascal type
+   Returns a positive value if the type is a known pascal string type.

    This function is used by p-valprint.c code to allow better string display.
    If it is a pascal string type, then it also sets info needed
    to get the length and the data of the string
    This function is used by p-valprint.c code to allow better string display.
    If it is a pascal string type, then it also sets info needed
    to get the length and the data of the string


@@ -97,16 +96,19 @@ pascal_main_name (void)
    but this does not happen for Free Pascal nor for GPC.  */
 int
 is_pascal_string_type (struct type *type,int *length_pos,
    but this does not happen for Free Pascal nor for GPC.  */
 int
 is_pascal_string_type (struct type *type,int *length_pos,

-                       int *length_size, int *string_pos, int *char_size,
-                      char **arrayname)
+                       int *length_size, int *string_pos,
+                      struct type **char_type,
+                      const char **arrayname)

 {
 {

-  if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
+  if (type != NULL && TYPE_CODE (type) == TYPE_CODE_STRUCT)

     {
       /* Old Borland type pascal strings from Free Pascal Compiler.  */
       /* Two fields: length and st.  */
     {
       /* Old Borland type pascal strings from Free Pascal Compiler.  */
       /* Two fields: length and st.  */

-      if (TYPE_NFIELDS (type) == 2 
-          && strcmp (TYPE_FIELDS (type)[0].name, "length") == 0 
-          && strcmp (TYPE_FIELDS (type)[1].name, "st") == 0)
+      if (TYPE_NFIELDS (type) == 2
+         && TYPE_FIELD_NAME (type, 0)
+         && strcmp (TYPE_FIELD_NAME (type, 0), "length") == 0
+         && TYPE_FIELD_NAME (type, 1)
+         && strcmp (TYPE_FIELD_NAME (type, 1), "st") == 0)

         {
           if (length_pos)
            *length_pos = TYPE_FIELD_BITPOS (type, 0) / TARGET_CHAR_BIT;
         {
           if (length_pos)
            *length_pos = TYPE_FIELD_BITPOS (type, 0) / TARGET_CHAR_BIT;


@@ -114,29 +116,36 @@ is_pascal_string_type (struct type *type,int *length_pos,
            *length_size = TYPE_LENGTH (TYPE_FIELD_TYPE (type, 0));
           if (string_pos)
            *string_pos = TYPE_FIELD_BITPOS (type, 1) / TARGET_CHAR_BIT;
            *length_size = TYPE_LENGTH (TYPE_FIELD_TYPE (type, 0));
           if (string_pos)
            *string_pos = TYPE_FIELD_BITPOS (type, 1) / TARGET_CHAR_BIT;

-          if (char_size)
-           *char_size = 1;
+          if (char_type)
+           *char_type = TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (type, 1));

          if (arrayname)
          if (arrayname)

-           *arrayname = TYPE_FIELDS (type)[1].name;
+           *arrayname = TYPE_FIELD_NAME (type, 1);

          return 2;
         };
       /* GNU pascal strings.  */
       /* Three fields: Capacity, length and schema$ or _p_schema.  */
       if (TYPE_NFIELDS (type) == 3
          return 2;
         };
       /* GNU pascal strings.  */
       /* Three fields: Capacity, length and schema$ or _p_schema.  */
       if (TYPE_NFIELDS (type) == 3

-          && strcmp (TYPE_FIELDS (type)[0].name, "Capacity") == 0
-          && strcmp (TYPE_FIELDS (type)[1].name, "length") == 0)
+         && TYPE_FIELD_NAME (type, 0)
+         && strcmp (TYPE_FIELD_NAME (type, 0), "Capacity") == 0
+         && TYPE_FIELD_NAME (type, 1)
+         && strcmp (TYPE_FIELD_NAME (type, 1), "length") == 0)

         {
         {

-          if (length_pos)
+         if (length_pos)

            *length_pos = TYPE_FIELD_BITPOS (type, 1) / TARGET_CHAR_BIT;
            *length_pos = TYPE_FIELD_BITPOS (type, 1) / TARGET_CHAR_BIT;

-          if (length_size)
+         if (length_size)

            *length_size = TYPE_LENGTH (TYPE_FIELD_TYPE (type, 1));
            *length_size = TYPE_LENGTH (TYPE_FIELD_TYPE (type, 1));

-          if (string_pos)
+         if (string_pos)

            *string_pos = TYPE_FIELD_BITPOS (type, 2) / TARGET_CHAR_BIT;
            *string_pos = TYPE_FIELD_BITPOS (type, 2) / TARGET_CHAR_BIT;

-          /* FIXME: how can I detect wide chars in GPC ?? */
-          if (char_size)
-           *char_size = 1;
+          /* FIXME: how can I detect wide chars in GPC ??  */
+          if (char_type)
+           {
+             *char_type = TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (type, 2));
+
+             if (TYPE_CODE (*char_type) == TYPE_CODE_ARRAY)
+               *char_type = TYPE_TARGET_TYPE (*char_type);
+           }

          if (arrayname)
          if (arrayname)

-           *arrayname = TYPE_FIELDS (type)[2].name;
+           *arrayname = TYPE_FIELD_NAME (type, 2);

          return 3;
         };
     }
          return 3;
         };
     }


@@ -147,15 +156,12 @@ static void pascal_one_char (int, struct ui_file *, int *);
 
 /* Print the character C on STREAM as part of the contents of a literal
    string.
 
 /* Print the character C on STREAM as part of the contents of a literal
    string.

-   In_quotes is reset to 0 if a char is written with #4 notation */
+   In_quotes is reset to 0 if a char is written with #4 notation.  */

 
 static void
 pascal_one_char (int c, struct ui_file *stream, int *in_quotes)
 {
 
 static void
 pascal_one_char (int c, struct ui_file *stream, int *in_quotes)
 {

-
-  c &= 0xFF;                   /* Avoid sign bit follies */
-
-  if ((c == '\'') || (PRINT_LITERAL_FORM (c)))
+  if (c == '\'' || ((unsigned int) c <= 0xff && (PRINT_LITERAL_FORM (c))))

     {
       if (!(*in_quotes))
        fputs_filtered ("'", stream);
     {
       if (!(*in_quotes))
        fputs_filtered ("'", stream);


@@ -176,25 +182,28 @@ pascal_one_char (int c, struct ui_file *stream, int *in_quotes)
     }
 }
 
     }
 }
 

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

 
 /* Print the character C on STREAM as part of the contents of a literal
    string whose delimiter is QUOTER.  Note that that format for printing
 
 /* Print the character C on STREAM as part of the contents of a literal
    string whose delimiter is QUOTER.  Note that that format for printing

-   characters and strings is language specific. */
+   characters and strings is language specific.  */

 
 static void
 
 static void

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

 {
   int in_quotes = 0;
 {
   int in_quotes = 0;

+

   pascal_one_char (c, stream, &in_quotes);
   if (in_quotes)
     fputs_filtered ("'", stream);
 }
 
 void
   pascal_one_char (c, stream, &in_quotes);
   if (in_quotes)
     fputs_filtered ("'", stream);
 }
 
 void

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

 {
   int in_quotes = 0;
 {
   int in_quotes = 0;

+

   pascal_one_char (c, stream, &in_quotes);
   if (in_quotes)
     fputs_filtered ("'", stream);
   pascal_one_char (c, stream, &in_quotes);
   if (in_quotes)
     fputs_filtered ("'", stream);


@@ -206,19 +215,28 @@ pascal_printchar (int c, struct ui_file *stream)
    had to stop before printing LENGTH characters, or if FORCE_ELLIPSES.  */
 
 void
    had to stop before printing LENGTH characters, or if FORCE_ELLIPSES.  */
 
 void

-pascal_printstr (struct ui_file *stream, const gdb_byte *string,
-                unsigned int length, int width, int force_ellipses,
+pascal_printstr (struct ui_file *stream, struct type *type,
+                const gdb_byte *string, unsigned int length,
+                const char *encoding, int force_ellipses,

                 const struct value_print_options *options)
 {
                 const struct value_print_options *options)
 {

+  enum bfd_endian byte_order = gdbarch_byte_order (get_type_arch (type));

   unsigned int i;
   unsigned int things_printed = 0;
   int in_quotes = 0;
   int need_comma = 0;
   unsigned int i;
   unsigned int things_printed = 0;
   int in_quotes = 0;
   int need_comma = 0;

+  int width;
+
+  /* Preserve TYPE's original type, just set its LENGTH.  */
+  check_typedef (type);
+  width = TYPE_LENGTH (type);

 
   /* If the string was not truncated due to `set print elements', and
      the last byte of it is a null, we don't print that, in traditional C
      style.  */
 
   /* If the string was not truncated due to `set print elements', and
      the last byte of it is a null, we don't print that, in traditional C
      style.  */

-  if ((!force_ellipses) && length > 0 && string[length - 1] == '\0')
+  if ((!force_ellipses) && length > 0
+       && extract_unsigned_integer (string + (length - 1) * width, width,
+                                    byte_order) == 0)

     length--;
 
   if (length == 0)
     length--;
 
   if (length == 0)


@@ -234,6 +252,7 @@ pascal_printstr (struct ui_file *stream, const gdb_byte *string,
       unsigned int rep1;
       /* Number of repetitions we have detected so far.  */
       unsigned int reps;
       unsigned int rep1;
       /* Number of repetitions we have detected so far.  */
       unsigned int reps;

+      unsigned long int current_char;

 
       QUIT;
 
 
       QUIT;
 


@@ -243,9 +262,14 @@ pascal_printstr (struct ui_file *stream, const gdb_byte *string,
          need_comma = 0;
        }
 
          need_comma = 0;
        }
 

+      current_char = extract_unsigned_integer (string + i * width, width,
+                                              byte_order);
+

       rep1 = i + 1;
       reps = 1;
       rep1 = i + 1;
       reps = 1;

-      while (rep1 < length && string[rep1] == string[i])
+      while (rep1 < length
+            && extract_unsigned_integer (string + rep1 * width, width,
+                                         byte_order) == current_char)

        {
          ++rep1;
          ++reps;
        {
          ++rep1;
          ++reps;


@@ -255,13 +279,10 @@ pascal_printstr (struct ui_file *stream, const gdb_byte *string,
        {
          if (in_quotes)
            {
        {
          if (in_quotes)
            {

-             if (options->inspect_it)
-               fputs_filtered ("\\', ", stream);
-             else
-               fputs_filtered ("', ", stream);
+             fputs_filtered ("', ", stream);

              in_quotes = 0;
            }
              in_quotes = 0;
            }

-         pascal_printchar (string[i], stream);
+         pascal_printchar (current_char, type, stream);

          fprintf_filtered (stream, " <repeats %u times>", reps);
          i = rep1 - 1;
          things_printed += options->repeat_count_threshold;
          fprintf_filtered (stream, " <repeats %u times>", reps);
          i = rep1 - 1;
          things_printed += options->repeat_count_threshold;


@@ -269,28 +290,19 @@ pascal_printstr (struct ui_file *stream, const gdb_byte *string,
        }
       else
        {
        }
       else
        {

-         int c = string[i];
-         if ((!in_quotes) && (PRINT_LITERAL_FORM (c)))
+         if ((!in_quotes) && (PRINT_LITERAL_FORM (current_char)))

            {
            {

-             if (options->inspect_it)
-               fputs_filtered ("\\'", stream);
-             else
-               fputs_filtered ("'", stream);
+             fputs_filtered ("'", stream);

              in_quotes = 1;
            }
              in_quotes = 1;
            }

-         pascal_one_char (c, stream, &in_quotes);
+         pascal_one_char (current_char, stream, &in_quotes);

          ++things_printed;
        }
     }
 
   /* Terminate the quotes if necessary.  */
   if (in_quotes)
          ++things_printed;
        }
     }
 
   /* Terminate the quotes if necessary.  */
   if (in_quotes)

-    {
-      if (options->inspect_it)
-       fputs_filtered ("\\'", stream);
-      else
-       fputs_filtered ("'", stream);
-    }
+    fputs_filtered ("'", stream);

 
   if (force_ellipses || i < length)
     fputs_filtered ("...", stream);
 
   if (force_ellipses || i < length)
     fputs_filtered ("...", stream);


@@ -356,6 +368,7 @@ pascal_language_arch_info (struct gdbarch *gdbarch,
                           struct language_arch_info *lai)
 {
   const struct builtin_type *builtin = builtin_type (gdbarch);
                           struct language_arch_info *lai)
 {
   const struct builtin_type *builtin = builtin_type (gdbarch);

+

   lai->string_char_type = builtin->builtin_char;
   lai->primitive_type_vector
     = GDBARCH_OBSTACK_CALLOC (gdbarch, nr_pascal_primitive_types + 1,
   lai->string_char_type = builtin->builtin_char;
   lai->primitive_type_vector
     = GDBARCH_OBSTACK_CALLOC (gdbarch, nr_pascal_primitive_types + 1,


@@ -402,9 +415,9 @@ pascal_language_arch_info (struct gdbarch *gdbarch,
 const struct language_defn pascal_language_defn =
 {
   "pascal",                    /* Language name */
 const struct language_defn pascal_language_defn =
 {
   "pascal",                    /* Language name */

+  "Pascal",

   language_pascal,
   range_check_on,
   language_pascal,
   range_check_on,

-  type_check_on,

   case_sensitive_on,
   array_row_major,
   macro_expansion_no,
   case_sensitive_on,
   array_row_major,
   macro_expansion_no,


@@ -419,6 +432,7 @@ const struct language_defn pascal_language_defn =
   pascal_print_typedef,                /* Print a typedef using appropriate syntax */
   pascal_val_print,            /* Print a value using appropriate syntax */
   pascal_value_print,          /* Print a top-level value */
   pascal_print_typedef,                /* Print a typedef using appropriate syntax */
   pascal_val_print,            /* Print a value using appropriate syntax */
   pascal_value_print,          /* Print a top-level value */

+  default_read_var_value,      /* la_read_var_value */

   NULL,                                /* Language specific skip_trampoline */
   "this",                      /* name_of_this */
   basic_lookup_symbol_nonlocal,        /* lookup_symbol_nonlocal */
   NULL,                                /* Language specific skip_trampoline */
   "this",                      /* name_of_this */
   basic_lookup_symbol_nonlocal,        /* lookup_symbol_nonlocal */


@@ -433,6 +447,10 @@ const struct language_defn pascal_language_defn =
   pascal_language_arch_info,
   default_print_array_index,
   default_pass_by_reference,
   pascal_language_arch_info,
   default_print_array_index,
   default_pass_by_reference,

+  default_get_string,
+  NULL,                                /* la_get_symbol_name_cmp */
+  iterate_over_symbols,
+  &default_varobj_ops,

   LANG_MAGIC
 };
 
   LANG_MAGIC
 };