aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog28
-rw-r--r--gdb/aarch64-tdep.c2
-rw-r--r--gdb/alpha-tdep.c2
-rw-r--r--gdb/arm-tdep.c7
-rw-r--r--gdb/avr-tdep.c3
-rw-r--r--gdb/c-lang.c3
-rw-r--r--gdb/gdbarch.c48
-rw-r--r--gdb/gdbarch.h11
-rwxr-xr-xgdb/gdbarch.sh6
-rw-r--r--gdb/gdbtypes.c3
-rw-r--r--gdb/gdbtypes.h1
-rw-r--r--gdb/h8300-tdep.c4
-rw-r--r--gdb/i386-nto-tdep.c3
-rw-r--r--gdb/i386-tdep.c3
-rw-r--r--gdb/m32r-tdep.c3
-rw-r--r--gdb/moxie-tdep.c3
-rw-r--r--gdb/nds32-tdep.c3
-rw-r--r--gdb/rs6000-aix-tdep.c5
-rw-r--r--gdb/sh-tdep.c4
-rw-r--r--gdb/sparc-tdep.c3
-rw-r--r--gdb/sparc64-tdep.c3
-rw-r--r--gdb/testsuite/ChangeLog9
-rw-r--r--gdb/testsuite/gdb.cp/wide_char_types.c2
-rw-r--r--gdb/testsuite/gdb.cp/wide_char_types.exp66
-rw-r--r--gdb/windows-tdep.c3
-rw-r--r--gdb/xstormy16-tdep.c3
-rw-r--r--gdb/xtensa-tdep.c3
27 files changed, 220 insertions, 14 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bdcbd1e..f404b74 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,33 @@
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
* c-lang.c (cplus_primitive_types) <cplus_primitive_type_char16_t,
cplus_primitive_type_char32_t>: New enum values.
diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index f340d57..28c2573 100644
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -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);
diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index 4dd65c5..7c521db 100644
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -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);
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 5cc3f40..c8fabfb 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -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. */
diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index 0ae8a08..ec9db1c 100644
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -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);
diff --git a/gdb/c-lang.c b/gdb/c-lang.c
index 616aa26..19a8608 100644
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -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;
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 319a890..5664325 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -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)
@@ -1457,6 +1464,12 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *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));
fprintf_unfiltered (file,
@@ -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)
{
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 3264c44..4845f23 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -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. */
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index bdfb6b2..a42dc43 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -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.
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index c1f76fb..dd3992c 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -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
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 3c57970..f6b4de9 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -1503,6 +1503,7 @@ struct builtin_type
/* Wide character types. */
struct type *builtin_char16;
struct type *builtin_char32;
+ struct type *builtin_wchar;
/* Pointer types. */
diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c
index 060e5d3..7b260b1 100644
--- a/gdb/h8300-tdep.c
+++ b/gdb/h8300-tdep.c
@@ -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);
diff --git a/gdb/i386-nto-tdep.c b/gdb/i386-nto-tdep.c
index a12a56d..3fe715f 100644
--- a/gdb/i386-nto-tdep.c
+++ b/gdb/i386-nto-tdep.c
@@ -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. */
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 70bd47c..49f9824 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -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);
}
diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c
index 4701f7a..0820af9 100644
--- a/gdb/m32r-tdep.c
+++ b/gdb/m32r-tdep.c
@@ -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);
diff --git a/gdb/moxie-tdep.c b/gdb/moxie-tdep.c
index d0f4223..dd7a6f4 100644
--- a/gdb/moxie-tdep.c
+++ b/gdb/moxie-tdep.c
@@ -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);
diff --git a/gdb/nds32-tdep.c b/gdb/nds32-tdep.c
index 05c48aa..e0eea37 100644
--- a/gdb/nds32-tdep.c
+++ b/gdb/nds32-tdep.c
@@ -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)
diff --git a/gdb/rs6000-aix-tdep.c b/gdb/rs6000-aix-tdep.c
index 9841a60..a14e93c 100644
--- a/gdb/rs6000-aix-tdep.c
+++ b/gdb/rs6000-aix-tdep.c
@@ -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);
diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
index f4b4c48..0bc678a 100644
--- a/gdb/sh-tdep.c
+++ b/gdb/sh-tdep.c
@@ -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);
diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index d346aec..078907a 100644
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -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);
diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
index bf0da18..58f5bf0 100644
--- a/gdb/sparc64-tdep.c
+++ b/gdb/sparc64-tdep.c
@@ -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);
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e2555e0..7f858e6 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,14 @@
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
* gdb.cp/wide_char_types.c: New file.
* gdb.cp/wide_char_types.exp: New file.
diff --git a/gdb/testsuite/gdb.cp/wide_char_types.c b/gdb/testsuite/gdb.cp/wide_char_types.c
index 8337cd4..c899b71 100644
--- a/gdb/testsuite/gdb.cp/wide_char_types.c
+++ b/gdb/testsuite/gdb.cp/wide_char_types.c
@@ -17,9 +17,11 @@
*/
#include <uchar.h>
+#include <wchar.h>
char16_t u16 = -1;
char32_t u32 = -1;
+wchar_t wchar = -1;
int
main ()
diff --git a/gdb/testsuite/gdb.cp/wide_char_types.exp b/gdb/testsuite/gdb.cp/wide_char_types.exp
index df5c8a8f..6a91350 100644
--- a/gdb/testsuite/gdb.cp/wide_char_types.exp
+++ b/gdb/testsuite/gdb.cp/wide_char_types.exp
@@ -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"
}
}
diff --git a/gdb/windows-tdep.c b/gdb/windows-tdep.c
index 62a303d..3e7e8f8 100644
--- a/gdb/windows-tdep.c
+++ b/gdb/windows-tdep.c
@@ -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);
diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
index bfa7f0a..7fdfc65 100644
--- a/gdb/xstormy16-tdep.c
+++ b/gdb/xstormy16-tdep.c
@@ -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);
diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
index 7fc881f..0fcd483 100644
--- a/gdb/xtensa-tdep.c
+++ b/gdb/xtensa-tdep.c
@@ -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);
generated by cgit v1.1 at 2024-11-04 02:53:32 +0000