Changeset 46579c66 in mainline for arch/mips32/include/arg.h

Timestamp:

2006-03-16T17:17:41Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

79aeb43b

Parents:

41fa6f2

Message:

Updated stackarg macros for mips32.
Mips32 stack aligned on 8 bytes boundary.

File:

• arch/mips32/include/arg.h (modified) (1 diff)

arch/mips32/include/arg.h

@@ -32 +32 @@
 #include <arch/types.h>
 
-typedef struct va_list {
-        int pos;
-        __u8 *last;
-} va_list;
-
-#define va_start(ap, lst)               \
-        (ap).pos = sizeof(lst);         \
-        (ap).last = (__u8 *) &(lst)
-
 /**
  * va_arg macro for MIPS32 - problem is that 64 bit values must be aligned on an 8-byte boundary (32bit values not)
  * To satisfy this, paddings must be sometimes inserted. 
  */
-#define va_arg(ap, type)                \
-        (*((type *)((ap).last + ((ap).pos  += sizeof(type) + ((sizeof(type)==8)&&(((ap).pos)&(4))?4:0)) - sizeof(type))))
+
+typedef __address va_list;
+
+#define va_start(ap, lst) \
+        ((ap) = (va_list)&(lst) + sizeof(lst))
+
+#define va_arg(ap, type)        \
+        (((type *)((ap) = (va_list)( (sizeof(type) <= 4) ? ((__address)((ap) + 2*4 - 1) & (~3)) : ((__address)((ap) + 2*8 -1) & (~7)) )))[-1])
 
 #define va_end(ap)
 
-
-
 #endif