Changeset 973ef9fc in mainline for kernel/arch/arm32

Timestamp:

2010-12-25T21:20:28Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

kernel/arch/arm32

Files:

• include/mach/integratorcp/integratorcp.h (modified) (1 diff)
• include/mach/testarm/testarm.h (modified) (1 diff)
• include/machine_func.h (modified) (1 diff)
• include/types.h (modified) (2 diffs)
• src/exception.c (modified) (1 diff)
• src/mach/gta02/gta02.c (modified) (3 diffs)
• src/mach/integratorcp/integratorcp.c (modified) (2 diffs)
• src/mach/testarm/testarm.c (modified) (3 diffs)
• src/mm/page.c (modified) (1 diff)
• src/mm/page_fault.c (modified) (2 diffs)

kernel/arch/arm32/include/mach/integratorcp/integratorcp.h

@@ -106 +106 @@
 extern void icp_frame_init(void);
 extern size_t icp_get_irq_count(void);
+extern const char *icp_get_platform_name(void);
 
 extern struct arm_machine_ops icp_machine_ops;

kernel/arch/arm32/include/mach/testarm/testarm.h

@@ -74 +74 @@
 extern void gxemul_frame_init(void);
 extern size_t gxemul_get_irq_count(void);
+extern const char *gxemul_get_platform_name(void);
 
 extern struct arm_machine_ops gxemul_machine_ops;

kernel/arch/arm32/include/machine_func.h

@@ -56 +56 @@
         void (*machine_input_init)(void);
         size_t (*machine_get_irq_count)(void);
+        const char *(*machine_get_platform_name)(void);
 };
 

kernel/arch/arm32/include/types.h

@@ -50 +50 @@
 typedef uint32_t ipl_t;
 
-typedef uint32_t unative_t;
+typedef uint32_t sysarg_t;
 typedef int32_t native_t;
 typedef uint32_t atomic_count_t;
@@ -57 +57 @@
 } fncptr_t;
 
-#define PRIp "x"  /**< Format for uintptr_t. */
-#define PRIs "u"  /**< Format for size_t. */
+#define INTN_C(c)   INT32_C(c)
+#define UINTN_C(c)  UINT32_C(c)
 
-#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. */
+#define PRIdn  PRId32  /**< Format for native_t. */
+#define PRIun  PRIu32  /**< Format for sysarg_t. */
+#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t. */
+#define PRIua  PRIu32  /**< Format for atomic_count_t. */
 
 #endif

kernel/arch/arm32/src/exception.c

@@ -175 +175 @@
 void istate_decode(istate_t *istate)
 {
-        printf("r0 =%#0.8lx\tr1 =%#0.8lx\tr2 =%#0.8lx\tr3 =%#0.8lx\n",
+        printf("r0 =%#0" PRIx32 "\tr1 =%#0" PRIx32 "\t"
+            "r2 =%#0" PRIx32 "\tr3 =%#0" PRIx32 "\n",
             istate->r0, istate->r1, istate->r2, istate->r3);
-        printf("r4 =%#0.8lx\tr5 =%#0.8lx\tr6 =%#0.8lx\tr7 =%#0.8lx\n",
+        printf("r4 =%#" PRIx32 "\tr5 =%#0" PRIx32 "\t"
+            "r6 =%#0" PRIx32 "\tr7 =%#0" PRIx32 "\n",
             istate->r4, istate->r5, istate->r6, istate->r7);
-        printf("r8 =%#0.8lx\tr9 =%#0.8lx\tr10=%#0.8lx\tfp =%#0.8lx\n",
-            istate->r8, istate->r9, istate->r10, istate->fp);
-        printf("r12=%#0.8lx\tsp =%#0.8lx\tlr =%#0.8lx\tspsr=%#0.8lx\n",
-            istate->r12, istate->sp, istate->lr, istate->spsr);
+        printf("r8 =%#0" PRIx32 "\tr9 =%#0" PRIx32 "\t"
+            "r10=%#0" PRIx32 "\tfp =%p\n",
+            istate->r8, istate->r9, istate->r10,
+            (void *) istate->fp);
+        printf("r12=%#0" PRIx32 "\tsp =%p\tlr =%p\tspsr=%p\n",
+            istate->r12, (void *) istate->sp,
+            (void *) istate->lr, (void *) istate->spsr);
 }
 

kernel/arch/arm32/src/mach/gta02/gta02.c

@@ -71 +71 @@
 static void gta02_input_init(void);
 static size_t gta02_get_irq_count(void);
+static const char *gta02_get_platform_name(void);
 
 static void gta02_timer_irq_init(void);
@@ -92 +93 @@
         gta02_output_init,
         gta02_input_init,
-        gta02_get_irq_count
+        gta02_get_irq_count,
+        gta02_get_platform_name
 };
 
@@ -235 +237 @@
 }
 
+const char *gta02_get_platform_name(void)
+{
+        return "gta02";
+}
+
 static void gta02_timer_irq_init(void)
 {

kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

@@ -65 +65 @@
         icp_output_init,
         icp_input_init,
-        icp_get_irq_count
+        icp_get_irq_count,
+        icp_get_platform_name
 };
 
@@ -342 +343 @@
 }
 
+const char *icp_get_platform_name(void)
+{
+        return "integratorcp";
+}
+
 /** @}
  */

kernel/arch/arm32/src/mach/testarm/testarm.c

@@ -65 +65 @@
         gxemul_output_init,
         gxemul_input_init,
-        gxemul_get_irq_count
+        gxemul_get_irq_count,
+        gxemul_get_platform_name
 };
 
@@ -123 +124 @@
         sysinfo_set_item_val("kbd", NULL, true);
         sysinfo_set_item_val("kbd.inr", NULL, GXEMUL_KBD_IRQ);
-        sysinfo_set_item_val("kbd.address.virtual", NULL, (unative_t) gxemul_kbd);
+        sysinfo_set_item_val("kbd.address.virtual", NULL, (sysarg_t) gxemul_kbd);
 #endif
 }
@@ -130 +131 @@
 {
         return GXEMUL_IRQ_COUNT;
+}
+
+const char *gxemul_get_platform_name(void)
+{
+        return "gxemul";
 }
 

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

@@ -93 +93 @@
             KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH)) {
                 panic("Unable to map physical memory %p (%d bytes).",
-                    physaddr, size);
+                    (void *) physaddr, size);
         }
         

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

@@ -141 +141 @@
         if (instr.condition == 0xf) {
                 panic("page_fault - instruction does not access memory "
-                    "(instr_code: %x, badvaddr:%x).", instr, badvaddr);
+                    "(instr_code: %#0" PRIx32 ", badvaddr:%p).",
+                    instr_union.pc, (void *) badvaddr);
                 return PF_ACCESS_EXEC;
         }
@@ -160 +161 @@
 
         panic("page_fault - instruction doesn't access memory "
-            "(instr_code: %x, badvaddr:%x).", instr, badvaddr);
+            "(instr_code: %#0" PRIx32 ", badvaddr:%p).",
+            instr_union.pc, (void *) badvaddr);
 
         return PF_ACCESS_EXEC;