From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A77B942EEA4 for ; Fri, 6 Feb 2026 19:11:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770405095; cv=none; b=jlVjlf4WKkX+kYzWVOIIMBLV/6kuwynEN1Le8plFmUIkRjn0sQEhkjM0RlF9BtS8xsPeWEBbH6knKt9CelyV7z8FKwMQMWfmTSAp9d43UozAj7yhn1CN4jXVusearUSeX4sHWFgSET77fyUm669WIKA2nSWQqryIQZphrORYplM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770405095; c=relaxed/simple; bh=4oCQFYOg/0M8yl82LWdInO0Pj69s4tlR0IZQji9kEQo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bdclBxQfDNeDX86MUTuvvSwmdDRX3mahkk26eNTI4YyE0N962HSmc/vLTtS3Eq9VQLk5Tx8PN3VGxo32K4cJYYqKV69Xpm0rg8U7YDfadJ+5++4FgedQicGKeaqOiso6Wn+xA86bw48PlC1N0PiloEjsE+yaPgwuU935iQ+tthY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=cC6bZBXe; arc=none smtp.client-ip=209.85.221.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cC6bZBXe" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-436317c80f7so170985f8f.1 for ; Fri, 06 Feb 2026 11:11:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770405093; x=1771009893; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1dqFuilW6hD3O9X2C2BhB+OrOnto/M3VwRlv2649nvo=; b=cC6bZBXew2a9MdRLWwZ5gOG2nIb0/8Ng0ihWuXUODnkGudm08ZAU+xNt60rps0dg7C rGdc6phZl3POsJuZSe8rUbE5U7Pxdid2va6FNFJpflXYSiVJbuIq4/ZGuNWTuhte9Jtv Of+rADsHTra7a9SYfhlIZTw8Vv2IO9Pux9153kkHoCDjVwEyqNXHO1LUFgYPH4LSHk26 atGPUFrwXCZnQvEEcPAGjPKRgGoBPMryr71kDoMFbUDSQsb0nTgm9WQZYX/yMUikYStW s3Lz9ZiO9PtmomGXFkko2MLEVITlL9Z+WEdoW7ytnU4xNfGmIr2gGJuFToCYYoW/ODhT RQCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770405093; x=1771009893; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=1dqFuilW6hD3O9X2C2BhB+OrOnto/M3VwRlv2649nvo=; b=GzfNBhgC5a3Ume09YUPuy/7sMHDsZBRztD90YIwtC6Dex05KZCN7DHeM/arXEObfbX BQtv3gT0ef1R/rWEy5gUPm8AKZpzBqWODNPpxyPetOcn9rz6vLmeFPxxmkOBLKEmcp8Q ogchDwbstQR2M9A5vJ+4z8QCbaMZUw1onJLWNqg4KAfrMga4TbH9nc0IXK/4mH4PIJhn DCun8LrOQgtLmBff8qSXKwL96VePca+Bm5pHUzl19GdrW+7aBRJbQcLWtzqffXuP7F4c 4qkTxGHH4Gj9N6KqGXIHQ68/5uon5BvPaF7/R3TXwR8NM/f8uyUJdpqYVa5r0GI048Vm K1Hg== X-Forwarded-Encrypted: i=1; AJvYcCVIq2uI3iP38EBUKpH1Ll+XtNdIkxEVUczXob4SaPoEOtKpgv1ApHdIhEhtRtnEhQDru5ac+cNNMJJdac4=@vger.kernel.org X-Gm-Message-State: AOJu0YxcQVO7uZoZ8UzSfXyjiuwpU37PE6rHDRimIc/0g6ZAWuALbmPI Zyt2x4L9jM4nTIB/tNhQkgS2V74zm2mgjJlH8yjH6IdLXH6HYr7f4c3H X-Gm-Gg: AZuq6aLd4fP21v0cW05DNMxfN9MBUe3cDXeT63P4VOlu0jYsNNLJCfFRWccdhEmVAc/ WRfPdRXEr2GNdlxj55UhamdfhV3WxnGRjXx2TybknCBkd0U/xHfA0eTdDbJ5nmSTYANYBxLQXyZ lH7hjoHZcorF0Ipu2RiLZ0Xlg3RTKzrS+5LwnDFc1+0ktuLJdzd1vpIzHVkczIN3Jn5zMKLpxwc n99K3Z8qUJggdMd65J10ADkTa+YX4FQNXBgNFI47Hiwvms4vTPJ83hr5KJwsw5I+czVEhPCZvtY /EdW+0wHbjYemdxgz+CiJ+HRSMuJr1bBAB8pFJQZpQ6CQTQaSWFXkHIggEw3MlMc88JEYzs0GU2 4hJQVCwiJ00FAstvJUTugCjqPz1Tcx8BPye46fbizdKtElOe7LtTJC9DCcqCpmOGLbJLD87eiYj YKSgXjCGRDZJKwqDQSXv9Izz4BAq2c0iWRHq+NNBGhlXwZ/5jWXZOmftmPwSTGz9O3Lp0aIVPL X-Received: by 2002:a5d:5f55:0:b0:435:8dd5:ad4f with SMTP id ffacd0b85a97d-436209964d4mr11614558f8f.9.1770405093010; Fri, 06 Feb 2026 11:11:33 -0800 (PST) Received: from snowdrop.snailnet.com (82-69-66-36.dsl.in-addr.zen.co.uk. [82.69.66.36]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4362972fb81sm8703681f8f.20.2026.02.06.11.11.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 11:11:32 -0800 (PST) From: david.laight.linux@gmail.com To: Willy Tarreau , =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , linux-kernel@vger.kernel.org, Cheng Li Cc: David Laight Subject: [PATCH v2 next 06/11] tools/nolibc/printf: Use bit-masks to hold requested flag, length and conversion chars Date: Fri, 6 Feb 2026 19:11:16 +0000 Message-Id: <20260206191121.3602-7-david.laight.linux@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260206191121.3602-1-david.laight.linux@gmail.com> References: <20260206191121.3602-1-david.laight.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: David Laight Use flags bits (1u << (ch & 31)) for the flags, length modifiers, and conversion specifiers. This makes it easy to test for multiple values at once. Detect the conversion flags " #+-0" although they are currently all ignored. Add support for length modifiers 't' and 'z' (both long) and 'q' and 'L' (both long long). Add support for "%i" (the same as %d"). Unconditionally generate the signed values (for %d) to remove a second set of checks for the size. Signed-off-by: David Laight --- Changes for v2: - Use #defines to make the code a lot more readable. - Include the changes from the old patch 10 that used masks for the conversion specifiers. - Detect all the valid flag characters even though they are not implemented. - Support for left justifying field is moved to patch 7. tools/include/nolibc/stdio.h | 151 ++++++++++++++++++++++++----------- 1 file changed, 103 insertions(+), 48 deletions(-) diff --git a/tools/include/nolibc/stdio.h b/tools/include/nolibc/stdio.h index bb54f488c228..b14cf8224403 100644 --- a/tools/include/nolibc/stdio.h +++ b/tools/include/nolibc/stdio.h @@ -240,19 +240,44 @@ char *fgets(char *s, int size, FILE *stream) } -/* minimal printf(). It supports the following formats: - * - %[l*]{d,u,c,x,p} - * - %s - * - unknown modifiers are ignored. +/* simple printf(). It supports the following formats: + * - %[-][width][{l,t,z,ll,L,j,q}]{d,u,c,x,p,s,m,%} + * - %% + * - invalid formats are copied to the output buffer */ + +/* This code uses 'flag' variables that are indexed by the low 6 bits + * of characters to optimise checks for multiple characters. + * + * _NOLIBC_PF_FLAGS_CONTAIN(flags, 'a', 'b'. ...) + * returns non-zero if the bit for any of the specified characters is set. + * + * _NOLIBC_PF_CHAR_IS_ONE_OF(ch, 'a', 'b'. ...) + * returns the flag bit for ch if it is one of the specified characters. + * All the characters must be in the same 32 character block (non-alphabetic, + * upper case, or lower case) of the ASCII character set.) + */ +#define _NOLIBC_PF_FLAG(ch) (1u << ((ch) & 0x1f)) +#define _NOLIBC_PF_FLAG_NZ(ch) ((ch) ? _NOLIBC_PF_FLAG(ch) : 0) +#define _NOLIBC_PF_FLAG8(cmp_1, cmp_2, cmp_3, cmp_4, cmp_5, cmp_6, cmp_7, cmp_8, ...) \ + (_NOLIBC_PF_FLAG_NZ(cmp_1) | _NOLIBC_PF_FLAG_NZ(cmp_2) | \ + _NOLIBC_PF_FLAG_NZ(cmp_3) | _NOLIBC_PF_FLAG_NZ(cmp_4) | \ + _NOLIBC_PF_FLAG_NZ(cmp_5) | _NOLIBC_PF_FLAG_NZ(cmp_6) | \ + _NOLIBC_PF_FLAG_NZ(cmp_7) | _NOLIBC_PF_FLAG_NZ(cmp_8)) +#define _NOLIBC_PF_FLAGS_CONTAIN(flags, ...) \ + ((flags) & _NOLIBC_PF_FLAG8(__VA_ARGS__, 0, 0, 0, 0, 0, 0, 0)) +#define _NOLIBC_PF_CHAR_IS_ONE_OF(ch, cmp_1, ...) \ + (ch < (cmp_1 & ~0x1f) || ch > (cmp_1 | 0x1f) ? 0 : \ + _NOLIBC_PF_FLAGS_CONTAIN(_NOLIBC_PF_FLAG(ch), cmp_1, __VA_ARGS__)) + typedef int (*__nolibc_printf_cb)(void *state, const char *buf, size_t size); static __attribute__((unused, format(printf, 3, 0))) int __nolibc_printf(__nolibc_printf_cb cb, void *state, const char *fmt, va_list args) { - char lpref, ch; - unsigned long long v; + char ch; unsigned int written, width; + unsigned int flags, ch_flag; size_t len; char tmpbuf[21]; const char *outstr; @@ -265,6 +290,7 @@ int __nolibc_printf(__nolibc_printf_cb cb, void *state, const char *fmt, va_list break; width = 0; + flags = 0; if (ch != '%') { while (*fmt && *fmt != '%') fmt++; @@ -274,6 +300,14 @@ int __nolibc_printf(__nolibc_printf_cb cb, void *state, const char *fmt, va_list ch = *fmt++; + /* Conversion flag characters */ + for (;; ch = *fmt++) { + ch_flag = _NOLIBC_PF_CHAR_IS_ONE_OF(ch, ' ', '#', '+', '-', '0'); + if (!ch_flag) + break; + flags |= ch_flag; + } + /* width */ while (ch >= '0' && ch <= '9') { width *= 10; @@ -282,62 +316,77 @@ int __nolibc_printf(__nolibc_printf_cb cb, void *state, const char *fmt, va_list ch = *fmt++; } - /* Length modifiers */ - if (ch == 'l') { - lpref = 1; - ch = *fmt++; - if (ch == 'l') { - lpref = 2; - ch = *fmt++; + /* Length modifier. + * They miss the conversion flags characters " #+-0" so can go into flags. + * Change both L and ll to q. + */ + if (ch == 'L') + ch = 'q'; + ch_flag = _NOLIBC_PF_CHAR_IS_ONE_OF(ch, 'l', 't', 'z', 'j', 'q'); + if (ch_flag != 0) { + if (ch == 'l' && fmt[0] == 'l') { + fmt++; + ch_flag = _NOLIBC_PF_FLAG('q'); } - } else if (ch == 'j') { - /* intmax_t is long long */ - lpref = 2; + flags |= ch_flag; ch = *fmt++; - } else { - lpref = 0; } - if (ch == 'c' || ch == 'd' || ch == 'u' || ch == 'x' || ch == 'p') { + /* Conversion specifiers. */ + + /* Numeric conversion specifiers. */ + ch_flag = _NOLIBC_PF_CHAR_IS_ONE_OF(ch, 'c', 'd', 'i', 'u', 'x', 'p'); + if (ch_flag != 0) { + unsigned long long v; + long long signed_v; char *out = tmpbuf; - if (ch == 'p') + /* 'long' is needed for pointer/string conversions and ltz lengths. + * A single test can be used provided 'p' (the same bit as '0') + * is masked from flags. + */ + if (_NOLIBC_PF_FLAGS_CONTAIN(ch_flag | (flags & ~_NOLIBC_PF_FLAG('p')), + 'p', 'l', 't', 'z')) { v = va_arg(args, unsigned long); - else if (lpref) { - if (lpref > 1) - v = va_arg(args, unsigned long long); - else - v = va_arg(args, unsigned long); - } else + signed_v = (long)v; + } else if (_NOLIBC_PF_FLAGS_CONTAIN(flags, 'j', 'q')) { + v = va_arg(args, unsigned long long); + signed_v = v; + } else { v = va_arg(args, unsigned int); + signed_v = (int)v; + } - if (ch == 'd') { - /* sign-extend the value */ - if (lpref == 0) - v = (long long)(int)v; - else if (lpref == 1) - v = (long long)(long)v; + if (_NOLIBC_PF_FLAGS_CONTAIN(ch_flag, 'c')) { + /* "%c" - single character. */ + tmpbuf[0] = v; + len = 1; + outstr = tmpbuf; + goto do_output; } - switch (ch) { - case 'c': - out[0] = v; - out[1] = 0; - break; - case 'd': - i64toa_r(v, out); - break; - case 'u': + if (_NOLIBC_PF_FLAGS_CONTAIN(ch_flag, 'd', 'i')) { + /* "%d" and "%i" - signed decimal numbers. */ + if (signed_v < 0) { + *out++ = '-'; + v = -(signed_v + 1); + v++; + } + } + + /* Convert the number to ascii in the required base. */ + if (_NOLIBC_PF_FLAGS_CONTAIN(ch_flag, 'd', 'i', 'u')) { + /* Base 10 */ u64toa_r(v, out); - break; - case 'p': - *(out++) = '0'; - *(out++) = 'x'; - __nolibc_fallthrough; - default: /* 'x' and 'p' above */ + } else { + /* Base 16 */ + if (_NOLIBC_PF_FLAGS_CONTAIN(ch_flag, 'p')) { + *(out++) = '0'; + *(out++) = 'x'; + } u64toh_r(v, out); - break; } + outstr = tmpbuf; } else if (ch == 's') { @@ -366,8 +415,14 @@ int __nolibc_printf(__nolibc_printf_cb cb, void *state, const char *fmt, va_list len = strlen(outstr); } +do_output: written += len; + /* An OPTIMIZER_HIDE_VAR() seems to stop gcc back-merging this + * code into one of the conditionals above. + */ + __asm__ volatile("" : "=r"(len) : "0"(len)); + while (width > len) { unsigned int pad_len = ((width - len - 1) & 15) + 1; width -= pad_len; -- 2.39.5