Changeset ba519f7 in mainline for boot

Timestamp:

2010-12-02T17:21:30Z (15 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3bd76491

Parents:

8ad673a (diff), 41a7f62 (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 from mainline

Location:

boot

Files:

• arch/arm32/src/main.c (modified) (1 diff)
• arch/ia64/src/main.c (modified) (1 diff)
• arch/mips32/include/arch.h (modified) (1 diff)
• arch/mips32/src/main.c (modified) (2 diffs)
• arch/ppc32/src/main.c (modified) (1 diff)
• arch/sparc64/src/main.c (modified) (1 diff)
• genarch/src/ofw.c (modified) (5 diffs)
• generic/include/printf.h (modified) (1 diff)
• generic/include/stdint.h (modified) (1 diff)
• generic/include/typedefs.h (modified) (2 diffs)
• generic/src/printf_core.c (modified) (4 diffs)

boot/arch/arm32/src/main.c

@@ -61 +61 @@
         printf(" %p|%p: bootstrap page table\n", &boot_pt, &boot_pt);
         printf(" %p|%p: boot info structure\n", &bootinfo, &bootinfo);
-        printf(" %p|%p: kernel entry point\n", PA2KA(BOOT_OFFSET), BOOT_OFFSET);
+        printf(" %p|%p: kernel entry point\n",
+            (void *) PA2KA(BOOT_OFFSET), (void *) BOOT_OFFSET);
         
         size_t i;

boot/arch/ia64/src/main.c

@@ -62 +62 @@
         
         printf(" %p|%p: boot info structure\n", &bootinfo, &bootinfo);
-        printf(" %p|%p: kernel entry point\n", KERNEL_ADDRESS, KERNEL_ADDRESS);
-        printf(" %p|%p: loader entry point\n", LOADER_ADDRESS, LOADER_ADDRESS);
+        printf(" %p|%p: kernel entry point\n",
+            (void *) KERNEL_ADDRESS, (void *) KERNEL_ADDRESS);
+        printf(" %p|%p: loader entry point\n",
+            (void *) LOADER_ADDRESS, (void *) LOADER_ADDRESS);
         
         size_t i;
         for (i = 0; i < COMPONENTS; i++)
-                printf(" %p|%p: %s image (%u/%u bytes)\n", components[i].start,
+                printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].start,
                     components[i].start, components[i].name,
                     components[i].inflated, components[i].size);

boot/arch/mips32/include/arch.h

@@ -40 +40 @@
 
 #define MSIM_VIDEORAM_ADDRESS  0xb0000000
-#define MSIM_DORDER_ADDRESS    0xb0000004
+#define MSIM_DORDER_ADDRESS    0xb0000100
 
 #ifndef __ASM__

boot/arch/mips32/src/main.c

@@ -51 +51 @@
         
         printf("\nMemory statistics\n");
-        printf(" %p|%p: CPU map\n", PA2KA(CPUMAP_OFFSET), CPUMAP_OFFSET);
-        printf(" %p|%p: bootstrap stack\n", PA2KA(STACK_OFFSET), STACK_OFFSET);
-        printf(" %p|%p: boot info structure\n", PA2KA(BOOTINFO_OFFSET), BOOTINFO_OFFSET);
-        printf(" %p|%p: kernel entry point\n", PA2KA(BOOT_OFFSET), BOOT_OFFSET);
-        printf(" %p|%p: bootloader entry point\n", PA2KA(LOADER_OFFSET), LOADER_OFFSET);
+        printf(" %p|%p: CPU map\n", (void *) PA2KA(CPUMAP_OFFSET),
+            (void *) CPUMAP_OFFSET);
+        printf(" %p|%p: bootstrap stack\n", (void *) PA2KA(STACK_OFFSET),
+            (void *) STACK_OFFSET);
+        printf(" %p|%p: boot info structure\n",
+            (void *) PA2KA(BOOTINFO_OFFSET), (void *) BOOTINFO_OFFSET);
+        printf(" %p|%p: kernel entry point\n", (void *) PA2KA(BOOT_OFFSET),
+            (void *) BOOT_OFFSET);
+        printf(" %p|%p: bootloader entry point\n",
+            (void *) PA2KA(LOADER_OFFSET), (void *) LOADER_OFFSET);
         
         size_t i;
         for (i = 0; i < COMPONENTS; i++)
-                printf(" %p|%p: %s image (%u/%u bytes)\n", components[i].start,
-                    KSEG2PA(components[i].start), components[i].name,
+                printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].start,
+                    (void *) KSEG2PA(components[i].start), components[i].name,
                     components[i].inflated, components[i].size);
         
