Changeset 32443b0 in mainline

Timestamp:

2008-06-04T19:37:52Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

40257f5

Parents:

82b71ef1

Message:

Make mips32 compile again

Files:

• kernel/arch/mips32/include/types.h (modified) (1 diff)
• kernel/generic/include/typedefs.h (modified) (1 diff)
• uspace/lib/libc/arch/mips32/src/entry.s (modified) (2 diffs)

kernel/arch/mips32/include/types.h

@@ -58 +58 @@
 typedef int32_t native_t;
 
+#define PRIp "x"        /**< Format for uintptr_t. */
+#define PRIs "u"        /**< Format for size_t. */
+#define PRIc "u"        /**< Format for count_t. */
+#define PRIi "u"        /**< Format for index_t. */
+
+#define PRId8 "d"       /**< Format for int8_t. */
+#define PRId16 "d"      /**< Format for int16_t. */
+#define PRId32 "ld"     /**< Format for int32_t. */
+#define PRId64 "lld"    /**< Format for int64_t. */
+#define PRIdn "d"       /**< Format for native_t. */
+
+#define PRIu8 "u"       /**< Format for uint8_t. */
+#define PRIu16 "u"      /**< Format for uint16_t. */
+#define PRIu32 "u"      /**< Format for uint32_t. */
+#define PRIu64 "llu"    /**< Format for uint64_t. */
+#define PRIun "u"       /**< Format for unative_t. */
+
+#define PRIx8 "x"       /**< Format for hexadecimal (u)int8_t. */
+#define PRIx16 "x"      /**< Format for hexadecimal (u)int16_t. */
+#define PRIx32 "x"      /**< Format for hexadecimal (u)uint32_t. */
+#define PRIx64 "llx"    /**< Format for hexadecimal (u)int64_t. */
+#define PRIxn "x"       /**< Format for hexadecimal (u)native_t. */
+
 /** Page Table Entry. */
 typedef struct {

kernel/generic/include/typedefs.h

@@ -36 +36 @@
 #define KERN_TYPEDEFS_H_
 
+#include <arch/types.h>
+
 #define NULL 0
 #define false 0

uspace/lib/libc/arch/mips32/src/entry.s

@@ -53 +53 @@
         nop
         
-        jal __io_init
-        nop
-        
         jal main
         nop
@@ -63 +60 @@
 .end
 
-.ent __entry_driver
-__entry_driver:
-        .frame $sp, 32, $31
-        .cpload $25
-        
-        
-        # Mips o32 may store its arguments on stack, make space (16 bytes),
-        # so that it could work with -O0
-        # Make space additional 16 bytes for the stack frame
-
-        addiu $sp, -32
-        .cprestore 16   # Allow PIC code
-        
-        jal __main
-        nop
-        
-        jal main
-        nop
-        
-        jal __exit
-        nop
-.end
 # Alignment of output section data to 0x4000
 .section .data