Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-26 22:48:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

2009-05-15 Joel Sherrill <joel.sherrill@OARcorp.com>

Browse Source 
* libcsupport/Makefile.am, libcsupport/src/printk.c: Restructure to
	make analysis and coverage easier. Now 100% covered.
	* libcsupport/src/vprintk.c: New file.
This commit is contained in:
Joel Sherrill
2009-05-15 15:02:43 +00:00
parent 4a6d16043f
commit 7bd0dbc385
4 changed files with 189 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cpukit/ChangeLog
View File

@@ -1,3 +1,9 @@
2009-05-15 Joel Sherrill <joel.sherrill@OARcorp.com>
* libcsupport/Makefile.am, libcsupport/src/printk.c: Restructure to
make analysis and coverage easier. Now 100% covered.
* libcsupport/src/vprintk.c: New file.
2009-05-13 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1411/cpukit

2
cpukit/libcsupport/Makefile.am
View File

@@ -109,7 +109,7 @@ LIBC_GLUE_C_FILES = src/__getpid.c src/__gettod.c src/__times.c \
BSD_LIBC_C_FILES = src/strlcpy.c src/strlcat.c
libcsupport_a_SOURCES = src/gxx_wrappers.c src/getchark.c src/printk.c \
src/printk_plugin.c \
src/printk_plugin.c src/vprintk.c \
$(BSD_LIBC_C_FILES) $(BASE_FS_C_FILES) $(MALLOC_C_FILES) \
$(ERROR_C_FILES) $(ASSOCIATION_C_FILES)

137
cpukit/libcsupport/src/printk.c
View File

