Changeset 81887b7 in mainline

Timestamp:

2005-08-30T08:59:22Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

00e00fa

Parents:

1fbbcd6

Message:

Bugs in printf and va_arg functions repaired.

Files:

• include/print.h (modified) (1 diff)
• include/stackarg.h (modified) (1 diff)
• src/debug/print.c (modified) (2 diffs)

include/print.h

@@ -38 +38 @@
 
 static void print_str(const char *str);
-static void print_fixed_hex(const __native num, const int width);
+static void print_fixed_hex(const __u64 num, const int width);
 static void print_number(const __native num, const unsigned int base);
 

include/stackarg.h

@@ -40 +40 @@
 typedef struct va_list {
         int pos;
-        __address *last;
+        __u8 *last;
 } va_list;
 
 #define va_start(ap, lst)               \
-        (ap).pos = 0;                   \
-        (ap).last = (__address *) &(lst)
+        (ap).pos = sizeof(lst);                         \
+        (ap).last = (__u8 *) &(lst)
 
 #define va_arg(ap, type)                \
-        ((type) *((ap).last + ++((ap).pos)))
+        (*((type *)((ap).last + ((ap).pos  += sizeof(type) ) - sizeof(type))))
 
 #define va_end(ap)

src/debug/print.c

@@ -67 +67 @@
  *
  */
-void print_fixed_hex(const __native num, const int width)
+void print_fixed_hex(const __u64 num, const int width)
 {
         int i;
@@ -187 +187 @@
                                         print_str("0x");
                                 case 'q':
-                                        print_fixed_hex(va_arg(ap, __native), INT64);
+                                        print_fixed_hex(va_arg(ap, __u64), INT64);
                                         goto loop;