Changeset 46579c66 in mainline

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.

Files:

• arch/mips32/include/arg.h (modified) (1 diff)
• arch/mips32/include/context.h (modified) (1 diff)
• arch/mips32/include/context_offset.h (modified) (1 diff)
• arch/mips32/include/exception.h (modified) (1 diff)
• test/print/print1/test.c (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

arch/mips32/include/context.h

@@ -33 +33 @@
 
 /*
- * Put one item onto the stack to support get_stack_base().
+ * Put one item onto the stack to support get_stack_base() and align it up to 8 bytes boundary.
  */
-#define SP_DELTA        (0+STACK_ITEM_SIZE)
+#define SP_DELTA        ((0 + STACK_ITEM_SIZE + 7) & (~7))
 
 

arch/mips32/include/context_offset.h

@@ -49 +49 @@
 #define EOFFSET_STATUS 0x7c
 #define EOFFSET_EPC    0x80
-#define REGISTER_SPACE 132
+#define REGISTER_SPACE 136

arch/mips32/include/exception.h

@@ -91 +91 @@
         __u32 status; /* cp0_status */
         __u32 epc; /* cp0_epc */
+        __u32 padding; /* padding to align stack on 8 bytes boundary */
 };
 

test/print/print1/test.c

@@ -31 +31 @@
 void test(void)
 {
-        __u64 u64const = 0x0123456789ABCDEFLL;
         printf(" Printf test \n");
-        printf(" Q  %Q  %q \n",u64const, u64const);
+        printf(" Q  %Q  %q \n",0x1111111111111111ull, 0x2222222222222222ull);
+        printf(" Q,l  %Q  %l \n", 0x3333333333333333ull, 0x01234567);
+        printf(" l,Q  %l  %Q \n", 0x01234567, 0x4444444444444444ull);
         printf(" L  %L  %l \n",0x01234567 ,0x01234567);   
         printf(" W  %W  %w \n",0x0123 ,0x0123);