@@ -24,143 +24,6 @@
#include <stdio.h>
#include <rtems/bspIo.h>
/*
* printNum - print number in a given base.
* Arguments
* num - number to print
* base - base used to print the number.
*/
static void printNum(
long unsigned int num,
int base,
int sign,
int maxwidth,
int lead
)
{
long unsigned int n;
int count;
char toPrint[20];
if ( (sign == 1) && ((long)num < 0) ) {
BSP_output_char('-');
num = -num;
if (maxwidth) maxwidth--;
}
count = 0;
while ((n = num / base) > 0) {
toPrint[count++] = (num - (n*base));
num = n;
}
toPrint[count++] = num;
for (n=maxwidth ; n > count; n-- )
BSP_output_char(lead);
for (n = 0; n < count; n++) {
BSP_output_char("0123456789ABCDEF"[(int)(toPrint[count-(n+1)])]);
}
}
/*
* vprintk
*
* A simplified version of printf intended for use when the
* console is not yet initialized or in ISR's.
*
* Arguments:
* as in printf: fmt - format string, ... - unnamed arguments.
*/
void vprintk(
const char *fmt,
va_list ap
)
{
char c, *str;
int lflag, base, sign, width, lead, minus;
for (; *fmt != '\0'; fmt++) {
lflag = 0;
base = 0;
sign = 0;
width = 0;
minus = 0;
lead = ' ';
if (*fmt == '%') {
fmt++;
if (*fmt == '0' ) {
lead = '0';
fmt++;
}
if (*fmt == '-' ) {
minus = 1;
fmt++;
}
while (*fmt >= '0' && *fmt <= '9' ) {
width *= 10;
width += (*fmt - '0');
fmt++;
}
if ((c = *fmt) == 'l') {
lflag = 1;
c = *++fmt;
}
switch (c) {
case 'o': case 'O': base = 8; sign = 0; break;
case 'i': case 'I':
case 'd': case 'D': base = 10; sign = 1; break;
case 'u': case 'U': base = 10; sign = 0; break;
case 'x': case 'X': base = 16; sign = 0; break;
case 'p': base = 16; sign = 0; lflag = 1; break;
case 's':
{ int i, len;
char *s;
str = va_arg(ap, char *);
/* calculate length of string */
for ( len=0, s=str ; *s ; len++, s++ )
;
/* leading spaces */
if ( !minus )
for ( i=len ; i<width ; i++ )
BSP_output_char(' ');
/* no width option */
if (width == 0) {
width = len;
}
/* output the string */
for ( i=0 ; i<width && *str ; str++ )
BSP_output_char(*str);
/* trailing spaces */
if ( minus )
for ( i=len ; i<width ; i++ )
BSP_output_char(' ');
}
break;
case 'c':
BSP_output_char(va_arg(ap, int));
break;
default:
BSP_output_char(c);
break;
} /* switch*/
if (base)
printNum(lflag ? va_arg(ap, long int) : (long int)va_arg(ap, int),
base, sign, width, lead);
} else {
BSP_output_char(*fmt);
}
}
}
/*
* printk
*

182
cpukit/libcsupport/src/vprintk.c Normal file
View File

@@ -0,0 +1,182 @@
/*
* (C) Copyright 1997 -
* - NavIST Group - Real-Time Distributed Systems and Industrial Automation
*
* http://pandora.ist.utl.pt
*
* Instituto Superior Tecnico * Lisboa * PORTUGAL
*
* Disclaimer:
*
* This file is provided "AS IS" without warranty of any kind, either
* expressed or implied.
*
* This code is based on code by: Jose Rufino - IST
*
* $Id$
*/
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdarg.h>
#include <stdio.h>
#include <rtems/bspIo.h>
static void printNum(
long unsigned int num,
int base,
int sign,
int maxwidth,
int lead
);
/*
* vprintk
*
* A simplified version of printf intended for use when the
* console is not yet initialized or in ISR's.
*
* Arguments:
* as in printf: fmt - format string, ... - unnamed arguments.
*/
void vprintk(
const char *fmt,
va_list ap
)
{
char c, *str;
int lflag, base, sign, width, lead, minus;
for (; *fmt != '\0'; fmt++) {
lflag = 0;
base = 0;
sign = 0;
width = 0;
minus = 0;
lead = ' ';
if (*fmt != '%') {
BSP_output_char(*fmt);
continue;
}
fmt++;
if (*fmt == '0' ) {
lead = '0';
fmt++;
}
if (*fmt == '-' ) {
minus = 1;
fmt++;
}
while (*fmt >= '0' && *fmt <= '9' ) {
width *= 10;
width += (*fmt - '0');
fmt++;
}
if ((c = *fmt) == 'l') {
lflag = 1;
c = *++fmt;
}
if ( c == 'c' ) {
BSP_output_char(va_arg(ap, int));
continue;
}
if ( c == 's' ) {
int i, len;
char *s;
str = va_arg(ap, char *);
/* calculate length of string */
for ( len=0, s=str ; *s ; len++, s++ )
;
/* leading spaces */
if ( !minus )
for ( i=len ; i<width ; i++ )
BSP_output_char(' ');
/* no width option */
if (width == 0) {
width = len;
}
/* output the string */
for ( i=0 ; i<width && *str ; str++ )
BSP_output_char(*str);
/* trailing spaces */
if ( minus )
for ( i=len ; i<width ; i++ )
BSP_output_char(' ');
continue;
}
/* must be a numeric format or something unsupported */
if ( c == 'o' || c == 'O' ) {
base = 8; sign = 0;
} else if ( c == 'i' || c == 'I' ||
c == 'd' || c == 'D' ) {
base = 10; sign = 1;
} else if ( c == 'u' || c == 'U' ) {
base = 10; sign = 0;
} else if ( c == 'x' || c == 'X' ) {
base = 16; sign = 0;
} else if ( c == 'p' ) {
base = 16; sign = 0; lflag = 1;
} else {
BSP_output_char(c);
continue;
}
printNum(
lflag ? va_arg(ap, long int) : (long int)va_arg(ap, int),
base,
sign,
width,
lead
);
}
}
/*
* printNum - print number in a given base.
* Arguments
* num - number to print
* base - base used to print the number.
*/
static void printNum(
long unsigned int num,
int base,
int sign,
int maxwidth,
int lead
)
{
long unsigned int n;
int count;
char toPrint[20];
if ( (sign == 1) && ((long)num < 0) ) {
BSP_output_char('-');
num = -num;
if (maxwidth) maxwidth--;
}
count = 0;
while ((n = num / base) > 0) {
toPrint[count++] = (num - (n*base));
num = n;
}
toPrint[count++] = num;
for (n=maxwidth ; n > count; n-- )
BSP_output_char(lead);
for (n = 0; n < count; n++) {
BSP_output_char("0123456789ABCDEF"[(int)(toPrint[count-(n+1)])]);
}
}