From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 105031 invoked by alias); 12 Jan 2016 14:58:18 -0000 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 Received: (qmail 105018 invoked by uid 89); 12 Jan 2016 14:58:16 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=*gdbarch, ISO-8859-1, ISO88591, UD:charset.c X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 12 Jan 2016 14:58:16 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id DE3CB18B313; Tue, 12 Jan 2016 14:58:14 +0000 (UTC) Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0CEwC3m020679; Tue, 12 Jan 2016 09:58:13 -0500 Message-ID: <56951484.70208@redhat.com> Date: Tue, 12 Jan 2016 14:58:00 -0000 From: Pedro Alves User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Sandra Loosemore , gdb-patches Subject: Re: [patch] fix phony_iconv wide character support References: <56855C47.7090004@codesourcery.com> In-Reply-To: <56855C47.7090004@codesourcery.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-SW-Source: 2016-01/txt/msg00223.txt.bz2 On 12/31/2015 04:48 PM, Sandra Loosemore wrote: > > diff --git a/gdb/charset.c b/gdb/charset.c > index ee1ae20..82e5644 100644 > --- a/gdb/charset.c > +++ b/gdb/charset.c > @@ -77,9 +77,13 @@ > arrange for there to be a single available character set. */ > > #undef GDB_DEFAULT_HOST_CHARSET > +#ifdef USE_WIN32API > +#define GDB_DEFAULT_HOST_CHARSET "CP1252" > +#else > #define GDB_DEFAULT_HOST_CHARSET "ISO-8859-1" > -#define GDB_DEFAULT_TARGET_CHARSET "ISO-8859-1" > -#define GDB_DEFAULT_TARGET_WIDE_CHARSET "ISO-8859-1" > +#endif Could you indent this, like: #ifdef USE_WIN32API # define GDB_DEFAULT_HOST_CHARSET "CP1252" #else # define GDB_DEFAULT_HOST_CHARSET "ISO-8859-1" #endif > +#define GDB_DEFAULT_TARGET_CHARSET GDB_DEFAULT_HOST_CHARSET > +#define GDB_DEFAULT_TARGET_WIDE_CHARSET "UTF-32" > #undef DEFAULT_CHARSET_NAMES > #define DEFAULT_CHARSET_NAMES GDB_DEFAULT_HOST_CHARSET , > > @@ -95,20 +99,27 @@ > #undef ICONV_CONST > #define ICONV_CONST const > > +/* We allow conversions from UTF-32, wchar_t, and the host charset. > + We allow conversions to wchar_t and the host charset Missing period. > + Return 1 if we are converting from UTF-32BE, 2 if from UTF32-LE, > + 0 otherwise. This is used as a flag in calls to iconv. */ Spurious double space after "This is". > + > + return 0; > } > > static int > @@ -130,8 +141,17 @@ phony_iconv (iconv_t utf_flag, const char **inbuf, size_t *inbytesleft, > > for (j = 0; j < 4; ++j) > { > - c <<= 8; > - c += (*inbuf)[j] & 0xff; > + if (utf_flag == 1) > + { > + /* Big-endian. */ > + c <<= 8; > + c += (*inbuf)[j] & 0xff; > + } > + else > + { > + /* Little-endian. */ > + c += ((*inbuf)[j] & 0xff) << (8 * j); > + } > } Isn't this the same as: enum bfd_endian endian = utf_flag == 1 ? BFD_ENDIAN_BIG : BFD_ENDIAN_LITTLE; extract_unsigned_integer (*inbuf, 4, endian); ? > > /* The number of non-reversible conversions -- but they were all > @@ -290,6 +315,10 @@ set_be_le_names (struct gdbarch *gdbarch) > return; > be_le_arch = gdbarch; > > +#ifdef PHONY_ICONV > + target_wide_charset_le_name = "UTF-32LE"; > + target_wide_charset_be_name = "UTF-32BE"; > +#else > target_wide_charset_le_name = NULL; > target_wide_charset_be_name = NULL; > > @@ -313,6 +342,7 @@ set_be_le_names (struct gdbarch *gdbarch) > target_wide_charset_le_name = charset_enum[i]; > } > } > +# endif /* PHONY_ICONV */ This change isn't obvious to me. You wrote in the ChangeLog: > (set_be_le_names) [PHONY_ICONV]: Use hard-wired names to match > phony_iconv_open. But I think this "to match" comment should be here in the sources. > } > > /* 'Set charset', 'set host-charset', 'set target-charset', 'set > Otherwise LGTM. Thanks, Pedro Alves