From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 28788 invoked from network); 26 May 2023 19:41:53 -0000 Received: from second.openwall.net (193.110.157.125) by inbox.vuxu.org with ESMTPUTF8; 26 May 2023 19:41:53 -0000 Received: (qmail 25837 invoked by uid 550); 26 May 2023 19:41:23 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 25700 invoked from network); 26 May 2023 19:41:21 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inria.fr; s=dc; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=io5QWaM1cVMkFEeb5+nnweroEXfHMLzN80UOJU6uHH0=; b=TSALSUXrik23etwneV/GaMly+gT+0/KQnOGn5mkrKTjY5emQk6SHslqD SBqfwQf7Zeg1ImfmPDbCvlOH2qWr9iI8Gk9R27V3eT8NsA4SkJKOAtGXu K4Bfmy0gPI5a5y5j5evitsGGbeGN51URfmKM5Aid6X1lwJqUOWKQHn5AX 8=; Authentication-Results: mail2-relais-roc.national.inria.fr; dkim=none (message not signed) header.i=none; spf=SoftFail smtp.mailfrom=Jens.Gustedt@inria.fr; dmarc=fail (p=none dis=none) d=inria.fr X-IronPort-AV: E=Sophos;i="6.00,195,1681164000"; d="scan'208";a="109947162" From: Jens Gustedt To: musl@lists.openwall.com Date: Fri, 26 May 2023 21:41:04 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [musl] [C23 printf 3/3] C23: implement the wfN length modifiers for printf Musl only has a difference between fixed-width and fastest-width integer types for N == 16. And even here all architectures have made the same choice, namely mapping to 32 bit types. --- src/stdio/vfprintf.c | 9 ++++++++- src/stdio/vfwprintf.c | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/stdio/vfprintf.c b/src/stdio/vfprintf.c index 1a516663..9f02a594 100644 --- a/src/stdio/vfprintf.c +++ b/src/stdio/vfprintf.c @@ -529,9 +529,16 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, ps=st; st=states[st]S(*s++); if (st == WPRE) { + // See if "fast" is requested. Difference is only + // relevant for a fast type of minimum width 16. + int fast16 = HPRE; + if (*s == 'f') { + fast16 = BARE; + ++s; + } switch (getint(&s)) { case 8: st = HHPRE; goto wpre; - case 16: st = HPRE; goto wpre; + case 16: st = fast16; goto wpre; case 32: st = BARE; goto wpre; #if UINTPTR_MAX >= UINT64_MAX case 64: st = LPRE; goto wpre; diff --git a/src/stdio/vfwprintf.c b/src/stdio/vfwprintf.c index 4320761a..4e9ce63a 100644 --- a/src/stdio/vfwprintf.c +++ b/src/stdio/vfwprintf.c @@ -244,9 +244,16 @@ static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_ ps=st; st=states[st]S(*s++); if (st == WPRE) { + // See if "fast" is requested. Difference is only + // relevant for a fast type of minimum width 16. + int fast16 = HPRE; + if (*s == 'f') { + fast16 = BARE; + ++s; + } switch (getint(&s)) { case 8: st = HHPRE; goto wpre; - case 16: st = HPRE; goto wpre; + case 16: st = fast16; goto wpre; case 32: st = BARE; goto wpre; #if UINTPTR_MAX >= UINT64_MAX case 64: st = LPRE; goto wpre; -- 2.34.1