Rev 68 | Go to most recent revision | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 68 | Rev 77 | ||
---|---|---|---|
1 | /* |
1 | /* |
2 | * Copyright (C) 2001-2004 Jakub Jermar |
2 | * Copyright (C) 2001-2004 Jakub Jermar |
3 | * All rights reserved. |
3 | * All rights reserved. |
4 | * |
4 | * |
5 | * Redistribution and use in source and binary forms, with or without |
5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions |
6 | * modification, are permitted provided that the following conditions |
7 | * are met: |
7 | * are met: |
8 | * |
8 | * |
9 | * - Redistributions of source code must retain the above copyright |
9 | * - Redistributions of source code must retain the above copyright |
10 | * notice, this list of conditions and the following disclaimer. |
10 | * notice, this list of conditions and the following disclaimer. |
11 | * - Redistributions in binary form must reproduce the above copyright |
11 | * - Redistributions in binary form must reproduce the above copyright |
12 | * notice, this list of conditions and the following disclaimer in the |
12 | * notice, this list of conditions and the following disclaimer in the |
13 | * documentation and/or other materials provided with the distribution. |
13 | * documentation and/or other materials provided with the distribution. |
14 | * - The name of the author may not be used to endorse or promote products |
14 | * - The name of the author may not be used to endorse or promote products |
15 | * derived from this software without specific prior written permission. |
15 | * derived from this software without specific prior written permission. |
16 | * |
16 | * |
17 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
17 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
19 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
19 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
20 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
20 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
21 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
21 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
22 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
22 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
23 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
23 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 | */ |
27 | */ |
28 | 28 | ||
29 | #include <putchar.h> |
29 | #include <putchar.h> |
30 | #include <print.h> |
30 | #include <print.h> |
31 | #include <synch/spinlock.h> |
31 | #include <synch/spinlock.h> |
32 | #include <arch/arg.h> |
32 | #include <arch/arg.h> |
33 | 33 | ||
34 | 34 | ||
35 | static char digits[] = "0123456789abcdef"; /**< Hexadecimal characters */ |
35 | static char digits[] = "0123456789abcdef"; /**< Hexadecimal characters */ |
36 | static spinlock_t printflock; /**< printf spinlock */ |
36 | static spinlock_t printflock; /**< printf spinlock */ |
37 | 37 | ||
38 | 38 | ||
39 | /** Print NULL terminated string |
39 | /** Print NULL terminated string |
40 | * |
40 | * |
41 | * Print characters from str using putchar() until |
41 | * Print characters from str using putchar() until |
42 | * \x00 character is reached. |
42 | * \x00 character is reached. |
43 | * |
43 | * |
44 | * @param str Characters to print. |
44 | * @param str Characters to print. |
45 | * |
45 | * |
46 | */ |
46 | */ |
47 | void print_str(const char *str) |
47 | void print_str(const char *str) |
48 | { |
48 | { |
49 | int i = 0; |
49 | int i = 0; |
50 | char c; |
50 | char c; |
51 | 51 | ||
52 | while (c = str[i++]) |
52 | while (c = str[i++]) |
53 | putchar(c); |
53 | putchar(c); |
54 | } |
54 | } |
55 | 55 | ||
56 | 56 | ||
57 | /** Print hexadecimal digits |
57 | /** Print hexadecimal digits |
58 | * |
58 | * |
59 | * Print fixed count of hexadecimal digits from |
59 | * Print fixed count of hexadecimal digits from |
60 | * the number num. The digits are printed in |
60 | * the number num. The digits are printed in |
61 | * natural left-to-right order starting with |
61 | * natural left-to-right order starting with |
62 | * the width-th digit. |
62 | * the width-th digit. |
63 | * |
63 | * |
64 | * @param num Number containing digits. |
64 | * @param num Number containing digits. |
65 | * @param width Count of digits to print. |
65 | * @param width Count of digits to print. |
66 | * |
66 | * |
67 | */ |
67 | */ |
68 | void print_fixed_hex(const __native num, const int width) |
68 | void print_fixed_hex(const __native num, const int width) |
69 | { |
69 | { |
70 | int i; |
70 | int i; |
71 | 71 | ||
72 | for (i = width*8 - 4; i >= 0; i -= 4) |
72 | for (i = width*8 - 4; i >= 0; i -= 4) |
73 | putchar(digits[(num>>i) & 0xf]); |
73 | putchar(digits[(num>>i) & 0xf]); |
74 | } |
74 | } |
75 | 75 | ||
76 | 76 | ||
77 | /** Print number in given base |
77 | /** Print number in given base |
78 | * |
78 | * |
79 | * Print significant digits of a number in given |
79 | * Print significant digits of a number in given |
80 | * base. |
80 | * base. |
81 | * |
81 | * |
82 | * @param num Number to print. |
82 | * @param num Number to print. |
83 | * @param base Base to print the number in (should |
83 | * @param base Base to print the number in (should |
84 | * be in range 2 .. 16). |
84 | * be in range 2 .. 16). |
85 | * |
85 | * |
86 | */ |
86 | */ |
87 | void print_number(const __native num, const unsigned int base) |
87 | void print_number(const __native num, const unsigned int base) |
88 | { |
88 | { |
89 | int val = num; |
89 | int val = num; |
90 | char d[sizeof(__native)*8+1]; /* this is good enough even for base == 2 */ |
90 | char d[sizeof(__native)*8+1]; /* this is good enough even for base == 2 */ |
91 | int i = sizeof(__native)*8-1; |
91 | int i = sizeof(__native)*8-1; |
92 | 92 | ||
93 | do { |
93 | do { |
94 | d[i--] = digits[val % base]; |
94 | d[i--] = digits[val % base]; |
95 | } while (val /= base); |
95 | } while (val /= base); |
96 | 96 | ||
97 | d[sizeof(__native)*8] = 0; |
97 | d[sizeof(__native)*8] = 0; |
98 | print_str(&d[i + 1]); |
98 | print_str(&d[i + 1]); |
99 | } |
99 | } |
100 | 100 | ||
101 | 101 | ||
102 | /** General formatted text print |
102 | /** General formatted text print |
103 | * |
103 | * |
104 | * Print text formatted according the fmt parameter |
104 | * Print text formatted according the fmt parameter |
105 | * and variant arguments. Each formatting directive |
105 | * and variant arguments. Each formatting directive |
106 | * begins with % (percentage) character and one of the |
106 | * begins with % (percentage) character and one of the |
107 | * following character: |
107 | * following character: |
108 | * |
108 | * |
109 | * % Prints the percentage character. |
109 | * % Prints the percentage character. |
110 | * s The next variant argument is treated as char* |
110 | * s The next variant argument is treated as char* |
111 | * and printed as a NULL terminated string. |
111 | * and printed as a NULL terminated string. |
112 | * c The next variant argument is treated as a single char. |
112 | * c The next variant argument is treated as a single char. |
- | 113 | * p The next variant argument is treated as a maximum |
|
- | 114 | * bit-width integer with respect to architecture |
|
- | 115 | * and printed in full hexadecimal width. |
|
- | 116 | * P As with 'p', but '0x' is prefixed. |
|
- | 117 | * q The next variant argument is treated as a 64b integer |
|
- | 118 | * and printed in full hexadecimal width. |
|
- | 119 | * Q As with 'q', but '0x' is prefixed. |
|
113 | * l The next variant argument is treated as a 32b integer |
120 | * l The next variant argument is treated as a 32b integer |
114 | * and printed in full hexadecimal width. |
121 | * and printed in full hexadecimal width. |
115 | * L As with 'l', but '0x' is prefixed. |
122 | * L As with 'l', but '0x' is prefixed. |
116 | * w The next variant argument is treated as a 16b integer |
123 | * w The next variant argument is treated as a 16b integer |
117 | * and printed in full hexadecimal width. |
124 | * and printed in full hexadecimal width. |
118 | * W As with 'w', but '0x' is prefixed. |
125 | * W As with 'w', but '0x' is prefixed. |
119 | * b The next variant argument is treated as a 8b integer |
126 | * b The next variant argument is treated as a 8b integer |
120 | * and printed in full hexadecimal width. |
127 | * and printed in full hexadecimal width. |
121 | * N As with 'b', but '0x' is prefixed. |
128 | * N As with 'b', but '0x' is prefixed. |
122 | * d The next variant argument is treated as integer |
129 | * d The next variant argument is treated as integer |
123 | * and printed in standard decimal format (only significant |
130 | * and printed in standard decimal format (only significant |
124 | * digits). |
131 | * digits). |
125 | * x The next variant argument is treated as integer |
132 | * x The next variant argument is treated as integer |
126 | * and printed in standard hexadecimal format (only significant |
133 | * and printed in standard hexadecimal format (only significant |
127 | * digits). |
134 | * digits). |
128 | * X As with 'x', but '0x' is prefixed. |
135 | * X As with 'x', but '0x' is prefixed. |
129 | * |
136 | * |
130 | * All other characters from fmt except the formatting directives |
137 | * All other characters from fmt except the formatting directives |
131 | * are printed in verbatim. |
138 | * are printed in verbatim. |
132 | * |
139 | * |
133 | * @param fmt Formatting NULL terminated string. |
140 | * @param fmt Formatting NULL terminated string. |
134 | * |
141 | * |
135 | */ |
142 | */ |
136 | void printf(const char *fmt, ...) |
143 | void printf(const char *fmt, ...) |
137 | { |
144 | { |
138 | int irqpri, i = 0; |
145 | int irqpri, i = 0; |
139 | va_list ap; |
146 | va_list ap; |
140 | char c; |
147 | char c; |
141 | 148 | ||
142 | va_start(ap, fmt); |
149 | va_start(ap, fmt); |
143 | 150 | ||
144 | irqpri = cpu_priority_high(); |
151 | irqpri = cpu_priority_high(); |
145 | spinlock_lock(&printflock); |
152 | spinlock_lock(&printflock); |
146 | 153 | ||
147 | while (c = fmt[i++]) { |
154 | while (c = fmt[i++]) { |
148 | switch (c) { |
155 | switch (c) { |
149 | 156 | ||
150 | /* control character */ |
157 | /* control character */ |
151 | case '%': |
158 | case '%': |
152 | switch (c = fmt[i++]) { |
159 | switch (c = fmt[i++]) { |
153 | 160 | ||
154 | /* percentile itself */ |
161 | /* percentile itself */ |
155 | case '%': |
162 | case '%': |
156 | break; |
163 | break; |
157 | 164 | ||
158 | /* |
165 | /* |
159 | * String and character conversions. |
166 | * String and character conversions. |
160 | */ |
167 | */ |
161 | case 's': |
168 | case 's': |
162 | print_str(va_arg(ap, char_ptr)); |
169 | print_str(va_arg(ap, char_ptr)); |
163 | goto loop; |
170 | goto loop; |
164 | 171 | ||
165 | case 'c': |
172 | case 'c': |
166 | c = (char) va_arg(ap, int); |
173 | c = (char) va_arg(ap, int); |
167 | break; |
174 | break; |
168 | 175 | ||
169 | /* |
176 | /* |
170 | * Hexadecimal conversions with fixed width. |
177 | * Hexadecimal conversions with fixed width. |
171 | */ |
178 | */ |
- | 179 | case 'P': |
|
- | 180 | print_str("0x"); |
|
- | 181 | case 'p': |
|
- | 182 | print_fixed_hex(va_arg(ap, __native), sizeof(__native)); |
|
- | 183 | goto loop; |
|
- | 184 | ||
- | 185 | case 'Q': |
|
- | 186 | print_str("0x"); |
|
- | 187 | case 'q': |
|
- | 188 | print_fixed_hex(va_arg(ap, __native), INT64); |
|
- | 189 | goto loop; |
|
- | 190 | ||
172 | case 'L': |
191 | case 'L': |
173 | print_str("0x"); |
192 | print_str("0x"); |
174 | case 'l': |
193 | case 'l': |
175 | print_fixed_hex(va_arg(ap, __native), INT32); |
194 | print_fixed_hex(va_arg(ap, __native), INT32); |
176 | goto loop; |
195 | goto loop; |
177 | 196 | ||
178 | case 'W': |
197 | case 'W': |
179 | print_str("0x"); |
198 | print_str("0x"); |
180 | case 'w': |
199 | case 'w': |
181 | print_fixed_hex(va_arg(ap, __native), INT16); |
200 | print_fixed_hex(va_arg(ap, __native), INT16); |
182 | goto loop; |
201 | goto loop; |
183 | 202 | ||
184 | case 'B': |
203 | case 'B': |
185 | print_str("0x"); |
204 | print_str("0x"); |
186 | case 'b': |
205 | case 'b': |
187 | print_fixed_hex(va_arg(ap, __native), INT8); |
206 | print_fixed_hex(va_arg(ap, __native), INT8); |
188 | goto loop; |
207 | goto loop; |
189 | 208 | ||
190 | /* |
209 | /* |
191 | * Decimal and hexadecimal conversions. |
210 | * Decimal and hexadecimal conversions. |
192 | */ |
211 | */ |
193 | case 'd': |
212 | case 'd': |
194 | print_number(va_arg(ap, __native), 10); |
213 | print_number(va_arg(ap, __native), 10); |
195 | goto loop; |
214 | goto loop; |
196 | 215 | ||
197 | case 'X': |
216 | case 'X': |
198 | print_str("0x"); |
217 | print_str("0x"); |
199 | case 'x': |
218 | case 'x': |
200 | print_number(va_arg(ap, __native), 16); |
219 | print_number(va_arg(ap, __native), 16); |
201 | goto loop; |
220 | goto loop; |
202 | 221 | ||
203 | /* |
222 | /* |
204 | * Bad formatting. |
223 | * Bad formatting. |
205 | */ |
224 | */ |
206 | default: |
225 | default: |
207 | goto out; |
226 | goto out; |
208 | } |
227 | } |
209 | 228 | ||
210 | default: putchar(c); |
229 | default: putchar(c); |
211 | } |
230 | } |
212 | 231 | ||
213 | loop: |
232 | loop: |
214 | ; |
233 | ; |
215 | } |
234 | } |
216 | 235 | ||
217 | out: |
236 | out: |
218 | spinlock_unlock(&printflock); |
237 | spinlock_unlock(&printflock); |
219 | cpu_priority_restore(irqpri); |
238 | cpu_priority_restore(irqpri); |
220 | 239 | ||
221 | va_end(ap); |
240 | va_end(ap); |
222 | } |
241 | } |
223 | 242 |