Changeset 0d2f805 in mainline

Timestamp:

2005-05-06T12:58:44Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

75e5a8a

Parents:

47d78c6

Message:

Variable argument list support for architectures passing arguments on stack.

Files:

• arch/ia32/include/arg.h (added)
• arch/ia32/include/types.h (modified) (1 diff)
• arch/ia64/include/arg.h (added)
• arch/ia64/include/types.h (modified) (1 diff)
• arch/mips/include/arg.h (added)
• arch/mips/include/types.h (modified) (1 diff)
• include/stackarg.h (added)
• include/typedefs.h (modified) (1 diff)
• src/debug/print.c (modified) (9 diffs)

arch/ia32/include/types.h

@@ -43 +43 @@
 typedef __u32 pri_t;
 
+typedef __u32 __native;
+
 #endif

arch/ia64/include/types.h

@@ -43 +43 @@
 typedef __u32 pri_t;
 
+typedef __u64 __native;
+
 #endif

arch/mips/include/types.h

@@ -43 +43 @@
 typedef __u32 pri_t;
 
+typedef __u32 __native;
+
 #endif

include/typedefs.h

@@ -60 +60 @@
 typedef struct link link_t;
 
+typedef char *char_ptr;
+
 #endif

src/debug/print.c

@@ -30 +30 @@
 #include <print.h>
 #include <synch/spinlock.h>
+#include <arch/arg.h>
+
 
 static char digits[] = "0123456789abcdef";
@@ -80 +82 @@
 void printf(char *fmt, ...)
 {
-        int irqpri, i = 0, pos = 0;
-        char c;
+        int irqpri, i = 0;
+        va_list ap;
+        char c; 
+
+        va_start(ap, fmt);
 
         irqpri = cpu_priority_high();
         spinlock_lock(&printflock);
+
         while (c = fmt[i++]) {
                 switch (c) {
@@ -100 +106 @@
                                  */
                                 case 's':
-                                        print_str((char *) *(((__address *) &fmt + (++pos))));
+                                        print_str(va_arg(ap, char_ptr));
                                         goto loop;
 
                                 case 'c':
-                                        c = *((char *) ((__address *)(&fmt + (++pos))));
+                                        c = va_arg(ap, char);
                                         break;
 
@@ -113 +119 @@
                                         print_str("0x");
                                 case 'l':
-                                        print_fixed_hex(*((__address *)(&fmt + (++pos))),INT32);
+                                        print_fixed_hex(va_arg(ap, __native), INT32);
                                         goto loop;
 
@@ -119 +125 @@
                                         print_str("0x");
                                 case 'w':
-                                        print_fixed_hex(*((__address *)(&fmt + (++pos))),INT16);
+                                        print_fixed_hex(va_arg(ap, __native), INT16);
                                         goto loop;
 
@@ -125 +131 @@
                                         print_str("0x");
                                 case 'b':
-                                        print_fixed_hex(*((__address *)(&fmt + (++pos))),INT8);
+                                        print_fixed_hex(va_arg(ap, __native), INT8);
                                         goto loop;
 
@@ -132 +138 @@
                                  */
                                 case 'd':
-                                        print_number(*((__address *)(&fmt + (++pos))), 10);
+                                        print_number(va_arg(ap, __native), 10);
                                         goto loop;
 
@@ -138 +144 @@
                                         print_str("0x");
                                 case 'x':
-                                        print_number(*((__address *)(&fmt + (++pos))), 16);
+                                        print_number(va_arg(ap, __native), 16);
                                         goto loop;
             
@@ -158 +164 @@
         spinlock_unlock(&printflock);
         cpu_priority_restore(irqpri);
+        
+        va_end(ap);
 }