From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>,
linux-kernel@vger.kernel.org
Subject: [PATCH 05/14] lib/vsprintf.c: help gcc make number() smaller
Date: Mon, 23 Nov 2015 22:29:22 +0100 [thread overview]
Message-ID: <1448314171-25856-6-git-send-email-linux@rasmusvillemoes.dk> (raw)
In-Reply-To: <1448314171-25856-1-git-send-email-linux@rasmusvillemoes.dk>
One consequence of the reorganization of struct printf_spec to make
field_width 24 bits was that number() gained about 180 bytes. Since
spec is never passed to other functions, we can help gcc make number()
lose most of that extra weight by using local variables for the field
width and precision.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
---
lib/vsprintf.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 01c3aa638582..d7e27c54fa00 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -399,6 +399,8 @@ char *number(char *buf, char *end, unsigned long long num,
int need_pfx = ((spec.flags & SPECIAL) && spec.base != 10);
int i;
bool is_zero = num == 0LL;
+ int field_width = spec.field_width;
+ int precision = spec.precision;
/* locase = 0 or 0x20. ORing digits or letters with 'locase'
* produces same digits or (maybe lowercased) letters */
@@ -410,20 +412,20 @@ char *number(char *buf, char *end, unsigned long long num,
if ((signed long long)num < 0) {
sign = '-';
num = -(signed long long)num;
- spec.field_width--;
+ field_width--;
} else if (spec.flags & PLUS) {
sign = '+';
- spec.field_width--;
+ field_width--;
} else if (spec.flags & SPACE) {
sign = ' ';
- spec.field_width--;
+ field_width--;
}
}
if (need_pfx) {
if (spec.base == 16)
- spec.field_width -= 2;
+ field_width -= 2;
else if (!is_zero)
- spec.field_width--;
+ field_width--;
}
/* generate full string in tmp[], in reverse order */
@@ -445,12 +447,12 @@ char *number(char *buf, char *end, unsigned long long num,
}
/* printing 100 using %2d gives "100", not "00" */
- if (i > spec.precision)
- spec.precision = i;
+ if (i > precision)
+ precision = i;
/* leading space padding */
- spec.field_width -= spec.precision;
+ field_width -= precision;
if (!(spec.flags & (ZEROPAD | LEFT))) {
- while (--spec.field_width >= 0) {
+ while (--field_width >= 0) {
if (buf < end)
*buf = ' ';
++buf;
@@ -479,14 +481,14 @@ char *number(char *buf, char *end, unsigned long long num,
if (!(spec.flags & LEFT)) {
char c = ' ' + (spec.flags & ZEROPAD);
BUILD_BUG_ON(' ' + ZEROPAD != '0');
- while (--spec.field_width >= 0) {
+ while (--field_width >= 0) {
if (buf < end)
*buf = c;
++buf;
}
}
/* hmm even more zero padding? */
- while (i <= --spec.precision) {
+ while (i <= --precision) {
if (buf < end)
*buf = '0';
++buf;
@@ -498,7 +500,7 @@ char *number(char *buf, char *end, unsigned long long num,
++buf;
}
/* trailing space padding */
- while (--spec.field_width >= 0) {
+ while (--field_width >= 0) {
if (buf < end)
*buf = ' ';
++buf;
--
2.6.1
next prev parent reply other threads:[~2015-11-23 21:33 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-23 21:29 [PATCH 00/14] printf stuff for 4.5 Rasmus Villemoes
2015-11-23 21:29 ` [PATCH 01/14] lib/vsprintf.c: pull out padding code from dentry_name() Rasmus Villemoes
2015-11-23 22:56 ` Andy Shevchenko
2015-11-26 21:41 ` Rasmus Villemoes
2015-11-23 21:29 ` [PATCH 02/14] lib/vsprintf.c: move string() below widen_string() Rasmus Villemoes
2015-11-23 21:29 ` [PATCH 03/14] lib/vsprintf.c: eliminate potential race in string() Rasmus Villemoes
2015-11-23 22:51 ` Andy Shevchenko
2015-11-26 21:31 ` Rasmus Villemoes
2015-11-23 21:29 ` [PATCH 04/14] lib/vsprintf.c: expand field_width to 24 bits Rasmus Villemoes
2015-11-23 23:05 ` Andy Shevchenko
2015-11-26 21:47 ` Rasmus Villemoes
2015-11-23 23:19 ` Tejun Heo
2015-11-23 21:29 ` Rasmus Villemoes [this message]
2015-11-23 22:17 ` [PATCH 05/14] lib/vsprintf.c: help gcc make number() smaller Andy Shevchenko
2015-11-23 21:29 ` [PATCH 06/14] lib/vsprintf.c: warn about too large precisions and field widths Rasmus Villemoes
2015-11-23 22:34 ` Andy Shevchenko
2015-11-26 21:10 ` Rasmus Villemoes
2015-11-23 21:29 ` [PATCH 07/14] lib/vsprintf.c: slightly refactor vscnprintf() Rasmus Villemoes
2015-11-23 22:39 ` Andy Shevchenko
2015-11-26 21:23 ` Rasmus Villemoes
2015-11-23 21:29 ` [PATCH 08/14] lib/kasprintf.c: add sanity check to kvasprintf Rasmus Villemoes
2015-11-23 23:10 ` Andy Shevchenko
2015-11-23 21:29 ` [PATCH 09/14] lib/test_printf.c: don't BUG Rasmus Villemoes
2015-11-23 21:29 ` [PATCH 10/14] lib/test_printf.c: check for out-of-bound writes Rasmus Villemoes
2015-11-23 21:29 ` [PATCH 11/14] lib/test_printf.c: test precision quirks Rasmus Villemoes
2015-11-23 21:29 ` [PATCH 12/14] lib/test_printf.c: account for kvasprintf tests Rasmus Villemoes
2015-11-23 21:29 ` [PATCH 13/14] lib/test_printf.c: add test for large bitmaps Rasmus Villemoes
2015-11-23 21:29 ` [PATCH 14/14] lib/test_printf.c: test dentry printing Rasmus Villemoes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1448314171-25856-6-git-send-email-linux@rasmusvillemoes.dk \
--to=linux@rasmusvillemoes.dk \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome