Mercurial > lcfOS
diff cos/kernel/snprintf.c @ 17:f3e3e0e9c4bc
First attempt IDT loader 64 bits. INT13 occurs
| author | windel |
|---|---|
| date | Sat, 19 Nov 2011 20:01:28 +0100 |
| parents | d07d4701a103 |
| children | 6129643f5c34 |
line wrap: on
line diff
--- a/cos/kernel/snprintf.c Fri Nov 18 14:41:53 2011 +0100 +++ b/cos/kernel/snprintf.c Sat Nov 19 20:01:28 2011 +0100 @@ -18,7 +18,7 @@ #define _SP 0x80 /* hard space (0x20) */ -unsigned char _ctype[] = { +uint8_t _ctype[] = { _C,_C,_C,_C,_C,_C,_C,_C, /* 0-7 */ _C,_C|_S,_C|_S,_C|_S,_C|_S,_C|_S,_C,_C, /* 8-15 */ _C,_C,_C,_C,_C,_C,_C,_C, /* 16-23 */ @@ -44,7 +44,7 @@ _L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L, /* 224-239 */ _L,_L,_L,_L,_L,_L,_L,_P,_L,_L,_L,_L,_L,_L,_L,_L}; /* 240-255 */ -#define __ismask(x) (_ctype[(int)(unsigned char)(x)]) +#define __ismask(x) (_ctype[(int)(uint8_t)(x)]) #define isalnum(c) ((__ismask(c)&(_U|_L|_D)) != 0) #define isalpha(c) ((__ismask(c)&(_U|_L)) != 0) @@ -61,14 +61,14 @@ #define isascii(c) (((unsigned char)(c))<=0x7f) #define toascii(c) (((unsigned char)(c))&0x7f) -static inline unsigned char tolower(unsigned char c) +static inline uint8_t tolower(uint8_t c) { if (isupper(c)) c -= 'A'-'a'; return c; } -static inline unsigned char toupper(unsigned char c) +static inline uint8_t toupper(uint8_t c) { if (islower(c)) c -= 'a'-'A'; @@ -86,8 +86,8 @@ void va_snprintf(char *b, int l, const char *fmt, va_list pvar) { int n, i; - uint_t u; - ulonglong_t ull; + uint32_t u; + uint64_t ull; char *t; char d[10]; char mod_l; @@ -165,7 +165,7 @@ l = 0; break; } - ull = va_arg(pvar, unsigned long long); + ull = va_arg(pvar, uint64_t); for (i = 15; i >= 0; i--) { b[i] = hexmap[ull & 0x0f]; ull >>= 4;