jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use macros instead of inline functions in shgetc.h

Browse source 
at -Os optimization level, gcc refuses to inline these functions even
though the inlined code would roughly the same size as the function
call, and much faster. the easy solution is to make them into macros.
This commit is contained in:
Rich Felker 2012-04-13 03:59:36 -04:00
commit 26832d045f
1 changed files with 4 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/internal/shgetc.h
View file

@ -3,23 +3,7 @@
void __shlim(FILE *, off_t); void __shlim(FILE *, off_t);
int __shgetc(FILE *); int __shgetc(FILE *);
static inline off_t shcnt(FILE *f) #define shcnt(f) ((f)->shcnt + ((f)->rpos - (f)->rend))
{ #define shlim(f, lim) __shlim((f), (lim))
return f->shcnt + (f->rpos - f->rend); #define shgetc(f) (((f)->rpos < (f)->shend) ? *(f)->rpos++ : __shgetc(f))
} #define shunget(f) ((f)->rend ? (void)(f)->rpos-- : (void)0)
static inline void shlim(FILE *f, off_t lim)
{
__shlim(f, lim);
}
static inline int shgetc(FILE *f)
{
if (f->rpos < f->shend) return *f->rpos++;
return __shgetc(f);
}
static inline void shunget(FILE *f)
{
if (f->rend) f->rpos--;
}