@@ -91 +96 @@
                 if (tail >= ((void *) PA2KA(LOADER_OFFSET))) {
                         printf("\n%s: Image too large to fit (%p >= %p), halting.\n",
-                            components[i].name, tail, PA2KA(LOADER_OFFSET));
+                            components[i].name, tail, (void *) PA2KA(LOADER_OFFSET));
                         halt();
                 }

boot/arch/ppc32/src/main.c

@@ -68 +68 @@
         printf(" %p|%p: real mode trampoline\n", &real_mode, real_mode_pa);
         printf(" %p|%p: boot info structure\n", &bootinfo, bootinfo_pa);
-        printf(" %p|%p: kernel entry point\n", PA2KA(BOOT_OFFSET), BOOT_OFFSET);
-        printf(" %p|%p: loader entry point\n", LOADER_ADDRESS, loader_address_pa);
+        printf(" %p|%p: kernel entry point\n",
+            (void *) PA2KA(BOOT_OFFSET), (void *) BOOT_OFFSET);
+        printf(" %p|%p: loader entry point\n",
+            (void *) LOADER_ADDRESS, loader_address_pa);
         
         size_t i;
         for (i = 0; i < COMPONENTS; i++)
-                printf(" %p|%p: %s image (%u/%u bytes)\n", components[i].start,
+                printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].start,
                     ofw_translate(components[i].start), components[i].name,
                     components[i].inflated, components[i].size);

boot/arch/sparc64/src/main.c

@@ -209 +209 @@
         void *loader_address_pa = ofw_translate((void *) LOADER_ADDRESS);
         
-        printf("\nMemory statistics (total %llu MB, starting at %p)\n",
-            bootinfo.memmap.total >> 20, bootinfo.physmem_start);
-        printf(" %p|%p: boot info structure\n", &bootinfo, bootinfo_pa);
-        printf(" %p|%p: kernel entry point\n", KERNEL_ADDRESS, kernel_address_pa);
-        printf(" %p|%p: loader entry point\n", LOADER_ADDRESS, loader_address_pa);
+        printf("\nMemory statistics (total %" PRIu64 " MB, starting at %p)\n",
+            bootinfo.memmap.total >> 20, (void *) bootinfo.physmem_start);
+        printf(" %p|%p: boot info structure\n", &bootinfo, (void *) bootinfo_pa);
+        printf(" %p|%p: kernel entry point\n",
+            (void *) KERNEL_ADDRESS, (void *) kernel_address_pa);
+        printf(" %p|%p: loader entry point\n",
+            (void *) LOADER_ADDRESS, (void *) loader_address_pa);
         
         size_t i;
         for (i = 0; i < COMPONENTS; i++)
-                printf(" %p|%p: %s image (%u/%u bytes)\n", components[i].start,
+                printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].start,
                     ofw_translate(components[i].start), components[i].name,
                     components[i].inflated, components[i].size);

boot/genarch/src/ofw.c

