e06f3d6eba
The gdb format mechanism doesn't currently support the 'z' size modifier, there are a few places in GDB where this is used. Instead of removing these uses lets just add support to GDB for using 'z'. I found this issue when trying to use some of the debug output. Before this commit: (gdb) set debug dwarf-line 9 (gdb) file test Reading symbols from test... Unrecognized format specifier 'z' in printf (No debugging symbols found in test) (gdb) After this commit: (gdb) set debug dwarf-line 9 (gdb) file test Reading symbols from test... Adding dir 1: /usr/include Adding file 1: test.c Adding file 2: stdc-predef.h Processing actual line 3: file 1, address 0x4004a0, is_stmt 1, discrim 0 Processing actual line 4: file 1, address 0x4004a0, is_stmt 1, discrim 0 .... lots of debug output ... Processing actual line 10: file 1, address 0x4003b7, is_stmt 0, discrim 0 (gdb) I've added a self test to cover the integer format size modifiers, including the 'z' modifier. gdb/ChangeLog: * gdbsupport/format.c (format_pieces::format_pieces): Support printf 'z' size modifier. * gdbsupport/format.h (enum argclass): Add size_t_arg. * printcmd.c (ui_printf): Handle size_t_arg. * ui-out.c (ui_out::vmessage): Likewise. * unittests/format_pieces-selftests.c (test_format_int_sizes): New function. (run_tests): Call test_format_int_sizes. gdb/gdbserver/ChangeLog: * ax.c (ax_printf): Handle size_t_arg. Change-Id: Ib6c44d88aa5bce265d757e4c0698881803dd186f
101 lines
2.7 KiB
C++
101 lines
2.7 KiB
C++
/* Parse a printf-style format string.
|
|
|
|
Copyright (C) 1986-2019 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef COMMON_FORMAT_H
|
|
#define COMMON_FORMAT_H
|
|
|
|
#include "gdbsupport/gdb_string_view.h"
|
|
|
|
#if defined(__MINGW32__) && !defined(PRINTF_HAS_LONG_LONG)
|
|
# define USE_PRINTF_I64 1
|
|
# define PRINTF_HAS_LONG_LONG
|
|
#else
|
|
# define USE_PRINTF_I64 0
|
|
#endif
|
|
|
|
/* The argclass represents the general type of data that goes with a
|
|
format directive; int_arg for %d, long_arg for %l, and so forth.
|
|
Note that these primarily distinguish types by size and need for
|
|
special handling, so for instance %u and %x are (at present) also
|
|
classed as int_arg. */
|
|
|
|
enum argclass
|
|
{
|
|
literal_piece,
|
|
int_arg, long_arg, long_long_arg, size_t_arg, ptr_arg,
|
|
string_arg, wide_string_arg, wide_char_arg,
|
|
double_arg, long_double_arg,
|
|
dec32float_arg, dec64float_arg, dec128float_arg
|
|
};
|
|
|
|
/* A format piece is a section of the format string that may include a
|
|
single print directive somewhere in it, and the associated class
|
|
for the argument. */
|
|
|
|
struct format_piece
|
|
{
|
|
format_piece (const char *str, enum argclass argc, int n)
|
|
: string (str),
|
|
argclass (argc),
|
|
n_int_args (n)
|
|
{
|
|
}
|
|
|
|
bool operator== (const format_piece &other) const
|
|
{
|
|
return (this->argclass == other.argclass
|
|
&& gdb::string_view (this->string) == other.string);
|
|
}
|
|
|
|
const char *string;
|
|
enum argclass argclass;
|
|
/* Count the number of preceding 'int' arguments that must be passed
|
|
along. This is used for a width or precision of '*'. Note that
|
|
this feature is only available in "gdb_extensions" mode. */
|
|
int n_int_args;
|
|
};
|
|
|
|
class format_pieces
|
|
{
|
|
public:
|
|
|
|
format_pieces (const char **arg, bool gdb_extensions = false);
|
|
~format_pieces () = default;
|
|
|
|
DISABLE_COPY_AND_ASSIGN (format_pieces);
|
|
|
|
typedef std::vector<format_piece>::iterator iterator;
|
|
|
|
iterator begin ()
|
|
{
|
|
return m_pieces.begin ();
|
|
}
|
|
|
|
iterator end ()
|
|
{
|
|
return m_pieces.end ();
|
|
}
|
|
|
|
private:
|
|
|
|
std::vector<format_piece> m_pieces;
|
|
gdb::unique_xmalloc_ptr<char> m_storage;
|
|
};
|
|
|
|
#endif /* COMMON_FORMAT_H */
|