From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22887 invoked by alias); 8 Apr 2010 20:58:36 -0000 Received: (qmail 22871 invoked by uid 22791); 8 Apr 2010 20:58:34 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=BAYES_00,MSGID_MULTIPLE_AT X-Spam-Check-By: sourceware.org Received: from mailhost.u-strasbg.fr (HELO mailhost.u-strasbg.fr) (130.79.200.156) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 08 Apr 2010 20:58:25 +0000 Received: from baal.u-strasbg.fr (baal.u-strasbg.fr [IPv6:2001:660:2402::41]) by mailhost.u-strasbg.fr (8.14.3/jtpda-5.5pre1) with ESMTP id o38Kw3An090980 ; Thu, 8 Apr 2010 22:58:04 +0200 (CEST) (envelope-from pierre.muller@ics-cnrs.unistra.fr) Received: from mailserver.u-strasbg.fr (ms1.u-strasbg.fr [IPv6:2001:660:2402:d::10]) by baal.u-strasbg.fr (8.14.0/jtpda-5.5pre1) with ESMTP id o38Kw3Mx079051 ; Thu, 8 Apr 2010 22:58:03 +0200 (CEST) (envelope-from pierre.muller@ics-cnrs.unistra.fr) Received: from d620muller (lec67-4-82-230-53-140.fbx.proxad.net [82.230.53.140]) (user=mullerp mech=LOGIN) by mailserver.u-strasbg.fr (8.14.3/jtpda-5.5pre1) with ESMTP id o38Kw1jw085379 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NO) ; Thu, 8 Apr 2010 22:58:02 +0200 (CEST) (envelope-from pierre.muller@ics-cnrs.unistra.fr) From: "Pierre Muller" To: Cc: , "'Eli Zaretskii'" References: <11484.4708740295$1268865815@news.gmane.org> <83r5ngix6d.fsf@gnu.org> <15103.6087111153$1269298497@news.gmane.org> <006101cad0ec$cb7915d0$626b4170$%muller@ics-cnrs.unistra.fr> <83tyrwxy72.fsf@gnu.org> <000f01cad17e$7686f140$6394d3c0$%muller@ics-cnrs.unistra.fr> <83aatnxqhm.fsf@gnu.org> <002701cad513$e44a7420$acdf5c60$%muller@ics-cnrs.unistra.fr> <83fx38xydz.fsf@gnu.org> In-Reply-To: <83fx38xydz.fsf@gnu.org> Subject: [RFA-v3] Allow explicit 16 or 32 char in 'x /s' Date: Thu, 08 Apr 2010 20:58:00 -0000 Message-ID: <001201cad75e$2ef3fcc0$8cdbf640$@muller@ics-cnrs.unistra.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2010-04/txt/msg00192.txt.bz2 I added the comment from Eli about the documentation and send this one out as a RFA. Pierre 2010-04-08 Pierre Muller * gdbtypes.h (builtin_type): Add BUILTIN_CHAR16 and BUILTIN_CHAR32 fields. * gdbtypes.c (gdbtypes_post_init): Set BUILTIN_CHAR16 and BUILTIN_CHAR32 fields. * printcmd.c (decode_format): Set char size to '\0' for strings unless explicit size is given. (print_formatted): Correct calculation of NEXT_ADDRESS for 16 or 32 bit strings. (do_examine): Do not force byte size for strings. Use builtin_char16 and builtin_char32 types to display 16 or 32 bit-wide strings. (x_command): Set LAST_SIZE to 'b' for string type. 2010-04-08 Pierre Muller * gdb.texinfo (Examining memory): Update for change in string display with explicit size. 2010-04-08 Pierre Muller * gdb.base/charset.c (Strin16, String32): New variables. * gdb.base/charset.exp (gdb_test): Test correct display of 16 or 32 bit strings. Index: src/gdb/gdbtypes.c =================================================================== RCS file: /cvs/src/src/gdb/gdbtypes.c,v retrieving revision 1.188 diff -u -p -r1.188 gdbtypes.c --- src/gdb/gdbtypes.c 1 Mar 2010 17:19:22 -0000 1.188 +++ src/gdb/gdbtypes.c 5 Apr 2010 22:53:39 -0000 @@ -3474,6 +3474,13 @@ gdbtypes_post_init (struct gdbarch *gdba TYPE_NOTTEXT (builtin_type->builtin_int8) = 1; TYPE_NOTTEXT (builtin_type->builtin_uint8) = 1; + /* Multi-byte character types. */ + builtin_type->builtin_char16 + = arch_integer_type (gdbarch, 16, 0, "char16_t"); + builtin_type->builtin_char32 + = arch_integer_type (gdbarch, 32, 0, "char32_t"); + + /* Default data/code pointer types. */ builtin_type->builtin_data_ptr = lookup_pointer_type (builtin_type->builtin_void); Index: src/gdb/gdbtypes.h =================================================================== RCS file: /cvs/src/src/gdb/gdbtypes.h,v retrieving revision 1.125 diff -u -p -r1.125 gdbtypes.h --- src/gdb/gdbtypes.h 15 Mar 2010 02:42:54 -0000 1.125 +++ src/gdb/gdbtypes.h 5 Apr 2010 22:53:39 -0000 @@ -1099,6 +1099,9 @@ struct builtin_type struct type *builtin_int128; struct type *builtin_uint128; + /* Multi-byte character types. */ + struct type *builtin_char16; + struct type *builtin_char32; /* Pointer types. */ Index: src/gdb/printcmd.c =================================================================== RCS file: /cvs/src/src/gdb/printcmd.c,v retrieving revision 1.173 diff -u -p -r1.173 printcmd.c --- src/gdb/printcmd.c 5 Mar 2010 20:18:14 -0000 1.173 +++ src/gdb/printcmd.c 5 Apr 2010 22:53:40 -0000 @@ -260,6 +260,11 @@ decode_format (char **string_ptr, int of /* Characters default to one byte. */ val.size = osize ? 'b' : osize; break; + case 's': + /* Display strings with byte size chars unless explicitly specified. */ + val.size = '\0'; + break; + default: /* The default is the size most recently specified. */ val.size = osize; @@ -295,7 +300,7 @@ print_formatted (struct value *val, int next_address = (value_address (val) + val_print_string (elttype, value_address (val), -1, - stream, options)); + stream, options) * len); } return; @@ -802,9 +807,11 @@ do_examine (struct format_data fmt, stru next_gdbarch = gdbarch; next_address = addr; - /* String or instruction format implies fetch single bytes - regardless of the specified size. */ - if (format == 's' || format == 'i') + /* Instruction format implies fetch single bytes + regardless of the specified size. + The case of strings is handled n decode_format, only explicit + size operator are not changed to 'b'. */ + if (format == 'i') size = 'b'; if (size == 'a') @@ -831,6 +838,27 @@ do_examine (struct format_data fmt, stru else if (size == 'g') val_type = builtin_type (next_gdbarch)->builtin_int64; + if (format == 's') + { + struct type *char_type = NULL; + /* Search for "char16_t" or "char32_t" types or fall back to 8-bit char + if type is not found. */ + if (size == 'h') + char_type = builtin_type (next_gdbarch)->builtin_char16; + else if (size == 'w') + char_type = builtin_type (next_gdbarch)->builtin_char32; + if (char_type) + val_type = char_type; + else + { + if (size != '\0' && size != 'b') + warning (_("Unable to display strings with size '%c', using 'b' \ +instead."), size); + size = 'b'; + val_type = builtin_type (next_gdbarch)->builtin_int8; + } + } + maxelts = 8; if (size == 'w') maxelts = 4; @@ -1412,8 +1440,11 @@ x_command (char *exp, int from_tty) do_examine (fmt, next_gdbarch, next_address); /* If the examine succeeds, we remember its size and format for next - time. */ - last_size = fmt.size; + time. Set last_size to 'b' for strings. */ + if (fmt.format == 's') + last_size = 'b'; + else + last_size = fmt.size; last_format = fmt.format; /* Set a couple of internal variables if appropriate. */ Index: src/gdb/doc/gdb.texinfo =================================================================== RCS file: /cvs/src/src/gdb/doc/gdb.texinfo,v retrieving revision 1.696 diff -u -p -r1.696 gdb.texinfo --- src/gdb/doc/gdb.texinfo 5 Apr 2010 17:14:57 -0000 1.696 +++ src/gdb/doc/gdb.texinfo 5 Apr 2010 22:53:53 -0000 @@ -7236,8 +7236,16 @@ Giant words (eight bytes). @end table Each time you specify a unit size with @code{x}, that size becomes the -default unit the next time you use @code{x}. (For the @samp{s} and -@samp{i} formats, the unit size is ignored and is normally not written.) +default unit the next time you use @code{x}. For the @samp{i} format, +the unit size is ignored and is normally not written. For the @samp{s} format, +the unit size defaults to @samp{b}, unless it is explicitly given. +Use @kbd{x /hs} to display 16-bit char strings and @kbd{x /ws} to display +32-bit strings. The next use of @kbd{x /s} will again display 8-bit strings. +Note that the results depend on the programming language of the +current compilation unit. If the language is C, the @samp{s} +modifier will use the UTF-16 encoding while @samp{w} will use +UTF-32. The encoding is set by the programming language and cannot +be altered. @item @var{addr}, starting display address @var{addr} is the address where you want @value{GDBN} to begin displaying Index: src/gdb/testsuite/gdb.base/charset.c =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/charset.c,v retrieving revision 1.12 diff -u -p -r1.12 charset.c --- src/gdb/testsuite/gdb.base/charset.c 1 Jan 2010 07:32:00 -0000 1.12 +++ src/gdb/testsuite/gdb.base/charset.c 5 Apr 2010 22:53:54 -0000 @@ -65,6 +65,9 @@ typedef unsigned int char32_t; char16_t uvar; char32_t Uvar; +char16_t *String16; +char32_t *String32; + /* A typedef to a typedef should also work. */ typedef wchar_t my_wchar_t; my_wchar_t myvar; Index: src/gdb/testsuite/gdb.base/charset.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/charset.exp,v retrieving revision 1.21 diff -u -p -r1.21 charset.exp --- src/gdb/testsuite/gdb.base/charset.exp 17 Feb 2010 22:05:58 -0000 1.21 +++ src/gdb/testsuite/gdb.base/charset.exp 5 Apr 2010 22:53:54 -0000 @@ -616,4 +616,21 @@ gdb_test "print 'a' == 'a' || 'b' == 'b' ".* = 1" \ "EVAL_SKIP cleanup handling regression test" + +proc string_display { var_name set_prefix x_size x_type} { + gdb_test "set ${var_name} = ${set_prefix}\"Test String\\0with zeroes\"" "" "Assign ${var_name} with prefix ${set_prefix}" + gdb_test "x /2${x_size}s ${var_name}" ".* ${x_type}\"Test String\"\[\r\n\]+.* ${x_type}\"with zeroes\"" "Display String ${var_name} with x/${x_size}s" +} + +string_display String16 u h u +if {$wchar_size == 2} { + string_display String16 L h u +} + +string_display String32 U w U +if {$wchar_size == 4} { + string_display String32 L w U +} + + gdb_exit