@@ -243 +243 @@
         void *addr = ofw_claim_virt_internal(virt, len, 0);
         if (addr != virt) {
-                printf("Error: Unable to claim virtual memory %p (size %u), halting.\n",
+                printf("Error: Unable to claim virtual memory %p (size %zu), halting.\n",
                     virt, len);
                 halt();
@@ -254 +254 @@
         
         if (addr == NULL) {
-                printf("Error: Unable to claim %u bytes in virtual memory, halting.\n",
+                printf("Error: Unable to claim %zu bytes in virtual memory, halting.\n",
                     len);
                 halt();
@@ -305 +305 @@
         void *addr = ofw_claim_phys_internal(phys, len, 0);
         if (addr != phys) {
-                printf("Error: Unable to claim physical memory %p (size %u), halting.\n",
+                printf("Error: Unable to claim physical memory %p (size %zu), halting.\n",
                     phys, len);
                 halt();
@@ -315 +315 @@
         void *addr = ofw_claim_phys_internal(NULL, len, alignment);
         if (addr == NULL) {
-                printf("Error: Unable to claim %u bytes in physical memory, halting.\n",
+                printf("Error: Unable to claim %zu bytes in physical memory, halting.\n",
                     len);
                 halt();
@@ -343 +343 @@
         
         if (ret != 0) {
-                printf("Error: Unable to map %p to %p (size %u), halting.\n",
+                printf("Error: Unable to map %p to %p (size %zu), halting.\n",
                     virt, phys, size);
                 halt();

boot/generic/include/printf.h

@@ -36 +36 @@
 #include <stdarg.h>
 
+#ifndef NVERIFY_PRINTF
+
+#define PRINTF_ATTRIBUTE(start, end) \
+        __attribute__((format(gnu_printf, start, end)))
+
+#else /* NVERIFY_PRINTF */
+
+#define PRINTF_ATTRIBUTE(start, end)
+
+#endif /* NVERIFY_PRINTF */
+
 #define EOF  (-1)
 
 extern int puts(const char *);
-extern int printf(const char *, ...);
+extern int printf(const char *, ...)
+    PRINTF_ATTRIBUTE(1, 2);
 extern int vprintf(const char *, va_list);
 

boot/generic/include/stdint.h

@@ -33 +33 @@
 #define BOOT_STDINT_H_
 
-#define INT8_MIN  (0x80)
-#define INT8_MAX  (0x7F)
+#define INT8_MIN  INT8_C(0x80)
+#define INT8_MAX  INT8_C(0x7F)
 
-#define UINT8_MIN  (0u)
-#define UINT8_MAX  (0xFFu)
+#define UINT8_MIN  UINT8_C(0)
+#define UINT8_MAX  UINT8_C(0xFF)
 
-#define INT16_MIN  (0x8000)
-#define INT16_MAX  (0x7FFF)
+#define INT16_MIN  INT16_C(0x8000)
+#define INT16_MAX  INT16_C(0x7FFF)
 
-#define UINT16_MIN  (0u)
-#define UINT16_MAX  (0xFFFFu)
+#define UINT16_MIN  UINT16_C(0)
+#define UINT16_MAX  UINT16_C(0xFFFF)
 
-#define INT32_MIN  (0x80000000l)
-#define INT32_MAX  (0x7FFFFFFFl)
+#define INT32_MIN  INT32_C(0x80000000)
+#define INT32_MAX  INT32_C(0x7FFFFFFF)
 
-#define UINT32_MIN  (0ul)
-#define UINT32_MAX  (0xFFFFFFFFul)
+#define UINT32_MIN  UINT32_C(0)
+#define UINT32_MAX  UINT32_C(0xFFFFFFFF)
 
-#define INT64_MIN  (0x8000000000000000ll)
-#define INT64_MAX  (0x7FFFFFFFFFFFFFFFll)
+#define INT64_MIN  INT64_C(0x8000000000000000)
+#define INT64_MAX  INT64_C(0x7FFFFFFFFFFFFFFF)
 
-#define UINT64_MIN  (0ull)
-#define UINT64_MAX  (0xFFFFFFFFFFFFFFFFull)
+#define UINT64_MIN  UINT64_C(0)
+#define UINT64_MAX  UINT64_C(0xFFFFFFFFFFFFFFFF)
 
 #endif

boot/generic/include/typedefs.h

@@ -37 +37 @@
 #include <arch/types.h>
 
-#define NULL    ((void *) 0)
+#define NULL  ((void *) 0)
 
 #define false  0
@@ -43 +43 @@
 
 typedef uint8_t bool;
-typedef int32_t wchar_t;
 
 #endif

boot/generic/src/printf_core.c

@@ -79 +79 @@
         PrintfQualifierLong,
         PrintfQualifierLongLong,
-        PrintfQualifierPointer
+        PrintfQualifierPointer,
+        PrintfQualifierSize
 } qualifier_t;
 
@@ -431 +432 @@
  *  - ""   Signed or unsigned int (default value).@n
  *  - "l"  Signed or unsigned long int.@n
- *         If conversion is "c", the character is wchar_t (wide character).@n
- *         If conversion is "s", the string is wchar_t * (wide string).@n
  *  - "ll" Signed or unsigned long long int.@n
  *
@@ -612 +611 @@
                                 }
                                 break;
+                        case 'z':
+                                qualifier = PrintfQualifierSize;
+                                i = nxt;
+                                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
+                                break;
                         default:
                                 /* Default type */
@@ -720 +724 @@
                                 number = (uint64_t) (uintptr_t) va_arg(ap, void *);
                                 break;
+                        case PrintfQualifierSize:
+                                size = sizeof(size_t);
+                                number = (uint64_t) va_arg(ap, size_t);
+                                break;
                         default:
                                 /* Unknown qualifier */