mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-27 12:03:41 +08:00
Teach GDB that wchar_t is a built-in type in C++ mode
GDB is currently not aware that wchar_t is a built-in type in C++ mode. This is usually not a problem because the debug info describes the type, so when you have a program loaded, you don't notice this. However, if you try expressions involving wchar_t before a program is loaded, gdb errors out: (gdb) p (wchar_t)-1 No symbol table is loaded. Use the "file" command. (gdb) p L"hello" No type named wchar_t. (gdb) ptype L"hello" No type named wchar_t. This commit teaches gdb about the type. After: (gdb) p (wchar_t)-1 $1 = -1 L'\xffffffff' (gdb) p L"hello" $2 = L"hello" (gdb) ptype L"hello" type = wchar_t [6] Unlike char16_t/char32_t, unfortunately, the underlying type of wchar_t is implementation dependent, both size and signness. So this requires adding a couple new gdbarch hooks. I grepped the GCC code base for WCHAR_TYPE and WCHAR_TYPE_SIZE, and it seems to me that the majority of the ABIs have a 4-byte signed wchar_t, so that's what I made the default for GDB too. And then I looked for which ports have a 16-bit and/or unsigned wchar_t, and made GDB follow suit. gdb/ChangeLog: 2017-04-12 Pedro Alves <palves@redhat.com> PR gdb/21323 * c-lang.c (cplus_primitive_types) <cplus_primitive_type_wchar_t>: New enum value. (cplus_language_arch_info): Register cplus_primitive_type_wchar_t. * gdbtypes.h (struct builtin_type) <builtin_wchar>: New field. * gdbtypes.c (gdbtypes_post_init): Create the "wchar_t" type. * gdbarch.sh (wchar_bit, wchar_signed): New per-arch values. * gdbarch.h, gdbarch.c: Regenerate. * aarch64-tdep.c (aarch64_gdbarch_init): Override gdbarch_wchar_bit and gdbarch_wchar_signed. * alpha-tdep.c (alpha_gdbarch_init): Likewise. * arm-tdep.c (arm_gdbarch_init): Likewise. * avr-tdep.c (avr_gdbarch_init): Likewise. * h8300-tdep.c (h8300_gdbarch_init): Likewise. * i386-nto-tdep.c (i386nto_init_abi): Likewise. * i386-tdep.c (i386_go32_init_abi): Likewise. * m32r-tdep.c (m32r_gdbarch_init): Likewise. * moxie-tdep.c (moxie_gdbarch_init): Likewise. * nds32-tdep.c (nds32_gdbarch_init): Likewise. * rs6000-aix-tdep.c (rs6000_aix_init_osabi): Likewise. * sh-tdep.c (sh_gdbarch_init): Likewise. * sparc-tdep.c (sparc32_gdbarch_init): Likewise. * sparc64-tdep.c (sparc64_init_abi): Likewise. * windows-tdep.c (windows_init_abi): Likewise. * xstormy16-tdep.c (xstormy16_gdbarch_init): Likewise. gdb/testsuite/ChangeLog: 2017-04-12 Pedro Alves <palves@redhat.com> PR gdb/21323 * gdb.cp/wide_char_types.c: Include <wchar.h>. (wchar): New global. * gdb.cp/wide_char_types.exp (wide_char_types_program) (do_test_wide_char, wide_char_types_no_program, top level): Add wchar_t testing.
This commit is contained in:
Pedro Alves
parent
53e710acd2
commit
53375380e9
@ -1,3 +1,31 @@
|
||||
2017-04-12 Pedro Alves <palves@redhat.com>
|
||||
|
||||
PR gdb/21323
|
||||
* c-lang.c (cplus_primitive_types) <cplus_primitive_type_wchar_t>:
|
||||
New enum value.
|
||||
(cplus_language_arch_info): Register cplus_primitive_type_wchar_t.
|
||||
* gdbtypes.h (struct builtin_type) <builtin_wchar>: New field.
|
||||
* gdbtypes.c (gdbtypes_post_init): Create the "wchar_t" type.
|
||||
* gdbarch.sh (wchar_bit, wchar_signed): New per-arch values.
|
||||
* gdbarch.h, gdbarch.c: Regenerate.
|
||||
* aarch64-tdep.c (aarch64_gdbarch_init): Override
|
||||
gdbarch_wchar_bit and gdbarch_wchar_signed.
|
||||
* alpha-tdep.c (alpha_gdbarch_init): Likewise.
|
||||
* arm-tdep.c (arm_gdbarch_init): Likewise.
|
||||
* avr-tdep.c (avr_gdbarch_init): Likewise.
|
||||
* h8300-tdep.c (h8300_gdbarch_init): Likewise.
|
||||
* i386-nto-tdep.c (i386nto_init_abi): Likewise.
|
||||
* i386-tdep.c (i386_go32_init_abi): Likewise.
|
||||
* m32r-tdep.c (m32r_gdbarch_init): Likewise.
|
||||
* moxie-tdep.c (moxie_gdbarch_init): Likewise.
|
||||
* nds32-tdep.c (nds32_gdbarch_init): Likewise.
|
||||
* rs6000-aix-tdep.c (rs6000_aix_init_osabi): Likewise.
|
||||
* sh-tdep.c (sh_gdbarch_init): Likewise.
|
||||
* sparc-tdep.c (sparc32_gdbarch_init): Likewise.
|
||||
* sparc64-tdep.c (sparc64_init_abi): Likewise.
|
||||
* windows-tdep.c (windows_init_abi): Likewise.
|
||||
* xstormy16-tdep.c (xstormy16_gdbarch_init): Likewise.
|
||||
|
||||
2017-04-12 Pedro Alves <palves@redhat.com>
|
||||
|
||||
PR c++/21323
|
||||
|
||||
@ -2977,6 +2977,8 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
|
||||
set_gdbarch_long_long_bit (gdbarch, 64);
|
||||
set_gdbarch_ptr_bit (gdbarch, 64);
|
||||
set_gdbarch_char_signed (gdbarch, 0);
|
||||
set_gdbarch_wchar_bit (gdbarch, 64);
|
||||
set_gdbarch_wchar_signed (gdbarch, 0);
|
||||
set_gdbarch_float_format (gdbarch, floatformats_ieee_single);
|
||||
set_gdbarch_double_format (gdbarch, floatformats_ieee_double);
|
||||
set_gdbarch_long_double_format (gdbarch, floatformats_ia64_quad);
|
||||
|
||||
@ -1771,6 +1771,8 @@ alpha_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
|
||||
set_gdbarch_int_bit (gdbarch, 32);
|
||||
set_gdbarch_long_bit (gdbarch, 64);
|
||||
set_gdbarch_long_long_bit (gdbarch, 64);
|
||||
set_gdbarch_wchar_bit (gdbarch, 64);
|
||||
set_gdbarch_wchar_signed (gdbarch, 0);
|
||||
set_gdbarch_float_bit (gdbarch, 32);
|
||||
set_gdbarch_double_bit (gdbarch, 64);
|
||||
set_gdbarch_long_double_bit (gdbarch, 64);
|
||||
|
||||
@ -9404,6 +9404,13 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
|
||||
/* On ARM targets char defaults to unsigned. */
|
||||
set_gdbarch_char_signed (gdbarch, 0);
|
||||
|
||||
/* wchar_t is unsigned under the AAPCS. */
|
||||
if (tdep->arm_abi == ARM_ABI_AAPCS)
|
||||
set_gdbarch_wchar_signed (gdbarch, 0);
|
||||
else
|
||||
set_gdbarch_wchar_signed (gdbarch, 1);
|
||||
set_gdbarch_wchar_bit (gdbarch, 32);
|
||||
|
||||
/* Note: for displaced stepping, this includes the breakpoint, and one word
|
||||
of additional scratch space. This setting isn't used for anything beside
|
||||
displaced stepping at present. */
|
||||
|
||||
@ -1472,6 +1472,9 @@ avr_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
|
||||
set_gdbarch_ptr_bit (gdbarch, 2 * TARGET_CHAR_BIT);
|
||||
set_gdbarch_addr_bit (gdbarch, 32);
|
||||
|
||||
set_gdbarch_wchar_bit (gdbarch, 2 * TARGET_CHAR_BIT);
|
||||
set_gdbarch_wchar_signed (gdbarch, 1);
|
||||
|
||||
set_gdbarch_float_bit (gdbarch, 4 * TARGET_CHAR_BIT);
|
||||
set_gdbarch_double_bit (gdbarch, 4 * TARGET_CHAR_BIT);
|
||||
set_gdbarch_long_double_bit (gdbarch, 4 * TARGET_CHAR_BIT);
|
||||
|
||||
@ -897,6 +897,7 @@ enum cplus_primitive_types {
|
||||
cplus_primitive_type_declong,
|
||||
cplus_primitive_type_char16_t,
|
||||
cplus_primitive_type_char32_t,
|
||||
cplus_primitive_type_wchar_t,
|
||||
nr_cplus_primitive_types
|
||||
};
|
||||
|
||||
@ -956,6 +957,8 @@ cplus_language_arch_info (struct gdbarch *gdbarch,
|
||||
= builtin->builtin_char16;
|
||||
lai->primitive_type_vector [cplus_primitive_type_char32_t]
|
||||
= builtin->builtin_char32;
|
||||
lai->primitive_type_vector [cplus_primitive_type_wchar_t]
|
||||
= builtin->builtin_wchar;
|
||||
|
||||
lai->bool_type_symbol = "bool";
|
||||
lai->bool_type_default = builtin->builtin_bool;
|
||||
|
||||
@ -184,6 +184,8 @@ struct gdbarch
|
||||
const struct floatformat ** double_format;
|
||||
int long_double_bit;
|
||||
const struct floatformat ** long_double_format;
|
||||
int wchar_bit;
|
||||
int wchar_signed;
|
||||
gdbarch_floatformat_for_type_ftype *floatformat_for_type;
|
||||
int ptr_bit;
|
||||
int addr_bit;
|
||||
@ -389,6 +391,8 @@ gdbarch_alloc (const struct gdbarch_info *info,
|
||||
gdbarch->float_bit = 4*TARGET_CHAR_BIT;
|
||||
gdbarch->double_bit = 8*TARGET_CHAR_BIT;
|
||||
gdbarch->long_double_bit = 8*TARGET_CHAR_BIT;
|
||||
gdbarch->wchar_bit = 4*TARGET_CHAR_BIT;
|
||||
gdbarch->wchar_signed = -1;
|
||||
gdbarch->floatformat_for_type = default_floatformat_for_type;
|
||||
gdbarch->ptr_bit = gdbarch->int_bit;
|
||||
gdbarch->char_signed = -1;
|
||||
@ -533,6 +537,9 @@ verify_gdbarch (struct gdbarch *gdbarch)
|
||||
/* Skip verify of long_double_bit, invalid_p == 0 */
|
||||
if (gdbarch->long_double_format == 0)
|
||||
gdbarch->long_double_format = floatformats_ieee_double;
|
||||
/* Skip verify of wchar_bit, invalid_p == 0 */
|
||||
if (gdbarch->wchar_signed == -1)
|
||||
gdbarch->wchar_signed = 1;
|
||||
/* Skip verify of floatformat_for_type, invalid_p == 0 */
|
||||
/* Skip verify of ptr_bit, invalid_p == 0 */
|
||||
if (gdbarch->addr_bit == 0)
|
||||
@ -1456,6 +1463,12 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
|
||||
fprintf_unfiltered (file,
|
||||
"gdbarch_dump: vtable_function_descriptors = %s\n",
|
||||
plongest (gdbarch->vtable_function_descriptors));
|
||||
fprintf_unfiltered (file,
|
||||
"gdbarch_dump: wchar_bit = %s\n",
|
||||
plongest (gdbarch->wchar_bit));
|
||||
fprintf_unfiltered (file,
|
||||
"gdbarch_dump: wchar_signed = %s\n",
|
||||
plongest (gdbarch->wchar_signed));
|
||||
fprintf_unfiltered (file,
|
||||
"gdbarch_dump: gdbarch_write_pc_p() = %d\n",
|
||||
gdbarch_write_pc_p (gdbarch));
|
||||
@ -1757,6 +1770,41 @@ set_gdbarch_long_double_format (struct gdbarch *gdbarch,
|
||||
gdbarch->long_double_format = long_double_format;
|
||||
}
|
||||
|
||||
int
|
||||
gdbarch_wchar_bit (struct gdbarch *gdbarch)
|
||||
{
|
||||
gdb_assert (gdbarch != NULL);
|
||||
/* Skip verify of wchar_bit, invalid_p == 0 */
|
||||
if (gdbarch_debug >= 2)
|
||||
fprintf_unfiltered (gdb_stdlog, "gdbarch_wchar_bit called\n");
|
||||
return gdbarch->wchar_bit;
|
||||
}
|
||||
|
||||
void
|
||||
set_gdbarch_wchar_bit (struct gdbarch *gdbarch,
|
||||
int wchar_bit)
|
||||
{
|
||||
gdbarch->wchar_bit = wchar_bit;
|
||||
}
|
||||
|
||||
int
|
||||
gdbarch_wchar_signed (struct gdbarch *gdbarch)
|
||||
{
|
||||
gdb_assert (gdbarch != NULL);
|
||||
/* Check variable changed from pre-default. */
|
||||
gdb_assert (gdbarch->wchar_signed != -1);
|
||||
if (gdbarch_debug >= 2)
|
||||
fprintf_unfiltered (gdb_stdlog, "gdbarch_wchar_signed called\n");
|
||||
return gdbarch->wchar_signed;
|
||||
}
|
||||
|
||||
void
|
||||
set_gdbarch_wchar_signed (struct gdbarch *gdbarch,
|
||||
int wchar_signed)
|
||||
{
|
||||
gdbarch->wchar_signed = wchar_signed;
|
||||
}
|
||||
|
||||
const struct floatformat **
|
||||
gdbarch_floatformat_for_type (struct gdbarch *gdbarch, const char *name, int length)
|
||||
{
|
||||
|
||||
@ -188,6 +188,17 @@ extern void set_gdbarch_long_double_bit (struct gdbarch *gdbarch, int long_doubl
|
||||
extern const struct floatformat ** gdbarch_long_double_format (struct gdbarch *gdbarch);
|
||||
extern void set_gdbarch_long_double_format (struct gdbarch *gdbarch, const struct floatformat ** long_double_format);
|
||||
|
||||
/* The ABI default bit-size for "wchar_t". wchar_t is a built-in type
|
||||
starting with C++11. */
|
||||
|
||||
extern int gdbarch_wchar_bit (struct gdbarch *gdbarch);
|
||||
extern void set_gdbarch_wchar_bit (struct gdbarch *gdbarch, int wchar_bit);
|
||||
|
||||
/* One if `wchar_t' is signed, zero if unsigned. */
|
||||
|
||||
extern int gdbarch_wchar_signed (struct gdbarch *gdbarch);
|
||||
extern void set_gdbarch_wchar_signed (struct gdbarch *gdbarch, int wchar_signed);
|
||||
|
||||
/* Returns the floating-point format to be used for values of length LENGTH.
|
||||
NAME, if non-NULL, is the type name, which may be used to distinguish
|
||||
different target formats of the same length. */
|
||||
|
||||
@ -383,6 +383,12 @@ v:const struct floatformat **:double_format:::::floatformats_ieee_double::pforma
|
||||
v:int:long_double_bit:::8 * sizeof (long double):8*TARGET_CHAR_BIT::0
|
||||
v:const struct floatformat **:long_double_format:::::floatformats_ieee_double::pformat (gdbarch->long_double_format)
|
||||
|
||||
# The ABI default bit-size for "wchar_t". wchar_t is a built-in type
|
||||
# starting with C++11.
|
||||
v:int:wchar_bit:::8 * sizeof (wchar_t):4*TARGET_CHAR_BIT::0
|
||||
# One if \`wchar_t' is signed, zero if unsigned.
|
||||
v:int:wchar_signed:::1:-1:1
|
||||
|
||||
# Returns the floating-point format to be used for values of length LENGTH.
|
||||
# NAME, if non-NULL, is the type name, which may be used to distinguish
|
||||
# different target formats of the same length.
|
||||
|
||||
@ -5207,6 +5207,9 @@ gdbtypes_post_init (struct gdbarch *gdbarch)
|
||||
= arch_integer_type (gdbarch, 16, 1, "char16_t");
|
||||
builtin_type->builtin_char32
|
||||
= arch_integer_type (gdbarch, 32, 1, "char32_t");
|
||||
builtin_type->builtin_wchar
|
||||
= arch_integer_type (gdbarch, gdbarch_wchar_bit (gdbarch),
|
||||
!gdbarch_wchar_signed (gdbarch), "wchar_t");
|
||||
|
||||
/* Default data/code pointer types. */
|
||||
builtin_type->builtin_data_ptr
|
||||
|
||||
@ -1503,6 +1503,7 @@ struct builtin_type
|
||||
/* Wide character types. */
|
||||
struct type *builtin_char16;
|
||||
struct type *builtin_char32;
|
||||
struct type *builtin_wchar;
|
||||
|
||||
/* Pointer types. */
|
||||
|
||||
|
||||
@ -1381,6 +1381,10 @@ h8300_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
|
||||
set_gdbarch_int_bit (gdbarch, 2 * TARGET_CHAR_BIT);
|
||||
set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT);
|
||||
set_gdbarch_long_long_bit (gdbarch, 8 * TARGET_CHAR_BIT);
|
||||
|
||||
set_gdbarch_wchar_bit (gdbarch, 2 * TARGET_CHAR_BIT);
|
||||
set_gdbarch_wchar_signed (gdbarch, 0);
|
||||
|
||||
set_gdbarch_double_bit (gdbarch, 4 * TARGET_CHAR_BIT);
|
||||
set_gdbarch_double_format (gdbarch, floatformats_ieee_single);
|
||||
set_gdbarch_long_double_bit (gdbarch, 4 * TARGET_CHAR_BIT);
|
||||
|
||||
@ -362,6 +362,9 @@ i386nto_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
|
||||
= nto_in_dynsym_resolve_code;
|
||||
}
|
||||
set_solib_ops (gdbarch, &nto_svr4_so_ops);
|
||||
|
||||
set_gdbarch_wchar_bit (gdbarch, 32);
|
||||
set_gdbarch_wchar_signed (gdbarch, 0);
|
||||
}
|
||||
|
||||
/* Provide a prototype to silence -Wmissing-prototypes. */
|
||||
|
||||
@ -4515,6 +4515,9 @@ i386_go32_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
|
||||
set_gdbarch_has_dos_based_file_system (gdbarch, 1);
|
||||
|
||||
set_gdbarch_gnu_triplet_regexp (gdbarch, i386_gnu_triplet_regexp);
|
||||
|
||||
set_gdbarch_wchar_bit (gdbarch, 16);
|
||||
set_gdbarch_wchar_signed (gdbarch, 0);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -911,6 +911,9 @@ m32r_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
|
||||
tdep = XNEW (struct gdbarch_tdep);
|
||||
gdbarch = gdbarch_alloc (&info, tdep);
|
||||
|
||||
set_gdbarch_wchar_bit (gdbarch, 16);
|
||||
set_gdbarch_wchar_signed (gdbarch, 0);
|
||||
|
||||
set_gdbarch_read_pc (gdbarch, m32r_read_pc);
|
||||
set_gdbarch_unwind_sp (gdbarch, m32r_unwind_sp);
|
||||
|
||||
|
||||
@ -1112,6 +1112,9 @@ moxie_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
|
||||
tdep = XNEW (struct gdbarch_tdep);
|
||||
gdbarch = gdbarch_alloc (&info, tdep);
|
||||
|
||||
set_gdbarch_wchar_bit (gdbarch, 32);
|
||||
set_gdbarch_wchar_signed (gdbarch, 0);
|
||||
|
||||
set_gdbarch_read_pc (gdbarch, moxie_read_pc);
|
||||
set_gdbarch_write_pc (gdbarch, moxie_write_pc);
|
||||
set_gdbarch_unwind_sp (gdbarch, moxie_unwind_sp);
|
||||
|
||||
@ -2069,6 +2069,9 @@ nds32_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
|
||||
|
||||
gdbarch = gdbarch_alloc (&info, tdep);
|
||||
|
||||
set_gdbarch_wchar_bit (gdbarch, 16);
|
||||
set_gdbarch_wchar_signed (gdbarch, 0);
|
||||
|
||||
if (fpu_freg == -1)
|
||||
num_regs = NDS32_NUM_REGS;
|
||||
else if (use_pseudo_fsrs == 1)
|
||||
|
||||
@ -1080,6 +1080,11 @@ rs6000_aix_init_osabi (struct gdbarch_info info, struct gdbarch *gdbarch)
|
||||
else
|
||||
set_gdbarch_frame_red_zone_size (gdbarch, 0);
|
||||
|
||||
if (tdep->wordsize == 8)
|
||||
set_gdbarch_wchar_bit (gdbarch, 32);
|
||||
else
|
||||
set_gdbarch_wchar_bit (gdbarch, 16);
|
||||
set_gdbarch_wchar_signed (gdbarch, 0);
|
||||
set_gdbarch_auto_wide_charset (gdbarch, rs6000_aix_auto_wide_charset);
|
||||
|
||||
set_solib_ops (gdbarch, &solib_aix_so_ops);
|
||||
|
||||
@ -2268,6 +2268,10 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
|
||||
set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT);
|
||||
set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT);
|
||||
set_gdbarch_long_long_bit (gdbarch, 8 * TARGET_CHAR_BIT);
|
||||
|
||||
set_gdbarch_wchar_bit (gdbarch, 2 * TARGET_CHAR_BIT);
|
||||
set_gdbarch_wchar_signed (gdbarch, 0);
|
||||
|
||||
set_gdbarch_float_bit (gdbarch, 4 * TARGET_CHAR_BIT);
|
||||
set_gdbarch_double_bit (gdbarch, 8 * TARGET_CHAR_BIT);
|
||||
set_gdbarch_long_double_bit (gdbarch, 8 * TARGET_CHAR_BIT);
|
||||
|
||||
@ -1749,6 +1749,9 @@ sparc32_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
|
||||
set_gdbarch_long_double_bit (gdbarch, 128);
|
||||
set_gdbarch_long_double_format (gdbarch, floatformats_sparc_quad);
|
||||
|
||||
set_gdbarch_wchar_bit (gdbarch, 16);
|
||||
set_gdbarch_wchar_signed (gdbarch, 1);
|
||||
|
||||
set_gdbarch_num_regs (gdbarch, SPARC32_NUM_REGS);
|
||||
set_gdbarch_register_name (gdbarch, sparc32_register_name);
|
||||
set_gdbarch_register_type (gdbarch, sparc32_register_type);
|
||||
|
||||
@ -1268,6 +1268,9 @@ sparc64_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
|
||||
set_gdbarch_long_long_bit (gdbarch, 64);
|
||||
set_gdbarch_ptr_bit (gdbarch, 64);
|
||||
|
||||
set_gdbarch_wchar_bit (gdbarch, 16);
|
||||
set_gdbarch_wchar_signed (gdbarch, 0);
|
||||
|
||||
set_gdbarch_num_regs (gdbarch, SPARC64_NUM_REGS);
|
||||
set_gdbarch_register_name (gdbarch, sparc64_register_name);
|
||||
set_gdbarch_register_type (gdbarch, sparc64_register_type);
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
2017-04-12 Pedro Alves <palves@redhat.com>
|
||||
|
||||
PR gdb/21323
|
||||
* gdb.cp/wide_char_types.c: Include <wchar.h>.
|
||||
(wchar): New global.
|
||||
* gdb.cp/wide_char_types.exp (wide_char_types_program)
|
||||
(do_test_wide_char, wide_char_types_no_program, top level): Add
|
||||
wchar_t testing.
|
||||
|
||||
2017-04-12 Pedro Alves <palves@redhat.com>
|
||||
|
||||
PR c++/21323
|
||||
|
||||
@ -17,9 +17,11 @@
|
||||
*/
|
||||
|
||||
#include <uchar.h>
|
||||
#include <wchar.h>
|
||||
|
||||
char16_t u16 = -1;
|
||||
char32_t u32 = -1;
|
||||
wchar_t wchar = -1;
|
||||
|
||||
int
|
||||
main ()
|
||||
|
||||
@ -15,14 +15,14 @@
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Test GDB's awareness of the char16_t, char32_t (C++11+) built-in
|
||||
# types. We also run most tests here in C mode, and check whether the
|
||||
# built-ins are disabled (gdb uses the typedefs in the debug info
|
||||
# instead.)
|
||||
# Test GDB's awareness of the wchar_t (C++98+) and char16_t, char32_t
|
||||
# (C++11+) built-in types. We also run most tests here in C mode, and
|
||||
# check whether the built-ins are disabled (gdb uses the typedefs in
|
||||
# the debug info instead.)
|
||||
|
||||
standard_testfile
|
||||
|
||||
# Test char16_t/char32_t in language LANG, against symbols in
|
||||
# Test char16_t/char32_t/wchar_t in language LANG, against symbols in
|
||||
# a program. Lang can be "c", "c++03" or "c++11". In C++11,
|
||||
# char16_t/char32_t are built-in types, and the debug information
|
||||
# reflects that (see
|
||||
@ -51,16 +51,16 @@ proc wide_char_types_program {lang} {
|
||||
fail "can't run to main"
|
||||
return 0
|
||||
}
|
||||
do_test_wide_char $lang "u16" "u32"
|
||||
do_test_wide_char $lang "u16" "u32" "wchar"
|
||||
}
|
||||
|
||||
# Test char16_t/char32_t in language LANG. Use CHAR16_EXP and
|
||||
# CHAR32_EXP as expression for each of the corresponding types.
|
||||
# (E.g., CHAR16_EXP will be u16 when testing against the program, and
|
||||
# "(char16_t)-1" when testing the built-in types without a program
|
||||
# loaded.)
|
||||
# Test char16_t/char32_t/wchar_t in language LANG. Use CHAR16_EXP,
|
||||
# CHAR32_EXP, and WCHAR_EXP as expression for each of the
|
||||
# corresponding types. (E.g., CHAR16_EXP will be u16 when testing
|
||||
# against the program, and "(char16_t)-1" when testing the built-in
|
||||
# types without a program loaded.)
|
||||
|
||||
proc do_test_wide_char {lang char16_exp char32_exp} {
|
||||
proc do_test_wide_char {lang char16_exp char32_exp wchar_exp} {
|
||||
global gdb_prompt
|
||||
|
||||
# Check that the fixed-width wide types are distinct built-in
|
||||
@ -78,26 +78,60 @@ proc do_test_wide_char {lang char16_exp char32_exp} {
|
||||
"char32_t is typedef"
|
||||
}
|
||||
|
||||
# wchar_t is a disctinct built-in type in C++03+.
|
||||
if {$lang != "c"} {
|
||||
gdb_test "ptype $wchar_exp" "type = wchar_t" \
|
||||
"wchar_t is distinct"
|
||||
} else {
|
||||
gdb_test "ptype $wchar_exp" "type = (unsigned )?(long|int|short)" \
|
||||
"wchar_t is typedef"
|
||||
}
|
||||
|
||||
# Check that the fixed-width wide char types are unsigned.
|
||||
gdb_test "p $char16_exp" " = 65535 u'\\\\xffff'" \
|
||||
"char16_t is unsigned"
|
||||
gdb_test "p $char32_exp" " = 4294967295 U'\\\\xffffffff'" \
|
||||
"char32_t is unsigned"
|
||||
|
||||
# Whether wchar_t is signed is implementation-dependent. While we
|
||||
# ignore whether GDB got the ABI size/sign details right here,
|
||||
# this at least verifies that the value isn't garbage, and that
|
||||
# GDB correctly outputs the character using the "L" prefix.
|
||||
set test "wchar_t sign"
|
||||
gdb_test_multiple "p $wchar_exp" $test {
|
||||
-re " = 4294967295 L'\\\\xffffffff'\r\n$gdb_prompt $" {
|
||||
pass "$test (unsigned)"
|
||||
}
|
||||
-re " = 65535 L'\\\\xffff'\r\n$gdb_prompt $" {
|
||||
pass "$test (unsigned)"
|
||||
}
|
||||
-re " = -1 L'\\\\xffffffff'\r\n$gdb_prompt $" {
|
||||
pass "$test (signed)"
|
||||
}
|
||||
-re " = -1 L'\\\\xffff'\r\n$gdb_prompt $" {
|
||||
pass "$test (signed)"
|
||||
}
|
||||
}
|
||||
|
||||
# Check sizeof. These are fixed-width.
|
||||
gdb_test "p sizeof($char16_exp)" "= 2" \
|
||||
"sizeof($char16_exp) == 2"
|
||||
gdb_test "p sizeof($char32_exp)" "= 4" \
|
||||
"sizeof(char16_t) == 4"
|
||||
|
||||
# Size of wchar_t depends on ABI.
|
||||
gdb_test "p sizeof($wchar_exp)" "= (2|4)" \
|
||||
"sizeof(wchar_t)"
|
||||
|
||||
# Test printing wide literal strings. Note that when testing with
|
||||
# no program started, this relies on GDB's awareness of the
|
||||
# built-in wide char types.
|
||||
gdb_test {p U"hello"} {= U"hello"}
|
||||
gdb_test {p u"hello"} {= u"hello"}
|
||||
gdb_test {p L"hello"} {= L"hello"}
|
||||
}
|
||||
|
||||
# Make sure that the char16_t/char32_t types are recognized as
|
||||
# Make sure that the char16_t/char32_t/wchar_t types are recognized as
|
||||
# distinct built-in types in C++ mode, even with no program loaded.
|
||||
# Check that in C mode, the types are not recognized.
|
||||
|
||||
@ -116,8 +150,12 @@ proc wide_char_types_no_program {} {
|
||||
gdb_test "p (char32_t) -1" "No symbol table is loaded.*" \
|
||||
"char32_t is not built-in"
|
||||
|
||||
gdb_test "p (wchar_t) -1" "No symbol table is loaded.*" \
|
||||
"wchar_t is not built-in"
|
||||
|
||||
gdb_test {p U"hello"} "No type named char32_t\\\."
|
||||
gdb_test {p u"hello"} "No type named char16_t\\\."
|
||||
gdb_test {p L"hello"} "No type named wchar_t\\\."
|
||||
}
|
||||
|
||||
# Note GDB does not distinguish C++ dialects, so the fixed-width
|
||||
@ -126,7 +164,7 @@ proc wide_char_types_no_program {} {
|
||||
with_test_prefix "c++" {
|
||||
gdb_test "set language c++"
|
||||
|
||||
do_test_wide_char "c++11" "(char16_t) -1" "(char32_t) -1"
|
||||
do_test_wide_char "c++11" "(char16_t) -1" "(char32_t) -1" "(wchar_t) -1"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -466,6 +466,9 @@ init_w32_command_list (void)
|
||||
void
|
||||
windows_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
|
||||
{
|
||||
set_gdbarch_wchar_bit (gdbarch, 16);
|
||||
set_gdbarch_wchar_signed (gdbarch, 0);
|
||||
|
||||
/* Canonical paths on this target look like
|
||||
`c:\Program Files\Foo App\mydll.dll', for example. */
|
||||
set_gdbarch_has_dos_based_file_system (gdbarch, 1);
|
||||
|
||||
@ -809,6 +809,9 @@ xstormy16_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
|
||||
set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT);
|
||||
set_gdbarch_long_long_bit (gdbarch, 8 * TARGET_CHAR_BIT);
|
||||
|
||||
set_gdbarch_wchar_bit (gdbarch, 2 * TARGET_CHAR_BIT);
|
||||
set_gdbarch_wchar_signed (gdbarch, 1);
|
||||
|
||||
set_gdbarch_float_bit (gdbarch, 4 * TARGET_CHAR_BIT);
|
||||
set_gdbarch_double_bit (gdbarch, 8 * TARGET_CHAR_BIT);
|
||||
set_gdbarch_long_double_bit (gdbarch, 8 * TARGET_CHAR_BIT);
|
||||
|
||||
@ -3200,6 +3200,9 @@ xtensa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
|
||||
xtensa_verify_config (gdbarch);
|
||||
xtensa_session_once_reported = 0;
|
||||
|
||||
set_gdbarch_wchar_bit (gdbarch, 2 * TARGET_CHAR_BIT);
|
||||
set_gdbarch_wchar_signed (gdbarch, 0);
|
||||
|
||||
/* Pseudo-Register read/write. */
|
||||
set_gdbarch_pseudo_register_read (gdbarch, xtensa_pseudo_register_read);
|
||||
set_gdbarch_pseudo_register_write (gdbarch, xtensa_pseudo_register_write);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user