Changeset 009474f in mainline

Timestamp:

2008-06-04T18:48:16Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

3abe472f

Parents:

fadfaf8

Message:

Make arm32 compile again.

Files:

• kernel/arch/arm32/Makefile.inc (modified) (2 diffs)
• kernel/arch/arm32/include/types.h (modified) (1 diff)
• kernel/arch/arm32/src/mm/page_fault.c (modified) (1 diff)
• uspace/lib/libc/arch/arm32/src/entry.s (modified) (2 diffs)

kernel/arch/arm32/Makefile.inc

@@ -38 +38 @@
 KERNEL_LOAD_ADDRESS = 0x80200000
 
-ifeq ($(MACHINE), gxemul_testarm)
+# ifeq ($(MACHINE), gxemul_testarm)
         DMACHINE = MACHINE_GXEMUL_TESTARM
-endif
+# endif
 
 ATSIGN = %
@@ -91 +91 @@
         arch/$(ARCH)/src/mm/page_fault.c
 
-ifeq ($(MACHINE), gxemul_testarm)
+# ifeq ($(MACHINE), gxemul_testarm)
         ARCH_SOURCES += arch/$(ARCH)/src/drivers/gxemul.c
-endif
+# endif
 

kernel/arch/arm32/include/types.h

@@ -65 +65 @@
 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 "d"      /**< 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.

kernel/arch/arm32/src/mm/page_fault.c

@@ -41 +41 @@
 #include <arch.h>
 #include <interrupt.h>
+#include <print.h>
 
 /** Returns value stored in fault status register.

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

@@ -32 +32 @@
 
 .global __entry
-.global __entry_driver
 
 ## User-space task entry point
@@ -39 +38 @@
 __entry:
         bl __main
-        bl __io_init
         bl main
         bl __exit
-
-__entry_driver:
-        bl __main
-        bl main
-        bl __exit
-