From patchwork Tue Jun 9 16:28:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 39532 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7B3C53887003; Tue, 9 Jun 2020 16:29:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7B3C53887003 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1591720145; bh=bOEpyA1fCz3ZvineYIdvGipiBCLieKhSsC5uH7NqMFE=; h=References:In-Reply-To:Date:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=v8hT6PnTfxHlp0/ZxQ13QRxhoyEky5GDNYe0GGcDI2dHp3BS/ZQgixmY0QBLfclvT KhElnvbS9IOpv5UyHVB1BLhhoZs+RVCjjhv40NBCPvj+9rfQEF0FKP0hNF47+AIqgr R7vx9lZLsFVzzsXRu2W1jAahqEplhw5/JYKbYNi0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-il1-x142.google.com (mail-il1-x142.google.com [IPv6:2607:f8b0:4864:20::142]) by sourceware.org (Postfix) with ESMTPS id 3F53A3840C24 for ; Tue, 9 Jun 2020 16:29:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3F53A3840C24 Received: by mail-il1-x142.google.com with SMTP id h3so20905767ilh.13 for ; Tue, 09 Jun 2020 09:29:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=bOEpyA1fCz3ZvineYIdvGipiBCLieKhSsC5uH7NqMFE=; b=DBl1jGG/epqyfTNC8tnINgYdHH2JP6E+KtfUhf+b7IIB16qs+XxQg2+LAhKvnhSaaJ 0PJtyjzCT4v9yxf4K6s0K4B2jqK9z/PYDciRVzHnXIQz0Q7GyZjSaiWix09xOr2k8vOQ MFonKFyb2hShYK1z13VQFrRI1mM7DBAxYP4SNZFXah6aJcTQsPUHhc+Nqs470dMGaV+w jxKVV80YeRKvOFI8tCRqS+uRyNWeVz/DqfzgDDYBKR+NZFsPeiDIml1Rnt2zd6KTghLy /nuNJ2SlgnbTH+4JNZwhxalA7Uj794squACwzcnGY7xuR26TybahX4PSfXzhhJx3kJdI Pt4A== X-Gm-Message-State: AOAM533CDMBBAcWN/HuJR2d7xmN9aFpgEPt7S2JOHJkNnuWOjGXXvNQ1 ir+HxKFd7RUtOOLYH9rLnAXVH/uXItvWLmYkO2I= X-Google-Smtp-Source: ABdhPJzyXES00YeT70LTJTPOFzNAfsOQS52APUxvEzoY8yUT+q0wIQ0C7H0LRomobb8IKJwrjk+mHqiolfWsgj54RX4= X-Received: by 2002:a92:9f4b:: with SMTP id u72mr27779000ili.273.1591720142602; Tue, 09 Jun 2020 09:29:02 -0700 (PDT) MIME-Version: 1.0 References: <20200605150324.460300-1-hjl.tools@gmail.com> In-Reply-To: Date: Tue, 9 Jun 2020 09:28:26 -0700 Message-ID: Subject: V3 [PATCH] Add "%d" support to _dl_debug_vdprintf To: Adhemerval Zanella X-Spam-Status: No, score=-9.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Cc: GNU C Library Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" On Tue, Jun 9, 2020 at 9:19 AM Adhemerval Zanella wrote: > > > > On 09/06/2020 11:46, H.J. Lu wrote: > > On Tue, Jun 9, 2020 at 7:39 AM Adhemerval Zanella > > wrote: > >> > >> > >> > >> On 09/06/2020 11:18, Adhemerval Zanella wrote: > >>> > >>> > >>> On 05/06/2020 12:03, H.J. Lu via Libc-alpha wrote: > >>>> "%d" will be used to print out signed value. > >>> > >>> LGTM with some smalls nits below. > >>> > >>>> --- > >>>> elf/dl-misc.c | 31 +++++++++++++++++++++++++++++-- > >>>> 1 file changed, 29 insertions(+), 2 deletions(-) > >>>> > >>>> diff --git a/elf/dl-misc.c b/elf/dl-misc.c > >>>> index ab70481fda..c82c8ae6fa 100644 > >>>> --- a/elf/dl-misc.c > >>>> +++ b/elf/dl-misc.c > >>>> @@ -167,6 +167,7 @@ _dl_debug_vdprintf (int fd, int tag_p, const char *fmt, va_list arg) > >>>> switch (*fmt) > >>>> { > >>>> /* Integer formatting. */ > >>>> + case 'd': > >>>> case 'u': > >>>> case 'x': > >>>> { > >>> > >>> Ok. > >>> > >>>> @@ -179,11 +180,34 @@ _dl_debug_vdprintf (int fd, int tag_p, const char *fmt, va_list arg) > >>>> #else > >>>> unsigned long int num = va_arg (arg, unsigned int); > >>>> #endif > >>>> + bool negative = false; > >>>> + if (*fmt == 'd') > >>>> + { > >>>> +#if LONG_MAX != INT_MAX > >>>> + if (long_mod) > >>>> + { > >>>> + if ((long) num < 0) > >>> > >>> Full type specify on cast. > >>> > >>>> + negative = true; > >>>> + } > >>>> + else > >>>> + { > >>>> + if ((int) num < 0)> + { > >>>> + num = (unsigned int) num; > >>>> + negative = true; > >>>> + } > >>>> + } > >>>> +#else > >>>> + if ((int) num < 0) > >>>> + negative = true; > >>>> +#endif > >>>> + } > >>>> + > >>>> /* We use alloca() to allocate the buffer with the most > >>>> pessimistic guess for the size. Using alloca() allows > >>>> having more than one integer formatting in a call. */ > >>>> - char *buf = (char *) alloca (3 * sizeof (unsigned long int)); > >>>> - char *endp = &buf[3 * sizeof (unsigned long int)]; > >>>> + char *buf = (char *) alloca (1 + 3 * sizeof (unsigned long int)); > >>>> + char *endp = &buf[1 + 3 * sizeof (unsigned long int)]; > >>> > >>> I think we can remove alloca here and use INT_STRLEN_BOUND (since the > >>> string is not '\0' bounded due the writev usage). Something like: > >> > >> Sigh, you can't actually remove the alloca here. > > > > Why not? It seems to work: > > > > Because the iov uses the allocated buffer on the _dl_writev and it will > an invalid pointer if we allocate on the stack without alloca. Here is the updated patch with alloca. I am checking it in. From 561064eb588c0ca9caffc92c1c6af9cb7964d68b Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 5 Jun 2020 07:59:25 -0700 Subject: [PATCH] Add "%d" support to _dl_debug_vdprintf "%d" will be used to print out signed value. --- elf/dl-misc.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/elf/dl-misc.c b/elf/dl-misc.c index ab70481fda..f9d1fd7993 100644 --- a/elf/dl-misc.c +++ b/elf/dl-misc.c @@ -167,6 +167,7 @@ _dl_debug_vdprintf (int fd, int tag_p, const char *fmt, va_list arg) switch (*fmt) { /* Integer formatting. */ + case 'd': case 'u': case 'x': { @@ -179,11 +180,34 @@ _dl_debug_vdprintf (int fd, int tag_p, const char *fmt, va_list arg) #else unsigned long int num = va_arg (arg, unsigned int); #endif + bool negative = false; + if (*fmt == 'd') + { +#if LONG_MAX != INT_MAX + if (long_mod) + { + if ((long int) num < 0) + negative = true; + } + else + { + if ((int) num < 0) + { + num = (unsigned int) num; + negative = true; + } + } +#else + if ((int) num < 0) + negative = true; +#endif + } + /* We use alloca() to allocate the buffer with the most pessimistic guess for the size. Using alloca() allows having more than one integer formatting in a call. */ - char *buf = (char *) alloca (3 * sizeof (unsigned long int)); - char *endp = &buf[3 * sizeof (unsigned long int)]; + char *buf = (char *) alloca (1 + 3 * sizeof (unsigned long int)); + char *endp = &buf[1 + 3 * sizeof (unsigned long int)]; char *cp = _itoa (num, endp, *fmt == 'x' ? 16 : 10, 0); /* Pad to the width the user specified. */ @@ -191,6 +215,9 @@ _dl_debug_vdprintf (int fd, int tag_p, const char *fmt, va_list arg) while (endp - cp < width) *--cp = fill; + if (negative) + *--cp = '-'; + iov[niov].iov_base = cp; iov[niov].iov_len = endp - cp; ++niov; -- 2.26.2