gdb/doc/

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

diff --git a/gdb/p-lang.c b/gdb/p-lang.c
index 7697279c6b9f2c1a34ef94bb757154c4751040f4..64d2e9f9be6ab66b742b7ae692ba8e9b20f971bc 100644 (file)
--- a/gdb/p-lang.c
+++ b/gdb/p-lang.c
@@ -1,6 +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
+   Copyright (C) 2000, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010

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


@@ -86,7 +86,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,10 +97,11 @@ 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,
+                       int *length_size, int *string_pos,
+                      struct type **char_type,

                       char **arrayname)
 {
                       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.  */


@@ -114,8 +115,8 @@ 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)
            *arrayname = TYPE_FIELDS (type)[1].name;
          return 2;
          if (arrayname)
            *arrayname = TYPE_FIELDS (type)[1].name;
          return 2;


@@ -126,15 +127,20 @@ is_pascal_string_type (struct type *type,int *length_pos,
           && strcmp (TYPE_FIELDS (type)[0].name, "Capacity") == 0
           && strcmp (TYPE_FIELDS (type)[1].name, "length") == 0)
         {
           && strcmp (TYPE_FIELDS (type)[0].name, "Capacity") == 0
           && strcmp (TYPE_FIELDS (type)[1].name, "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;
           /* FIXME: how can I detect wide chars in GPC ?? */
            *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;
+          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)
            *arrayname = TYPE_FIELDS (type)[2].name;
          return 3;
          if (arrayname)
            *arrayname = TYPE_FIELDS (type)[2].name;
          return 3;


@@ -152,10 +158,7 @@ static void pascal_one_char (int, struct ui_file *, int *);
 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 +179,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
    characters and strings is language specific. */
 
 static void
 
 /* 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. */
 
 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,18 +212,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)

 {
 {

+  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)


@@ -226,13 +242,14 @@ pascal_printstr (struct ui_file *stream, const gdb_byte *string,
       return;
     }
 
       return;
     }
 

-  for (i = 0; i < length && things_printed < print_max; ++i)
+  for (i = 0; i < length && things_printed < options->print_max; ++i)

     {
       /* Position of the character we are examining
          to see whether it is repeated.  */
       unsigned int rep1;
       /* Number of repetitions we have detected so far.  */
       unsigned int reps;
     {
       /* Position of the character we are examining
          to see whether it is repeated.  */
       unsigned int rep1;
       /* Number of repetitions we have detected so far.  */
       unsigned int reps;

+      unsigned long int current_char;

 
       QUIT;
 
 
       QUIT;
 


@@ -242,42 +259,46 @@ 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;
        }
 

-      if (reps > repeat_count_threshold)
+      if (reps > options->repeat_count_threshold)

        {
          if (in_quotes)
            {
        {
          if (in_quotes)
            {

-             if (inspect_it)
+             if (options->inspect_it)

                fputs_filtered ("\\', ", stream);
              else
                fputs_filtered ("', ", stream);
              in_quotes = 0;
            }
                fputs_filtered ("\\', ", stream);
              else
                fputs_filtered ("', ", stream);
              in_quotes = 0;
            }

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

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

-         things_printed += repeat_count_threshold;
+         things_printed += options->repeat_count_threshold;

          need_comma = 1;
        }
       else
        {
          need_comma = 1;
        }
       else
        {

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

            {
            {

-             if (inspect_it)
+             if (options->inspect_it)

                fputs_filtered ("\\'", stream);
              else
                fputs_filtered ("'", stream);
              in_quotes = 1;
            }
                fputs_filtered ("\\'", stream);
              else
                fputs_filtered ("'", stream);
              in_quotes = 1;
            }

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

          ++things_printed;
        }
     }
          ++things_printed;
        }
     }


