Index: libc/Makefile =================================================================== --- libc/Makefile (revision df50cf6aec469fdb0aae1ef0280373f8ac8fc15e) +++ libc/Makefile (revision 4e2cf8b9b24f9ec1cf431297792cafee28300fc9) @@ -42,5 +42,6 @@ GENERIC_SOURCES = \ generic/libc.c \ - generic/io.c + generic/io/io.c \ + generic/io/print.c ARCH_SOURCES += \ Index: libc/arch/ia32/include/types.h =================================================================== --- libc/arch/ia32/include/types.h (revision df50cf6aec469fdb0aae1ef0280373f8ac8fc15e) +++ libc/arch/ia32/include/types.h (revision 4e2cf8b9b24f9ec1cf431297792cafee28300fc9) @@ -34,3 +34,13 @@ typedef signed int ssize_t; +typedef char int8_t; +typedef short int int16_t; +typedef int int32_t; +typedef long long int int64_t; + +typedef unsigned char uint8_t; +typedef unsigned short int uint16_t; +typedef unsigned int uint32_t; +typedef unsigned long long int uint64_t; + #endif Index: libc/generic/io.c =================================================================== --- libc/generic/io.c (revision df50cf6aec469fdb0aae1ef0280373f8ac8fc15e) +++ (revision ) @@ -1,51 +1,0 @@ -/* - * Copyright (C) 2005 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include - -static char nl = '\n'; - -int puts(const char * str) -{ - size_t count; - - for (count = 0; str[count] != 0; count++); - if (write(1, (void * ) str, count) == count) { - if (write(1, &nl, 1) == 1) - return 0; - } - - return EOF; -} - -ssize_t write(int fd, const void * buf, size_t count) -{ - return (ssize_t) __SYSCALL3(SYS_IO, (sysarg_t) fd, (sysarg_t) buf, (sysarg_t) count); -} Index: libc/generic/io/io.c =================================================================== --- libc/generic/io/io.c (revision 4e2cf8b9b24f9ec1cf431297792cafee28300fc9) +++ libc/generic/io/io.c (revision 4e2cf8b9b24f9ec1cf431297792cafee28300fc9) @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2005 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include + +static char nl = '\n'; + +int puts(const char * str) +{ + size_t count; + + for (count = 0; str[count] != 0; count++); + if (write(1, (void * ) str, count) == count) { + if (write(1, &nl, 1) == 1) + return 0; + } + + return EOF; +} + +/** Put count chars from buffer to stdout without adding newline + * @param buf Buffer with size at least count bytes + * @param count + * @return 0 on succes, EOF on fail + */ +int putnchars(const char * buf, size_t count) +{ + if (write(1, (void * ) buf, count) == count) { + return 0; + } + + return EOF; +} + +/** Same as puts, but does not print newline at end + * + */ +int putstr(const char * str) +{ + size_t count; + + for (count = 0; str[count] != 0; count++); + if (write(1, (void * ) str, count) == count) { + return 0; + } + + return EOF; +} + +ssize_t write(int fd, const void * buf, size_t count) +{ + return (ssize_t) __SYSCALL3(SYS_IO, (sysarg_t) fd, (sysarg_t) buf, (sysarg_t) count); +} + + Index: libc/generic/io/print.c =================================================================== --- libc/generic/io/print.c (revision 4e2cf8b9b24f9ec1cf431297792cafee28300fc9) +++ libc/generic/io/print.c (revision 4e2cf8b9b24f9ec1cf431297792cafee28300fc9) @@ -0,0 +1,298 @@ +/* + * Copyright (C) 2001-2004 Jakub Jermar + * Copyright (C) 2006 Josef Cejka + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include + +static char digits[] = "0123456789abcdef"; /**< Hexadecimal characters */ + +/** Print hexadecimal digits + * + * Print fixed count of hexadecimal digits from + * the number num. The digits are printed in + * natural left-to-right order starting with + * the width-th digit. + * + * @param num Number containing digits. + * @param width Count of digits to print. + * + */ +static int print_fixed_hex(const uint64_t num, const int width) +{ + int i; + char buf[16]; + char *bptr; + + bptr = buf; + for (i = width*8 - 4; i >= 0; i -= 4) + *bptr++ = digits[(num>>i) & 0xf]; + *bptr = '\0'; + + return putstr(buf); +} + + +/** Print number in given base + * + * Print significant digits of a number in given + * base. + * + * @param num Number to print. + * @param base Base to print the number in (should + * be in range 2 .. 16). + * + */ +static int print_number(const unsigned int num, const unsigned int base) +{ + int val = num; + char d[sizeof(unsigned int)*8+1]; /* this is good enough even for base == 2 */ + int i = sizeof(unsigned int)*8-1; + + do { + d[i--] = digits[val % base]; + } while (val /= base); + + d[sizeof(unsigned int)*8] = 0; + + return putstr(&d[i + 1]); +} + + + +/** General formatted text print + * + * Print text formatted according the fmt parameter + * and variant arguments. Each formatting directive + * begins with \% (percentage) character and one of the + * following character: + * + * \% Prints the percentage character. + * + * s The next variant argument is treated as char* + * and printed as a NULL terminated string. + * + * c The next variant argument is treated as a single char. + * + * p The next variant argument is treated as a maximum + * bit-width integer with respect to architecture + * and printed in full hexadecimal width. + * + * P As with 'p', but '0x' is prefixed. + * + * q The next variant argument is treated as a 64b integer + * and printed in full hexadecimal width. + * + * Q As with 'q', but '0x' is prefixed. + * + * l The next variant argument is treated as a 32b integer + * and printed in full hexadecimal width. + * + * L As with 'l', but '0x' is prefixed. + * + * w The next variant argument is treated as a 16b integer + * and printed in full hexadecimal width. + * + * W As with 'w', but '0x' is prefixed. + * + * b The next variant argument is treated as a 8b integer + * and printed in full hexadecimal width. + * + * B As with 'b', but '0x' is prefixed. + * + * d The next variant argument is treated as integer + * and printed in standard decimal format (only significant + * digits). + * + * x The next variant argument is treated as integer + * and printed in standard hexadecimal format (only significant + * digits). + * + * X As with 'x', but '0x' is prefixed. + * + * All other characters from fmt except the formatting directives + * are printed in verbatim. + * + * @param fmt Formatting NULL terminated string. + */ +int printf(const char *fmt, ...) +{ + int i = 0, j = 0; + int counter, retval; + va_list ap; + char c; + + counter = 0; + va_start(ap, fmt); + + while ((c = fmt[i])) { + /* control character */ + if (c == '%' ) { + /* print common characters if any processed */ + if (i > j) { + if ((retval = putnchars(&fmt[j], i - j)) == EOF) { /* error */ + return -counter; + } + counter += retval; + } + + j = ++i; + + switch (c = fmt[i]) { + + /* percentile itself */ + case '%': + --j; /* soon will be incremented back */ + break; + + /* + * String and character conversions. + */ + case 's': + if ((retval = putstr(va_arg(ap, char*))) == EOF) { + return -counter; + }; + + counter += retval; + break; + case 'c': + if ((retval = putnchars((char *)&va_arg(ap, int), sizeof(char))) == EOF) { + return -counter; + }; + + counter += retval; + break; + + /* + * Hexadecimal conversions with fixed width. + */ + case 'P': + if ((retval = putnchars("0x", 2)) == EOF) { + return -counter; + }; + + counter += retval; + case 'p': + if ((retval = print_fixed_hex(va_arg(ap, int), sizeof(int))) == EOF ) { + return -counter; + }; + + counter += retval; + break; + case 'Q': + if ((retval = putnchars("0x", 2)) == EOF) { + return -counter; + }; + + counter += retval; + case 'q': + if ((retval = print_fixed_hex(va_arg(ap, uint64_t), sizeof(uint64_t))) == EOF ) { + return -counter; + }; + + counter += retval; + break; + case 'L': + if ((retval = putnchars("0x", 2)) == EOF) { + return -counter; + }; + + counter += retval; + case 'l': + if ((retval = print_fixed_hex(va_arg(ap, int), sizeof(uint32_t))) == EOF ) { + return -counter; + }; + + counter += retval; + break; + case 'W': + if ((retval = putnchars("0x", 2)) == EOF) { + return -counter; + }; + + counter += retval; + case 'w': + if ((retval = print_fixed_hex(va_arg(ap, int), sizeof(uint16_t))) == EOF ) { + return -counter; + }; + + counter += retval; + break; + case 'B': + if ((retval = putnchars("0x", 2)) == EOF) { + return -counter; + }; + + counter += retval; + case 'b': + if ((retval = print_fixed_hex(va_arg(ap, int), sizeof(uint8_t))) == EOF ) { + return -counter; + }; + + counter += retval; + break; + /* + * Decimal and hexadecimal conversions. + */ + case 'd': + if ((retval = print_number(va_arg(ap, int), 10)) == EOF ) { + return -counter; + }; + + counter += retval; + break; + case 'X': + if ((retval = putnchars("0x", 2)) == EOF) { + return -counter; + }; + + counter += retval; + case 'x': + if ((retval = print_number(va_arg(ap, int), 16)) == EOF ) { + return -counter; + }; + + counter += retval; + break; + /* + * Bad formatting. + */ + default: + return -counter; + } + ++j; + } + ++i; + } + + va_end(ap); + return counter; +} + Index: libc/include/io/io.h =================================================================== --- libc/include/io/io.h (revision 4e2cf8b9b24f9ec1cf431297792cafee28300fc9) +++ libc/include/io/io.h (revision 4e2cf8b9b24f9ec1cf431297792cafee28300fc9) @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2006 Josef Cejka + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __LIBC__IO_H__ +#define __LIBC__IO_IO_H__ + +#include + +int putnchars(const char * buf, size_t count); +int putstr(const char * str); + +#endif Index: libc/include/stdarg.h =================================================================== --- libc/include/stdarg.h (revision 4e2cf8b9b24f9ec1cf431297792cafee28300fc9) +++ libc/include/stdarg.h (revision 4e2cf8b9b24f9ec1cf431297792cafee28300fc9) @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2006 Josef Cejka + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __LIBC__STDARG_H__ +#define __LIBC__STDARG_H__ + +#ifndef __VARARGS_DEFINED +#define __VARARGS_DEFINED + +/* + * Variable argument list manipulation macros + * for architectures using stack to pass arguments. + */ + +#include + +typedef struct va_list { + int pos; + uint8_t *last; +} va_list; + +#define va_start(ap, lst) \ + (ap).pos = sizeof(lst); \ + (ap).last = (uint8_t *) &(lst) + +#define va_arg(ap, type) \ + (*((type *)((ap).last + ((ap).pos += sizeof(type) ) - sizeof(type)))) + +#define va_end(ap) + +#endif + + +#endif Index: libc/include/stddef.h =================================================================== --- libc/include/stddef.h (revision 4e2cf8b9b24f9ec1cf431297792cafee28300fc9) +++ libc/include/stddef.h (revision 4e2cf8b9b24f9ec1cf431297792cafee28300fc9) @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2006 Josef Cejka + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __LIBC__STDDEF_H__ +#define __LIBC__STDDEF_H__ + +#include + +#endif + Index: libc/include/stdio.h =================================================================== --- libc/include/stdio.h (revision df50cf6aec469fdb0aae1ef0280373f8ac8fc15e) +++ libc/include/stdio.h (revision 4e2cf8b9b24f9ec1cf431297792cafee28300fc9) @@ -32,7 +32,9 @@ #include -#define EOF -1 +#define EOF (-1) extern int puts(const char * str); +extern int printf(const char *fmt, ...); + #endif