JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fold POP_INT into code

Browse Source 
XXX untested, may break things or have side effects
XXX not optimised and ugly as hell, can't we do it better?
XXX do I understand it entirely?

tested on sun4u -m64 only
This commit is contained in:
tg 2007-01-15 00:37:42 +00:00
parent a712de8e63
commit b7978f3bb9
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
shf.c
View File

@ -2,7 +2,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/shf.c,v 1.9 2007/01/12 10:18:22 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/shf.c,v 1.10 2007/01/15 00:37:42 tg Exp $");
/* flags to shf_emptybuf() */ /* flags to shf_emptybuf() */
#define EB_READSW 0x01 /* about to switch to reading */ #define EB_READSW 0x01 /* about to switch to reading */
@ -707,26 +707,10 @@ shf_smprintf(const char *fmt, ...)
#endif #endif
#define BUF_SIZE 128 #define BUF_SIZE 128
#define FPBUF_SIZE (DMAXEXP+16)/* this must be > /* must be > MAX(DMAXEXP, log10(pow(2, DSIGNIF))) + ceil(log10(DMAXEXP)) + 8
* MAX(DMAXEXP, log10(pow(2, DSIGNIF))) * (I think); since it's hard to express as a constant, just use a large buffer
* + ceil(log10(DMAXEXP)) + 8 (I think).
* Since this is hard to express as a
* constant, just use a large buffer.
*/
/*
* What kinda of machine we on? Hopefully the C compiler will optimise
* this out...
*
* For shorts, we want sign extend for %d but not for %[oxu] - on 16 bit
* machines it don't matter. Assumes C compiler has converted shorts to
* ints before pushing them.
*/ */
#define POP_INT(f, s, a) \ #define FPBUF_SIZE (DMAXEXP+16)
(((f) & FL_LONG) ? va_arg((a), unsigned long) : \
(sizeof(int) < sizeof(long) ? ((s) ? \
(long) va_arg((a), int) : va_arg((a), unsigned)) : \
va_arg((a), unsigned)))
#define FL_HASH 0x001 /* '#' seen */ #define FL_HASH 0x001 /* '#' seen */
#define FL_PLUS 0x002 /* '+' seen */ #define FL_PLUS 0x002 /* '+' seen */
@ -859,7 +843,21 @@ shf_vfprintf(struct shf *shf, const char *fmt, va_list args)
case 'x': case 'x':
flags |= FL_NUMBER; flags |= FL_NUMBER;
s = &numbuf[sizeof(numbuf)]; s = &numbuf[sizeof(numbuf)];
lnum = POP_INT(flags, c == 'd', args); /*-
* XXX any better way to do this?
* XXX hopefully the compiler optimises this out
*
* For shorts, we want sign extend for %d but not
* for %[oxu] - on 16 bit machines it doesn't matter.
* Assumes C compiler has converted shorts to ints
* before pushing them. XXX optimise this -tg
*/
if (flags & FL_LONG)
lnum = va_arg(args, unsigned long);
else if ((sizeof (int) < sizeof (long)) && (c == 'd'))
lnum = (long) va_arg(args, int);
else
lnum = va_arg(args, unsigned);
switch (c) { switch (c) {
case 'd': case 'd':
case 'i': case 'i':