@@ -285,7 +306,7 @@ pascal_printstr (struct ui_file *stream, const gdb_byte *string,
   /* Terminate the quotes if necessary.  */
   if (in_quotes)
     {
   /* Terminate the quotes if necessary.  */
   if (in_quotes)
     {

-      if (inspect_it)
+      if (options->inspect_it)

        fputs_filtered ("\\'", stream);
       else
        fputs_filtered ("'", stream);
        fputs_filtered ("\\'", stream);
       else
        fputs_filtered ("'", stream);


@@ -294,153 +315,6 @@ pascal_printstr (struct ui_file *stream, const gdb_byte *string,
   if (force_ellipses || i < length)
     fputs_filtered ("...", stream);
 }
   if (force_ellipses || i < length)
     fputs_filtered ("...", stream);
 }

-
-/* Create a fundamental Pascal type using default reasonable for the current
-   target machine.
-
-   Some object/debugging file formats (DWARF version 1, COFF, etc) do not
-   define fundamental types such as "int" or "double".  Others (stabs or
-   DWARF version 2, etc) do define fundamental types.  For the formats which
-   don't provide fundamental types, gdb can create such types using this
-   function.
-
-   FIXME:  Some compilers distinguish explicitly signed integral types
-   (signed short, signed int, signed long) from "regular" integral types
-   (short, int, long) in the debugging information.  There is some dis-
-   agreement as to how useful this feature is.  In particular, gcc does
-   not support this.  Also, only some debugging formats allow the
-   distinction to be passed on to a debugger.  For now, we always just
-   use "short", "int", or "long" as the type name, for both the implicit
-   and explicitly signed types.  This also makes life easier for the
-   gdb test suite since we don't have to account for the differences
-   in output depending upon what the compiler and debugging format
-   support.  We will probably have to re-examine the issue when gdb
-   starts taking it's fundamental type information directly from the
-   debugging information supplied by the compiler.  fnf@cygnus.com */
-
-/* Note there might be some discussion about the choosen correspondance
-   because it mainly reflects Free Pascal Compiler setup for now PM */
-
-
-struct type *
-pascal_create_fundamental_type (struct objfile *objfile, int typeid)
-{
-  struct type *type = NULL;
-
-  switch (typeid)
-    {
-    default:
-      /* FIXME:  For now, if we are asked to produce a type not in this
-         language, create the equivalent of a C integer type with the
-         name "<?type?>".  When all the dust settles from the type
-         reconstruction work, this should probably become an error. */
-      type = init_type (TYPE_CODE_INT,
-                       gdbarch_int_bit (current_gdbarch) / TARGET_CHAR_BIT,
-                       0, "<?type?>", objfile);
-      warning (_("internal error: no Pascal fundamental type %d"), typeid);
-      break;
-    case FT_VOID:
-      type = init_type (TYPE_CODE_VOID,
-                       TARGET_CHAR_BIT / TARGET_CHAR_BIT,
-                       0, "void", objfile);
-      break;
-    case FT_CHAR:
-      type = init_type (TYPE_CODE_CHAR,
-                       TARGET_CHAR_BIT / TARGET_CHAR_BIT,
-                       0, "char", objfile);
-      break;
-    case FT_SIGNED_CHAR:
-      type = init_type (TYPE_CODE_INT,
-                       TARGET_CHAR_BIT / TARGET_CHAR_BIT,
-                       0, "shortint", objfile);
-      break;
-    case FT_UNSIGNED_CHAR:
-      type = init_type (TYPE_CODE_INT,
-                       TARGET_CHAR_BIT / TARGET_CHAR_BIT,
-                       TYPE_FLAG_UNSIGNED, "byte", objfile);
-      break;
-    case FT_SHORT:
-      type = init_type (TYPE_CODE_INT,
-                       gdbarch_short_bit (current_gdbarch) / TARGET_CHAR_BIT,
-                       0, "integer", objfile);
-      break;
-    case FT_SIGNED_SHORT:
-      type = init_type (TYPE_CODE_INT,
-                       gdbarch_short_bit (current_gdbarch) / TARGET_CHAR_BIT,
-                       0, "integer", objfile);         /* FIXME-fnf */
-      break;
-    case FT_UNSIGNED_SHORT:
-      type = init_type (TYPE_CODE_INT,
-                       gdbarch_short_bit (current_gdbarch) / TARGET_CHAR_BIT,
-                       TYPE_FLAG_UNSIGNED, "word", objfile);
-      break;
-    case FT_INTEGER:
-      type = init_type (TYPE_CODE_INT,
-                       gdbarch_int_bit (current_gdbarch) / TARGET_CHAR_BIT,
-                       0, "longint", objfile);
-      break;
-    case FT_SIGNED_INTEGER:
-      type = init_type (TYPE_CODE_INT,
-                       gdbarch_int_bit (current_gdbarch) / TARGET_CHAR_BIT,
-                       0, "longint", objfile);         /* FIXME -fnf */
-      break;
-    case FT_UNSIGNED_INTEGER:
-      type = init_type (TYPE_CODE_INT,
-                       gdbarch_int_bit (current_gdbarch) / TARGET_CHAR_BIT,
-                       TYPE_FLAG_UNSIGNED, "cardinal", objfile);
-      break;
-    case FT_LONG:
-      type = init_type (TYPE_CODE_INT,
-                       gdbarch_long_bit (current_gdbarch) / TARGET_CHAR_BIT,
-                       0, "long", objfile);
-      break;
-    case FT_SIGNED_LONG:
-      type = init_type (TYPE_CODE_INT,
-                       gdbarch_long_bit (current_gdbarch) / TARGET_CHAR_BIT,
-                       0, "long", objfile);    /* FIXME -fnf */
-      break;
-    case FT_UNSIGNED_LONG:
-      type = init_type (TYPE_CODE_INT,
-                       gdbarch_long_bit (current_gdbarch) / TARGET_CHAR_BIT,
-                       TYPE_FLAG_UNSIGNED, "unsigned long", objfile);
-      break;
-    case FT_LONG_LONG:
-      type = init_type (TYPE_CODE_INT,
-                       gdbarch_long_long_bit
-                         (current_gdbarch) / TARGET_CHAR_BIT,
-                       0, "long long", objfile);
-      break;
-    case FT_SIGNED_LONG_LONG:
-      type = init_type (TYPE_CODE_INT,
-                       gdbarch_long_long_bit
-                         (current_gdbarch) / TARGET_CHAR_BIT,
-                       0, "signed long long", objfile);
-      break;
-    case FT_UNSIGNED_LONG_LONG:
-      type = init_type (TYPE_CODE_INT,
-                       gdbarch_long_long_bit
-                         (current_gdbarch) / TARGET_CHAR_BIT,
-                       TYPE_FLAG_UNSIGNED, "unsigned long long", objfile);
-      break;
-    case FT_FLOAT:
-      type = init_type (TYPE_CODE_FLT,
-                       gdbarch_float_bit (current_gdbarch) / TARGET_CHAR_BIT,
-                       0, "float", objfile);
-      break;
-    case FT_DBL_PREC_FLOAT:
-      type = init_type (TYPE_CODE_FLT,
-                       gdbarch_double_bit (current_gdbarch) / TARGET_CHAR_BIT,
-                       0, "double", objfile);
-      break;
-    case FT_EXT_PREC_FLOAT:
-      type = init_type (TYPE_CODE_FLT,
-                       gdbarch_long_double_bit (current_gdbarch)
-                         / TARGET_CHAR_BIT,
-                       0, "extended", objfile);
-      break;
-    }
-  return (type);
-}

 \f
 
 /* Table mapping opcodes into strings for printing operators
 \f
 
 /* Table mapping opcodes into strings for printing operators


@@ -502,6 +376,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,


@@ -540,6 +415,9 @@ pascal_language_arch_info (struct gdbarch *gdbarch,
     = builtin->builtin_complex;
   lai->primitive_type_vector [pascal_primitive_type_double_complex]
     = builtin->builtin_double_complex;
     = builtin->builtin_complex;
   lai->primitive_type_vector [pascal_primitive_type_double_complex]
     = builtin->builtin_double_complex;

+
+  lai->bool_type_symbol = "boolean";
+  lai->bool_type_default = builtin->builtin_bool;

 }
 
 const struct language_defn pascal_language_defn =
 }
 
 const struct language_defn pascal_language_defn =


@@ -550,6 +428,7 @@ const struct language_defn pascal_language_defn =
   type_check_on,
   case_sensitive_on,
   array_row_major,
   type_check_on,
   case_sensitive_on,
   array_row_major,

+  macro_expansion_no,

   &exp_descriptor_standard,
   pascal_parse,
   pascal_error,
   &exp_descriptor_standard,
   pascal_parse,
   pascal_error,


@@ -557,12 +436,12 @@ const struct language_defn pascal_language_defn =
   pascal_printchar,            /* Print a character constant */
   pascal_printstr,             /* Function to print string constant */
   pascal_emit_char,            /* Print a single char */
   pascal_printchar,            /* Print a character constant */
   pascal_printstr,             /* Function to print string constant */
   pascal_emit_char,            /* Print a single char */

-  pascal_create_fundamental_type,      /* Create fundamental type in this language */

   pascal_print_type,           /* Print a type using appropriate syntax */
   pascal_print_type,           /* Print a type using appropriate syntax */

+  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 */
   NULL,                                /* Language specific skip_trampoline */
   pascal_val_print,            /* Print a value using appropriate syntax */
   pascal_value_print,          /* Print a top-level value */
   NULL,                                /* Language specific skip_trampoline */

-  value_of_this,               /* value_of_this */
+  "this",                      /* name_of_this */

   basic_lookup_symbol_nonlocal,        /* lookup_symbol_nonlocal */
   basic_lookup_transparent_type,/* lookup_transparent_type */
   NULL,                                /* Language specific symbol demangler */
   basic_lookup_symbol_nonlocal,        /* lookup_symbol_nonlocal */
   basic_lookup_transparent_type,/* lookup_transparent_type */
   NULL,                                /* Language specific symbol demangler */


@@ -571,9 +450,11 @@ const struct language_defn pascal_language_defn =
   1,                           /* c-style arrays */
   0,                           /* String lower bound */
   default_word_break_characters,
   1,                           /* c-style arrays */
   0,                           /* String lower bound */
   default_word_break_characters,

+  default_make_symbol_completion_list,

   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,

   LANG_MAGIC
 };
 
   LANG_MAGIC
 };