Changeset a35b458 in mainline for boot

Timestamp:

2018-03-02T20:10:49Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

Location:

boot

Files:

• arch/arm32/src/asm.S (modified) (3 diffs)
• arch/arm32/src/main.c (modified) (6 diffs)
• arch/arm32/src/mm.c (modified) (3 diffs)
• arch/ia64/src/main.c (modified) (14 diffs)
• arch/ia64/src/pal.c (modified) (1 diff)
• arch/ia64/src/pal_asm.S (modified) (3 diffs)
• arch/ia64/src/sal.c (modified) (1 diff)
• arch/ia64/src/sal_asm.S (modified) (3 diffs)
• arch/ia64/src/ski.c (modified) (2 diffs)
• arch/mips32/src/asm.S (modified) (3 diffs)
• arch/mips32/src/boot.S (modified) (1 diff)
• arch/mips32/src/main.c (modified) (7 diffs)
• arch/ppc32/src/asm.S (modified) (7 diffs)
• arch/ppc32/src/main.c (modified) (10 diffs)
• arch/ppc32/src/ofw.c (modified) (1 diff)
• arch/riscv64/src/asm.S (modified) (3 diffs)
• arch/riscv64/src/main.c (modified) (6 diffs)
• arch/riscv64/src/ucb.c (modified) (2 diffs)
• arch/sparc64/src/asm.S (modified) (5 diffs)
• arch/sparc64/src/main.c (modified) (13 diffs)
• arch/sparc64/src/ofw.c (modified) (8 diffs)
• genarch/include/genarch/ofw_tree.h (modified) (1 diff)
• genarch/src/division.c (modified) (10 diffs)
• genarch/src/multiplication.c (modified) (3 diffs)
• genarch/src/ofw.c (modified) (30 diffs)
• genarch/src/ofw_tree.c (modified) (10 diffs)
• generic/include/printf_core.h (modified) (1 diff)
• generic/src/balloc.c (modified) (1 diff)
• generic/src/inflate.c (modified) (24 diffs)
• generic/src/memstr.c (modified) (5 diffs)
• generic/src/printf.c (modified) (1 diff)
• generic/src/printf_core.c (modified) (33 diffs)
• generic/src/str.c (modified) (13 diffs)
• generic/src/vprintf.c (modified) (3 diffs)

boot/arch/arm32/src/asm.S

@@ -67 +67 @@
 #ifndef PROCESSOR_ARCH_armv7_a
         mrc     p15, 0, r4, c1, c0, 0
-        
+
         # Disable D-cache before the kernel is started.
         bic     r4, r4, #(1 << CP15_C1_DC)
@@ -76 +76 @@
         bic     r4, r4, #(1 << CP15_C1_BP)
 #endif
-        
+
         mcr     p15, 0, r4, c1, c0, 0
 #endif
-        
+
         # Wait for the operations to complete
 #ifdef PROCESSOR_ARCH_armv7_a
@@ -88 +88 @@
         mcr p15, 0, r4, c7, c10, 4
 #endif
-        
+
         # Clean ICache and BPredictors, r4 ignored (SBZ)
         mov r4, #0

boot/arch/arm32/src/main.c

@@ -89 +89 @@
         mmu_start();
         version_print();
-        
+
         printf("Boot data: %p -> %p\n", &bdata_start, &bdata_end);
         printf("\nMemory statistics\n");
@@ -97 +97 @@
         printf(" %p|%p: kernel entry point\n",
             (void *) PA2KA(BOOT_OFFSET), (void *) BOOT_OFFSET);
-        
+
         for (size_t i = 0; i < COMPONENTS; i++) {
                 printf(" %p|%p: %s image (%u/%u bytes)\n", components[i].addr,
@@ -103 +103 @@
                     components[i].size);
         }
-        
+
         void *dest[COMPONENTS];
         size_t top = 0;
@@ -110 +110 @@
         for (size_t i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) {
                 top = ALIGN_UP(top, PAGE_SIZE);
-                
+
                 if (i > 0) {
                         bootinfo.tasks[bootinfo.cnt].addr = TOP2ADDR(top);
                         bootinfo.tasks[bootinfo.cnt].size = components[i].inflated;
-                        
+
                         str_cpy(bootinfo.tasks[bootinfo.cnt].name,
                             BOOTINFO_TASK_NAME_BUFLEN, components[i].name);
-                        
+
                         bootinfo.cnt++;
                 }
-                
+
                 dest[i] = TOP2ADDR(top);
                 top += components[i].inflated;
                 cnt++;
         }
-        
+
         printf("\nInflating components ... ");
-        
+
         for (size_t i = cnt; i > 0; i--) {
                 void *tail = components[i - 1].addr + components[i - 1].size;
@@ -135 +135 @@
                         halt();
                 }
-                
+
                 printf("%s ", components[i - 1].name);
-                
+
                 int err = inflate(components[i - 1].addr, components[i - 1].size,
                     dest[i - 1], components[i - 1].inflated);
@@ -147 +147 @@
                 clean_dcache_poc(dest[i - 1], components[i - 1].inflated);
         }
-        
+
         printf(".\n");
 
         /* Flush PT too. We need this if we disable caches later */
         clean_dcache_poc(boot_pt, PTL0_ENTRIES * PTL0_ENTRY_SIZE);
-        
+
         printf("Booting the kernel...\n");
         jump_to_kernel((void *) PA2KA(BOOT_OFFSET), &bootinfo);

boot/arch/arm32/src/mm.c

@@ -209 +209 @@
                 /* Current settings */
                 "mrc p15, 0, r0, c1, c0, 0\n"
-                
+
                 /* Enable ICache, DCache, BPredictors and MMU,
                  * we disable caches before jumping to kernel
@@ -221 +221 @@
                 "ldr r1, =0x00001805\n"
 #endif
-                
+
                 "orr r0, r0, r1\n"
 
@@ -228 +228 @@
                  */
                 "mcr p15, 0, r0, c8, c7, 0\n"
-                
+
                 /* Store settings, enable the MMU */
                 "mcr p15, 0, r0, c1, c0, 0\n"

boot/arch/ia64/src/main.c

@@ -67 +67 @@
         memmap_item_t *memmap = bootinfo.memmap;
         size_t items = 0;
-        
+
         if (!bootpar) {
                 /* Fake-up a memory map for simulators. */
@@ -83 +83 @@
                 size_t mm_size = bootpar->efi_memmap_sz;
                 size_t md_size = bootpar->efi_memdesc_sz;
-                
+
                 /*
                  * Walk the EFI memory map using the V1 memory descriptor
@@ -109 +109 @@
                                 continue;
                         }
-                        
+
                         memmap[items].base = md->phys_start;
                         memmap[items].size = md->pages * EFI_PAGE_SIZE;
@@ -115 +115 @@
                 }
         }
-        
+
         bootinfo.memmap_items = items;
 }
@@ -134 +134 @@
                 efi_guid_t sal_guid = SAL_SYSTEM_TABLE_GUID;
                 sal_system_table_header_t *sal_st;
-                
+
                 sal_st = efi_vendor_table_find(
                     (efi_system_table_t *) bootpar->efi_system_table, sal_guid);
 
                 sal_system_table_parse(sal_st);
-                
+
                 bootinfo.sys_freq = sal_base_clock_frequency();
         } else {
@@ -150 +150 @@
 {
         version_print();
-        
+
         printf(" %p|%p: boot info structure\n", &bootinfo, &bootinfo);
         printf(" %p|%p: kernel entry point\n",
@@ -156 +156 @@
         printf(" %p|%p: loader entry point\n",
             (void *) LOADER_ADDRESS, (void *) LOADER_ADDRESS);
-        
+
         size_t i;
         for (i = 0; i < COMPONENTS; i++)
@@ -162 +162 @@
                     components[i].addr, components[i].name,
                     components[i].inflated, components[i].size);
-        
+
         void *dest[COMPONENTS];
         size_t top = KERNEL_ADDRESS;
@@ -169 +169 @@
         for (i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) {
                 top = ALIGN_UP(top, PAGE_SIZE);
-                
+
                 if (i > 0) {
                         bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].addr =
@@ -175 +175 @@
                         bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].size =
                             components[i].inflated;
-                        
+
                         str_cpy(bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].name,
                             BOOTINFO_TASK_NAME_BUFLEN, components[i].name);
-                        
+
                         bootinfo.taskmap.cnt++;
                 }
-                
+
                 dest[i] = (void *) top;
                 top += components[i].inflated;
                 cnt++;
         }
-        
+
         printf("\nInflating components ... ");
-        
+
         /*
          * We will use the next available address for a copy of each component to
@@ -197 +197 @@
         for (i = cnt; i > 0; i--) {
                 printf("%s ", components[i - 1].name);
-                
+
                 /*
                  * Copy the component to a location which is guaranteed not to
@@ -203 +203 @@
                  */
                 memmove((void *) top, components[i - 1].addr, components[i - 1].size);
-                
+
                 int err = inflate((void *) top, components[i - 1].size,
                     dest[i - 1], components[i - 1].inflated);
-                
+
                 if (err != EOK) {
                         printf("\n%s: Inflating error %d, halting.\n",
@@ -213 +213 @@
                 }
         }
-        
+
         printf(".\n");
 
@@ -219 +219 @@
         read_sal_configuration();
         read_pal_configuration();
-        
+
         printf("Booting the kernel ...\n");
         jump_to_kernel(&bootinfo);

boot/arch/ia64/src/pal.c

@@ -35 +35 @@
 {
         uint64_t proc_ratio;
-        
+
         pal_static_call_0_1(PAL_FREQ_RATIOS, &proc_ratio);
-        
+
         return proc_ratio;
 }

boot/arch/ia64/src/pal_asm.S

@@ -38 +38 @@
         srlz.i
         srlz.d
-        
+
         mov loc2 = gp
         mov loc3 = rp
-        
+
         addl loc4 = @gprel(pal_proc), gp
 
@@ -48 +48 @@
         mov r30 = in2
         mov r31 = in3 ;;
-        
+
         ld8 loc4 = [loc4]
         movl loc5 = 0f ;;
@@ -64 +64 @@
         cmp.ne p8,p0 = 0, in5
         cmp.ne p9,p0 = 0, in6 ;;
-        
+
 (p7)    st8 [in4] = r9
 (p8)    st8 [in5] = r10
 (p9)    st8 [in6] = r11
-        
+
         mov gp = loc2
         mov rp = loc3 ;;
-        
+
         mov ar.pfs = loc0
         br.ret.sptk.many rp

boot/arch/ia64/src/sal.c

@@ -75 +75 @@
 {
         uint64_t freq;
-        
+
         sal_call_1_1(SAL_FREQ_BASE, 0, &freq);
-        
+
         return freq;
 }

boot/arch/ia64/src/sal_asm.S

@@ -45 +45 @@
 FUNCTION_BEGIN(sal_call)
         alloc loc0 = ar.pfs, 8, 8, 8, 0
-        
+
         adds sp = -STACK_SCRATCH_AREA, sp
 
         mov loc1 = gp
         mov loc2 = rp
-        
+
         addl loc3 = @gprel(sal_proc), gp
         addl loc4 = @gprel(sal_proc_gp), gp
-        
+
         mov out0 = in0
         mov out1 = in1
@@ -62 +62 @@
         mov out6 = in6
         mov out7 = in7 ;;
-        
+
         ld8 loc3 = [loc3]
         ld8 gp = [loc4]
@@ -73 +73 @@
         ld8 loc6 = [r15]
         ld8 loc7 = [r16]
-        
+
         mov b6 = loc3 ;;
         br.call.sptk.many rp = b6
-        
+
         cmp.ne p7,p0 = 0, loc5
         cmp.ne p8,p0 = 0, loc6
         cmp.ne p9,p0 = 0, loc7 ;;
-        
+
 (p7)    st8 [loc5] = r9
 (p8)    st8 [loc6] = r10
 (p9)    st8 [loc7] = r11
-        
+
         mov gp = loc1
         mov rp = loc2
 
         adds sp = STACK_SCRATCH_AREA, sp ;;
-        
+
         mov ar.pfs = loc0
         br.ret.sptk.many rp

boot/arch/ia64/src/ski.c

@@ -37 +37 @@
 {
         static bool initialized = false;
-        
+
         if (initialized)
                 return;
@@ -48 +48 @@
                 : "r15", "r8"
         );
-        
+
         initialized = true;
 }

boot/arch/mips32/src/asm.S

@@ -55 +55 @@
         sw $a3, 0($a0)
 #endif
-        
+
         /*
          * Setup CPU map (on msim this code
@@ -62 +62 @@
          */
         la $a0, PA2KA(CPUMAP_OFFSET)
-        
+
         sw $zero, 0($a0)
         sw $zero, 4($a0)
         sw $zero, 8($a0)
         sw $zero, 12($a0)
-        
+
         sw $zero, 16($a0)
         sw $zero, 20($a0)
         sw $zero, 24($a0)
         sw $zero, 28($a0)
-        
+
         sw $zero, 32($a0)
         sw $zero, 36($a0)
         sw $zero, 40($a0)
         sw $zero, 44($a0)
-        
+
         sw $zero, 48($a0)
         sw $zero, 52($a0)
         sw $zero, 56($a0)
         sw $zero, 60($a0)
-        
+
         sw $zero, 64($a0)
         sw $zero, 68($a0)
         sw $zero, 72($a0)
         sw $zero, 76($a0)
-        
+
         sw $zero, 80($a0)
         sw $zero, 84($a0)
         sw $zero, 88($a0)
         sw $zero, 92($a0)
-        
+
         sw $zero, 96($a0)
         sw $zero, 100($a0)
         sw $zero, 104($a0)
         sw $zero, 108($a0)
-        
+
         sw $zero, 112($a0)
         sw $zero, 116($a0)
         sw $zero, 120($a0)
         sw $zero, 124($a0)
-        
+
         lui $a1, 1
-        
+
 #ifdef MACHINE_msim
-        
+
         /* Read dorder value */
         la $k0, MSIM_DORDER_ADDRESS
         lw $k1, ($k0)
-        
+
         /*
          * If we are not running on BSP
@@ -117 +117 @@
         beq $k1, $zero, bsp
         nop
-        
+
         /* Record CPU presence */
         sll $a2, $k1, 2
         addu $a2, $a2, $a0
         sw $a1, ($a2)
-        
+
         loop:
                 j loop
                 nop
-        
+
 #endif
-        
+
         bsp:
                 /* Record CPU presence */
                 sw $a1, ($a0)
-                
+
                 /* Setup initial stack */
                 la $sp, PA2KA(STACK_OFFSET)
-                
+
                 j bootstrap
                 nop

boot/arch/mips32/src/boot.S

@@ -38 +38 @@
 .global start
 start:
-        
+
         /* Setup CPU map (on msim this code
            is executed in parallel on all CPUs,
            but it not an issue) */
         la $a0, CPUMAP
-        
+
         sw $zero, 0($a0)
         sw $zero, 4($a0)
         sw $zero, 8($a0)
         sw $zero, 12($a0)
-        
+
         sw $zero, 16($a0)
         sw $zero, 20($a0)
         sw $zero, 24($a0)
         sw $zero, 28($a0)
-        
+
         sw $zero, 32($a0)
         sw $zero, 36($a0)
         sw $zero, 40($a0)
         sw $zero, 44($a0)
-        
+
         sw $zero, 48($a0)
         sw $zero, 52($a0)
         sw $zero, 56($a0)
         sw $zero, 60($a0)
-        
+
         sw $zero, 64($a0)
         sw $zero, 68($a0)
         sw $zero, 72($a0)
         sw $zero, 76($a0)
-        
+
         sw $zero, 80($a0)
         sw $zero, 84($a0)
         sw $zero, 88($a0)
         sw $zero, 92($a0)
-        
+
         sw $zero, 96($a0)
         sw $zero, 100($a0)
         sw $zero, 104($a0)
         sw $zero, 108($a0)
-        
+
         sw $zero, 112($a0)
         sw $zero, 116($a0)
         sw $zero, 120($a0)
         sw $zero, 124($a0)
-        
+
         lui $a1, 1
-        
+
 #ifdef MACHINE_msim
-        
+
         /* Read dorder value */
         la $k0, MSIM_DORDER_ADDRESS
         lw $k1, ($k0)
-        
+
         /* If we are not running on BSP
            then end in an infinite loop  */
         beq $k1, $zero, bsp
         nop
-        
+
         /* Record CPU presence */
         sll $a2, $k1, 2
         addu $a2, $a2, $a0
         sw $a1, ($a2)
-        
+
         loop:
                 j loop
                 nop
-        
+
 #endif
-        
+
         bsp:
                 /* Record CPU presence */
                 sw $a1, ($a0)
-                
+
                 /* Setup initial stack */
                 la $sp, INITIAL_STACK
-                
+
                 j bootstrap
                 nop

boot/arch/mips32/src/main.c

@@ -49 +49 @@
 {
         version_print();
-        
+
         printf("\nMemory statistics\n");
         printf(" %p|%p: CPU map\n", (void *) PA2KA(CPUMAP_OFFSET),
@@ -61 +61 @@
         printf(" %p|%p: bootloader entry point\n",
             (void *) PA2KA(LOADER_OFFSET), (void *) LOADER_OFFSET);
-        
+
         size_t i;
         for (i = 0; i < COMPONENTS; i++)
@@ -70 +70 @@
                     components[i].name, components[i].inflated,
                     components[i].size);
-        
+
         void *dest[COMPONENTS];
         size_t top = 0;
@@ -77 +77 @@
         for (i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) {
                 top = ALIGN_UP(top, PAGE_SIZE);
-                
+
                 if (i > 0) {
                         bootinfo->tasks[bootinfo->cnt].addr = TOP2ADDR(top);
                         bootinfo->tasks[bootinfo->cnt].size = components[i].inflated;
-                        
+
                         str_cpy(bootinfo->tasks[bootinfo->cnt].name,
                             BOOTINFO_TASK_NAME_BUFLEN, components[i].name);
-                        
+
                         bootinfo->cnt++;
                 }
-                
+
                 dest[i] = TOP2ADDR(top);
                 top += components[i].inflated;
                 cnt++;
         }
-        
+
         printf("\nInflating components ... ");
-        
+
         for (i = cnt; i > 0; i--) {
 #ifdef MACHINE_msim
@@ -104 +104 @@
                 }
 #endif
-                
+
                 printf("%s ", components[i - 1].name);
-                
+
                 int err = inflate(components[i - 1].addr, components[i - 1].size,
                     dest[i - 1], components[i - 1].inflated);
-                
+
                 if (err != EOK) {
                         printf("\n%s: Inflating error %d, halting.\n",
@@ -116 +116 @@
                 }
         }
-        
+
         printf(".\n");
-        
+
         printf("Copying CPU map ... \n");
-        
+
         bootinfo->cpumap = 0;
         for (i = 0; i < CPUMAP_MAX_RECORDS; i++) {
@@ -126 +126 @@
                         bootinfo->cpumap |= (1 << i);
         }
-        
+
         printf("Booting the kernel ... \n");
         jump_to_kernel((void *) PA2KA(BOOT_OFFSET), bootinfo);

boot/arch/ppc32/src/asm.S

@@ -48 +48 @@
         li \reg, 0
         sync
-        
+
         .rept 64
                 tlbie \reg
                 addi \reg, \reg, 0x1000
         .endr
-        
+
         eieio
         tlbsync
@@ -61 +61 @@
 .macro BAT_COMPUTE base size mask lower upper
         # less than 128 KB -> no BAT
-        
+
         lis \upper, 0x0002
         cmpw \size, \upper
         blt no_bat
-        
+
         # mask = total >> 18
-        
+
         li \upper, 18
         srw \mask, \size, \upper
-        
+
         # create Block Length mask by replicating
         # the leading logical one 14 times
-        
+
         li \upper, 14
         mtctr \mask
         li \upper, 1
-        
+
         0:
                 # mask = (mask >> 1) | mask
-                
+
                 srw \lower, \mask, \upper
                 or \mask, \mask, \lower
-                
+
                 bdnz 0b
-        
+
         # mask = mask & 0x07ff
         # (BAT can map up to 256 MB)
-        
+
         andi. \mask, \mask, 0x07ff
-        
+
         # mask = (mask << 2) | 0x0002
         # (priviledged access only)
-        
+
         li \upper, 2
         slw \mask, \mask, \upper
         ori \mask, \mask, 0x0002
-        
+
         lis \upper, (0x8000 + \base)
         or \upper, \upper, \mask
-        
+
         lis \lower, \base
         ori \lower, \lower, 0x0002
@@ -111 +111 @@
         addi r4, r4, ofw_cif@l
         stw r5, 0(r4)
-        
+
         bl ofw_init
         b bootstrap
@@ -127 +127 @@
         # r5 = pages to translate
         # r6 = real mode meeting point (physical address)
-        
+
         # disable interrupts
-        
+
         mfmsr r31
         rlwinm r31, r31, 0, 17, 15
         mtmsr r31
-        
+
         # set real mode meeting point physical address
-        
+
         mtspr srr0, r6
-        
+
         # jump to real_mode
-        
+
         mfmsr r31
         lis r30, ~0@h
@@ -145 +145 @@
         and r31, r31, r30
         mtspr srr1, r31
-        
+
         sync
         isync
@@ -155 +155 @@
 .align PAGE_WIDTH
 SYMBOL(real_mode)
-        
+
         # arguments:
         # r3 = bootinfo (physical address)
         # r4 = translate table (physical address)
         # r5 = pages to translate
-        
+
         # move the images of components to the proper
         # location using the translate table
-        
+
         li r31, PAGE_SIZE >> 2
         li r30, 0
-        
+
         page_copy:
-                
+
                 cmpwi r5, 0
                 beq copy_end
-                
+
                 mtctr r31
                 lwz r29, 0(r4)
-                
+
                 copy_loop:
-                        
+
                         lwz r28, 0(r29)
                         stw r28, 0(r30)
-                        
+
                         SMC_COHERENCY r30
-                        
+
                         addi r29, r29, 4
                         addi r30, r30, 4
-                        
+
                         bdnz copy_loop
-                
+
                 addi r4, r4, 4
                 subi r5, r5, 1
                 b page_copy
-        
+
         copy_end:
-        
+
         # initially fill segment registers
-        
+
         li r31, 0
-        
+
         li r29, 8
         mtctr r29
         li r30, 0                     # ASID 0 (VSIDs 0 .. 7)
-        
+
         seg_fill_uspace:
-        
+
                 mtsrin r30, r31
                 addi r30, r30, 1
                 addis r31, r31, 0x1000    # move to next SR
-                
+
                 bdnz seg_fill_uspace
-        
+
         li r29, 8
         mtctr r29
         lis r30, 0x4000               # priviledged access only
         ori r30, r30, 8               # ASID 0 (VSIDs 8 .. 15)
-        
+
         seg_fill_kernel:
-        
+
                 mtsrin r30, r31
                 addi r30, r30, 1
                 addis r31, r31, 0x1000    # move to next SR
-                
+
                 bdnz seg_fill_kernel
-        
+
         # invalidate block address translation registers
-        
+
         li r30, 0
-        
+
         mtspr ibat0u, r30
         mtspr ibat0l, r30
-        
+
         mtspr ibat1u, r30
         mtspr ibat1l, r30
-        
+
         mtspr ibat2u, r30
         mtspr ibat2l, r30
-        
+
         mtspr ibat3u, r30
         mtspr ibat3l, r30
-        
+
         mtspr dbat0u, r30
         mtspr dbat0l, r30
-        
+
         mtspr dbat1u, r30
         mtspr dbat1l, r30
-        
+
         mtspr dbat2u, r30
         mtspr dbat2l, r30
-        
+
         mtspr dbat3u, r30
         mtspr dbat3l, r30
-        
+
         # create empty Page Hash Table
         # on top of memory, size 64 KB
-        
+
         lwz r31, 4(r3)                # r31 = memory size
-        
+
         lis r30, 65536@h
         ori r30, r30, 65536@l         # r30 = 65536
-        
+
         subi r29, r30, 1              # r29 = 65535
-        
+
         sub r31, r31, r30
         andc r31, r31, r29            # pht = ALIGN_DOWN(memory_size - 65536, 65536)
-        
+
         mtsdr1 r31
-        
+
         li r29, 2
         srw r30, r30, r29             # r30 = 16384
         li r29, 0
-        
+
         pht_clear:
-                
+
                 # write zeroes
-                
+
                 stw r29, 0(r31)
                 FLUSH_DCACHE r31
-                
+
                 addi r31, r31, 4
                 subi r30, r30, 4
-                
+
                 cmpwi r30, 0
                 beq clear_end
-                
+
                 bdnz pht_clear
-                
+
         clear_end:
-        
+
         # create BAT identity mapping
-        
+
         lwz r31, 4(r3)                # r31 = memory size
-        
+
         lis r30, 268435456@h
         ori r30, r30, 268435456@l     # r30 = 256 MB
-        
+
         # BAT0
-        
+
         # r29 = min(r31, r30)
-        
+
         cmpw r31, r30
         blt bat0_r31
-        
+
                 mr r29, r30
                 b bat0_r30
-        
+
         bat0_r31:
-        
+
                 mr r29, r31
-        
+
         bat0_r30:
-        
+
         BAT_COMPUTE 0x0000 r29 r28 r27 r26
         mtspr ibat0u, r26
         mtspr ibat0l, r27
-        
+
         mtspr dbat0u, r26
         mtspr dbat0l, r27
-        
+
         # BAT1
-        
+
         sub r31, r31, r29             # r31 = r31 - r29
-        
+
         # r29 = min(r31, r30)
-        
+
         cmpw r31, r30
         blt bat1_r31
-        
+
                 mr r29, r30
                 b bat1_r30
-        
+
         bat1_r31:
-        
+
                 mr r29, r31
-        
+
         bat1_r30:
-        
+
         BAT_COMPUTE 0x1000 r29 r28 r27 r26
         mtspr ibat1u, r26
         mtspr ibat1l, r27
-        
+
         mtspr dbat1u, r26
         mtspr dbat1l, r27
-        
+
         # BAT2
-        
+
         sub r31, r31, r29             # r31 = r31 - r29
-        
+
         # r29 = min(r31, r30)
-        
+
         cmpw r31, r30
         blt bat2_r31
-        
+
                 mr r29, r30
                 b bat2_r30
-        
+
         bat2_r31:
-        
+
                 mr r29, r31
-        
+
         bat2_r30:
-        
+
         BAT_COMPUTE 0x2000 r29 r28 r27 r26
         mtspr ibat2u, r26
         mtspr ibat2l, r27
-        
+
         mtspr dbat2u, r26
         mtspr dbat2l, r27
-        
+
         # BAT3
-        
+
         sub r31, r31, r29             # r31 = r31 - r29
-        
+
         # r29 = min(r31, r30)
-        
+
         cmpw r31, r30
         blt bat3_r31
-        
+
                 mr r29, r30
                 b bat3_r30
-        
+
         bat3_r31:
-        
+
                 mr r29, r31
-        
+
         bat3_r30:
-        
+
         BAT_COMPUTE 0x3000 r29 r28 r27 r26
         mtspr ibat3u, r26
         mtspr ibat3l, r27
-        
+
         mtspr dbat3u, r26
         mtspr dbat3l, r27
-        
+
         no_bat:
-        
+
         # flush TLB
-        
+
         TLB_FLUSH r31
-        
+
         # start the kernel
         #
@@ -404 +404 @@
         # sprg3 = physical memory size
         # sp = 0 (enforces the usage of sprg0 as exception stack)
-        
+
         lis r31, PA2KA(BOOT_OFFSET)@ha
         addi r31, r31, PA2KA(BOOT_OFFSET)@l
         mtspr srr0, r31
-        
+
         lis r31, BOOT_OFFSET@ha
         addi r31, r31, BOOT_OFFSET@l
         mtsprg0 r31
-        
+
         # bootinfo starts with a 64 bit integer containing
         # the physical memory size, get the lower 4 bytes
-        
+
         lwz r31, 4(r3)
         mtsprg3 r31
-        
+
         li sp, 0
-        
+
         mfmsr r31
         ori r31, r31, (msr_ir | msr_dr)@l
         mtspr srr1, r31
-        
+
         sync
         isync

boot/arch/ppc32/src/main.c

@@ -60 +60 @@
         version_print();
         ofw_memmap(&bootinfo.memmap);
-        
+
         void *bootinfo_pa = ofw_translate(&bootinfo);
         void *real_mode_pa = ofw_translate(&real_mode);
         void *loader_address_pa = ofw_translate((void *) LOADER_ADDRESS);
-        
+
         printf("\nMemory statistics (total %llu MB)\n", bootinfo.memmap.total >> 20);
         printf(" %p|%p: real mode trampoline\n", &real_mode, real_mode_pa);
@@ -72 +72 @@
         printf(" %p|%p: loader entry point\n",
             (void *) LOADER_ADDRESS, loader_address_pa);
-        
+
         size_t i;
         for (i = 0; i < COMPONENTS; i++)
@@ -78 +78 @@
                     ofw_translate(components[i].addr), components[i].name,
                     components[i].inflated, components[i].size);
-        
+
         size_t dest[COMPONENTS];
         size_t top = 0;
@@ -85 +85 @@
         for (i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) {
                 top = ALIGN_UP(top, PAGE_SIZE);
-                
+
                 if (i > 0) {
                         bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].addr =
@@ -91 +91 @@
                         bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].size =
                             components[i].inflated;
-                        
+
                         str_cpy(bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].name,
                             BOOTINFO_TASK_NAME_BUFLEN, components[i].name);
-                        
+
                         bootinfo.taskmap.cnt++;
                 }
-                
+
                 dest[i] = top;
                 top += components[i].inflated;
                 cnt++;
         }
-        
+
         if (top >= (size_t) loader_address_pa) {
                 printf("Inflated components overlap loader area.\n");
@@ -108 +108 @@
                 halt();
         }
-        
+
         void *balloc_base;
         void *balloc_base_pa;
@@ -114 +114 @@
             BALLOC_MAX_SIZE, loader_address_pa);
         printf(" %p|%p: boot allocator area\n", balloc_base, balloc_base_pa);
-        
+
         void *inflate_base;
         void *inflate_base_pa;
@@ -120 +120 @@
             loader_address_pa);
         printf(" %p|%p: inflate area\n", inflate_base, inflate_base_pa);
-        
+
         uintptr_t balloc_start = ALIGN_UP(top, PAGE_SIZE);
         size_t pages = (balloc_start + ALIGN_UP(BALLOC_MAX_SIZE, PAGE_SIZE))
@@ -129 +129 @@
             pages * sizeof(void *), loader_address_pa);
         printf(" %p|%p: translate table\n", transtable, transtable_pa);
-        
+
         check_overlap("boot allocator area", balloc_base_pa, pages);
         check_overlap("inflate area", inflate_base_pa, pages);
         check_overlap("translate table", transtable_pa, pages);
-        
+
         printf("\nInflating components ... ");
-        
+
         for (i = cnt; i > 0; i--) {
                 printf("%s ", components[i - 1].name);
-                
+
                 int err = inflate(components[i - 1].addr, components[i - 1].size,
                     inflate_base + dest[i - 1], components[i - 1].inflated);
-                
+
                 if (err != EOK) {
                         printf("\n%s: Inflating error %d, halting.\n",
@@ -148 +148 @@
                 }
         }
-        
+
         printf(".\n");
-        
+
         printf("Setting up boot allocator ...\n");
         balloc_init(&bootinfo.ballocs, balloc_base, PA2KA(balloc_start),
             BALLOC_MAX_SIZE);
-        
+
         printf("Setting up screens ...\n");
         ofw_setup_screens();
-        
+
         printf("Canonizing OpenFirmware device tree ...\n");
         bootinfo.ofw_root = ofw_tree_build();
-        
+
         printf("Setting up translate table ...\n");
         for (i = 0; i < pages; i++) {
                 uintptr_t off = i << PAGE_WIDTH;
                 void *phys;
-                
+
                 if (off < balloc_start)
                         phys = ofw_translate(inflate_base + off);
                 else
                         phys = ofw_translate(balloc_base + off - balloc_start);
-                
+
                 ((void **) transtable)[i] = phys;
         }
-        
+
         printf("Booting the kernel...\n");
         jump_to_kernel(bootinfo_pa, transtable_pa, pages, real_mode_pa);

boot/arch/ppc32/src/ofw.c

@@ -43 +43 @@
         if (ch == '\n')
                 ofw_putchar('\r');
-        
+
         if (ascii_check(ch))
                 ofw_putchar(ch);

boot/arch/riscv64/src/asm.S

@@ -85 +85 @@
         li x30, 0
         li x31, 0
-        
+
         /* Set up stack, create stack frame */
         la sp, boot_stack + BOOT_STACK_SIZE
         addi sp, sp, -16
-        
+
         j bootstrap
 
@@ -97 +97 @@
         /* Enable performance counters access in supervisor mode */
         csrsi mcounteren, MCOUNTEREN_CY_MASK | MCOUNTEREN_TM_MASK | MCOUNTEREN_IR_MASK
-        
+
         /* Setup SV48 paging for supervisor mode */
         la t0, ptl_0
         srli t0, t0, 12
-        
+
         li t1, SATP_PFN_MASK
         and t0, t0, t1
-        
+
         li t1, SATP_MODE_SV48
         or t0, t0, t1
-        
+
         csrw sptbr, t0
-        
+
         /* Jump to supervisor mode */
         csrr t0, mstatus
-        
+
         li t1, ~MSTATUS_MPP_MASK
         and t0, t0, t1
-        
+
         /*
          * TODO: Enable running with Supervisor User Mode
@@ -122 +122 @@
         li t1, MSTATUS_MPP_SUPERVISOR | MSTATUS_SUM_MASK
         or t0, t0, t1
-        
+
         csrw mstatus, t0
-        
+
         li ra, PA2KA(BOOT_OFFSET)
         csrw mepc, ra
-        
+
         mret
 FUNCTION_END(jump_to_kernel)

boot/arch/riscv64/src/main.c

@@ -48 +48 @@
 {
         version_print();
-        
+
         bootinfo.htif_frame = ((uintptr_t) &htif_page) >> PAGE_WIDTH;
         bootinfo.pt_frame = ((uintptr_t) &pt_page) >> PAGE_WIDTH;
-        
+
         bootinfo.ucbinfo.tohost =
             (volatile uint64_t *) PA2KA((uintptr_t) &tohost);
         bootinfo.ucbinfo.fromhost =
             (volatile uint64_t *) PA2KA((uintptr_t) &fromhost);
-        
+
         // FIXME TODO: read from device tree
         bootinfo.physmem_start = PHYSMEM_START;
@@ -63 +63 @@
         bootinfo.memmap.zones[0].start = (void *) PHYSMEM_START;
         bootinfo.memmap.zones[0].size = PHYSMEM_SIZE;
-        
+
         printf("\nMemory statistics (total %lu MB, starting at %p)\n\n",
             bootinfo.memmap.total >> 20, (void *) bootinfo.physmem_start);
         printf(" %p: boot info structure\n", &bootinfo);
-        
+
         uintptr_t top = BOOT_OFFSET;
-        
+
         for (size_t i = 0; i < COMPONENTS; i++) {
                 printf(" %p: %s image (%zu/%zu bytes)\n", components[i].addr,
                     components[i].name, components[i].inflated,
                     components[i].size);
-                
+
                 uintptr_t tail = (uintptr_t) components[i].addr +
                     components[i].size;
@@ -83 +83 @@
                 }
         }
-        
+
         printf(" %p: inflate area\n", (void *) top);
-        
+
         void *kernel_entry = NULL;
         void *dest[COMPONENTS];
         size_t cnt = 0;
         bootinfo.taskmap.cnt = 0;
-        
+
         for (size_t i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) {
                 top = ALIGN_UP(top, PAGE_SIZE);
-                
+
                 if (i > 0) {
                         bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].addr =
@@ -99 +99 @@
                         bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].size =
                             components[i].inflated;
-                        
+
                         str_cpy(bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].name,
                             BOOTINFO_TASK_NAME_BUFLEN, components[i].name);
-                        
+
                         bootinfo.taskmap.cnt++;
                 } else
                         kernel_entry = (void *) PA2KA(top);
-                
+
                 dest[i] = (void *) top;
                 top += components[i].inflated;
                 cnt++;
         }
-        
+
         printf(" %p: kernel entry point\n", kernel_entry);
-        
+
         if (top >= bootinfo.physmem_start + bootinfo.memmap.total) {
                 printf("Not enough physical memory available.\n");
@@ -119 +119 @@
                 halt();
         }
-        
+
         printf("\nInflating components ... ");
-        
+
         for (size_t i = cnt; i > 0; i--) {
                 printf("%s ", components[i - 1].name);
-                
+
                 int err = inflate(components[i - 1].addr, components[i - 1].size,
                     dest[i - 1], components[i - 1].inflated);
-                
+
                 if (err != EOK) {
                         printf("\n%s: Inflating error %d, halting.\n",
@@ -134 +134 @@
                 }
         }
-        
+
         printf(".\n");
-        
+
         printf("Booting the kernel...\n");
         jump_to_kernel(PA2KA(&bootinfo));

boot/arch/riscv64/src/ucb.c

@@ -39 +39 @@
         if (!val)
                 return;
-        
+
         fromhost = 0;
 }
@@ -48 +48 @@
             (((uint64_t) cmd) << 48) |
             (payload & UINT64_C(0xffffffffffff));
-        
+
         while (tohost)
                 poll_fromhost();
-        
+
         tohost = val;
 }

boot/arch/sparc64/src/asm.S

@@ -65 +65 @@
 1:
         ! Disable interrupts and disable address masking.
-        
+
         wrpr %g0, PSTATE_PRIV_BIT, %pstate
-        
+
         wrpr %g0, NWINDOWS - 2, %cansave   ! Set maximum saveable windows
         wrpr %g0, 0, %canrestore           ! Get rid of windows we will never need again
         wrpr %g0, 0, %otherwin             ! Make sure the window state is consistent
         wrpr %g0, NWINDOWS - 1, %cleanwin  ! Prevent needless clean_window traps for kernel
-        
+
         set initial_stack, %sp
         add %sp, -STACK_BIAS, %sp
-        
+
         set ofw_cif, %l0
-        
+
         ! Initialize OpenFirmware
-        
+
         call ofw_init
         stx %o4, [%l0]
-        
+
         ba %xcc, bootstrap
         nop
@@ -105 +105 @@
          * 3. Flush instruction pipeline.
          */
-        
+
         /*
          * US3 processors have a write-invalidate cache, so explicitly
@@ -115 +115 @@
         be %xcc, 1f
         nop
-        
+
         0:
                 call icache_flush
                 nop
-        
+
         1:
                 membar #StoreStore
-        
+
         /*
          * Flush the instruction pipeline.
          */
         flush %i7
-        
+
         ! Jump to kernel
         jmp %o3
@@ -138 +138 @@
         set ((ICACHE_SIZE - ICACHE_LINE_SIZE) | ICACHE_SET_BIT), %g1
         stxa %g0, [%g1] ASI_ICACHE_TAG
-        
+
         0:
                 membar #Sync
                 subcc %g1, ICACHE_LINE_SIZE, %g1
                 bnz,pt %xcc, 0b
-        
+
         stxa %g0, [%g1] ASI_ICACHE_TAG
         membar #Sync
         retl
-        
+
         ! SF Erratum #51
-        
+
         nop
 #else
@@ -161 +161 @@
         set ofw_cif, %l0
         ldx [%l0], %l0
-        
+
         rdpr %pstate, %l1
         and %l1, ~PSTATE_AM_BIT, %l2
         wrpr %l2, 0, %pstate
-        
+
         jmpl %l0, %o7
         mov %i0, %o0
-        
+
         wrpr %l1, 0, %pstate
-        
+
         ret
         restore %o0, 0, %o0

boot/arch/sparc64/src/main.c

@@ -86 +86 @@
         phandle root = ofw_find_device("/");
         char compatible[OFW_TREE_PROPERTY_MAX_VALUELEN];
-        
+
         if (ofw_get_property(root, "compatible", compatible,
             OFW_TREE_PROPERTY_MAX_VALUELEN) <= 0) {
@@ -93 +93 @@
                 return;
         }
-        
+
         if (str_cmp(compatible, "sun4v") != 0) {
                 /*
@@ -122 +122 @@
                 : [ver] "=r" (ver)
         );
-        
+
         ver = (ver << 16) >> 48;
-        
+
         if ((ver >= FIRST_US3_CPU) && (ver <= LAST_US3_CPU)) {
                 subarch = SUBARCH_US3;
-                
+
                 if (ver == US_IIIi_CODE)
                         mid_mask = (1 << 5) - 1;
                 else
                         mid_mask = (1 << 10) - 1;
-                
+
         } else if (ver < FIRST_US3_CPU) {
                 subarch = SUBARCH_US;
@@ -193 +193 @@
 {
         version_print();
-        
+
         arch_detect();
         if (arch == ARCH_SUN4U)
@@ -199 +199 @@
         else
                 subarch = SUBARCH_UNKNOWN;
-        
+
         bootinfo.physmem_start = ofw_get_physmem_start();
         ofw_memmap(&bootinfo.memmap);
@@ -205 +205 @@
         if (arch == ARCH_SUN4V)
                 sun4v_fixups();
-        
+
         void *bootinfo_pa = ofw_translate(&bootinfo);
         void *kernel_address_pa = ofw_translate((void *) KERNEL_ADDRESS);
         void *loader_address_pa = ofw_translate((void *) LOADER_ADDRESS);
-        
+
         printf("\nMemory statistics (total %" PRIu64 " MB, starting at %p)\n",
             bootinfo.memmap.total >> 20, (void *) bootinfo.physmem_start);
@@ -217 +217 @@
         printf(" %p|%p: loader entry point\n",
             (void *) LOADER_ADDRESS, (void *) loader_address_pa);
-        
+
         size_t i;
         for (i = 0; i < COMPONENTS; i++)
@@ -223 +223 @@
                     ofw_translate(components[i].addr), components[i].name,
                     components[i].inflated, components[i].size);
-        
+
         void *dest[COMPONENTS];
         size_t top = KERNEL_ADDRESS;
@@ -230 +230 @@
         for (i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) {
                 top = ALIGN_UP(top, PAGE_SIZE);
-                
+
                 if (i > 0) {
                         bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].addr =
@@ -236 +236 @@
                         bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].size =
                             components[i].inflated;
-                        
+
                         str_cpy(bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].name,
                             BOOTINFO_TASK_NAME_BUFLEN, components[i].name);
-                        
+
                         bootinfo.taskmap.cnt++;
                 }
-                
+
                 dest[i] = (void *) top;
                 top += components[i].inflated;
                 cnt++;
         }
-        
+
         printf("\nInflating components ... ");
-        
+
         for (i = cnt; i > 0; i--) {
                 printf("%s ", components[i - 1].name);
-                
+
                 /*
                  * At this point, we claim and map the physical memory that we
@@ -263 +263 @@
                 ofw_claim_phys(bootinfo.physmem_start + dest[i - 1],
                     ALIGN_UP(components[i - 1].inflated, PAGE_SIZE));
-                
+
                 ofw_map(bootinfo.physmem_start + dest[i - 1], dest[i - 1],
                     ALIGN_UP(components[i - 1].inflated, PAGE_SIZE), -1);
-                
+
                 int err = inflate(components[i - 1].addr, components[i - 1].size,
                     dest[i - 1], components[i - 1].inflated);
-                
+
                 if (err != EOK) {
                         printf("\n%s: Inflating error %d, halting.\n",
@@ -276 +276 @@
                 }
         }
-        
+
         printf(".\n");
-        
+
         /*
          * Claim and map the physical memory for the boot allocator.
@@ -290 +290 @@
         balloc_init(&bootinfo.ballocs, balloc_base, (uintptr_t) balloc_base,
             BALLOC_MAX_SIZE);
-        
+
         printf("Setting up screens ...\n");
         ofw_setup_screens();
-        
+
         printf("Canonizing OpenFirmware device tree ...\n");
         bootinfo.ofw_root = ofw_tree_build();
-        
+
         if (arch == ARCH_SUN4U)
                 sun4u_smp();
-        
+
         printf("Booting the kernel ...\n");
         jump_to_kernel(bootinfo.physmem_start | BSP_PROCESSOR, &bootinfo, subarch,

boot/arch/sparc64/src/ofw.c

@@ -47 +47 @@
         if (ch == '\n')
                 ofw_putchar('\r');
-        
+
         if (ascii_check(ch))
                 ofw_putchar(ch);
@@ -72 +72 @@
 {
         size_t cpus;
-        
+
         for (cpus = 0; (child != 0) && (child != (phandle) -1);
             child = ofw_get_peer_node(child), cpus++) {
                 char type_name[OFW_TREE_PROPERTY_MAX_VALUELEN];
-                
+
                 if (ofw_get_property(child, "device_type", type_name,
                     OFW_TREE_PROPERTY_MAX_VALUELEN) > 0) {
                         type_name[OFW_TREE_PROPERTY_MAX_VALUELEN - 1] = 0;
-                        
+
                         if (str_cmp(type_name, "cpu") == 0) {
                                 uint32_t mid;
-                                
+
                                 /*
                                  * "upa-portid" for US, "portid" for US-III,
@@ -92 +92 @@
                                     && (ofw_get_property(child, "cpuid", &mid, sizeof(mid)) <= 0))
                                         continue;
-                                
+
                                 if (current_mid != mid) {
                                         /*
@@ -104 +104 @@
                 }
         }
-        
+
         return cpus;
 }
@@ -115 +115 @@
         /* Get the current CPU MID */
         uint64_t current_mid;
-        
+
         asm volatile (
                 "ldxa [%[zero]] %[asi], %[current_mid]\n"
@@ -122 +122 @@
                   [asi] "i" (ASI_ICBUS_CONFIG)
         );
-        
+
         current_mid >>= ICBUS_CONFIG_MID_SHIFT;
         current_mid &= mid_mask;
-        
+
         /* Wake up the CPUs */
-        
+
         phandle cpus_parent = ofw_find_device("/ssm@0,0");
         if ((cpus_parent == 0) || (cpus_parent == (phandle) -1))
                 cpus_parent = ofw_find_device("/");
-        
+
         phandle node = ofw_get_child_node(cpus_parent);
         size_t cpus = wake_cpus_in_node(node, current_mid, physmem_start);
-        
+
         while ((node != 0) && (node != (phandle) -1)) {
                 char name[OFW_TREE_PROPERTY_MAX_VALUELEN];
-                
+
                 if (ofw_get_property(node, "name", name,
                     OFW_TREE_PROPERTY_MAX_VALUELEN) > 0) {
                         name[OFW_TREE_PROPERTY_MAX_VALUELEN - 1] = 0;
-                        
+
                         if (str_cmp(name, "cmp") == 0) {
                                 phandle subnode = ofw_get_child_node(node);
@@ -148 +148 @@
                         }
                 }
-                
+
                 node = ofw_get_peer_node(node);
         }
-        
+
         if (cpus == 0)
                 printf("Warning: Unable to get CPU properties.\n");
@@ -169 +169 @@
                 halt();
         }
-        
+
         return ((((uintptr_t) memreg[0]) << 32) | memreg[1]);
 }

boot/genarch/include/genarch/ofw_tree.h

@@ -45 +45 @@
         struct ofw_tree_node *peer;
         struct ofw_tree_node *child;
-        
+
         phandle node_handle;            /**< Old OpenFirmware node handle. */
-        
+
         char *da_name;                  /**< Disambigued name. */
-        
+
         size_t properties;              /**< Number of properties. */
         ofw_tree_property_t *property;
-        
+
         void *device;                   /**< Member used solely by the kernel. */
 } ofw_tree_node_t;

boot/genarch/src/division.c

@@ -40 +40 @@
         unsigned int result;
         int steps = sizeof(unsigned int) * 8;
-        
+
         *remainder = 0;
         result = 0;
-        
+
         if (b == 0) {
                 /* FIXME: division by zero */
                 return 0;
         }
-        
+
         if (a < b) {
                 *remainder = a;
                 return 0;
         }
-        
+
         for (; steps > 0; steps--) {
                 /* shift one bit to remainder */
                 *remainder = ((*remainder) << 1) | (( a >> 31) & 0x1);
                 result <<= 1;
-                
+
                 if (*remainder >= b) {
                         *remainder -= b;
@@ -65 +65 @@
                 a <<= 1;
         }
-        
+
         return result;
 }
@@ -74 +74 @@
         unsigned long long result;
         int steps = sizeof(unsigned long long) * 8;
-        
+
         *remainder = 0;
         result = 0;
-        
+
         if (b == 0) {
                 /* FIXME: division by zero */
                 return 0;
         }
-        
+
         if (a < b) {
                 *remainder = a;
                 return 0;
         }
-        
+
         for (; steps > 0; steps--) {
                 /* shift one bit to remainder */
                 *remainder = ((*remainder) << 1) | ((a >> 63) & 0x1);
                 result <<= 1;
-                
+
                 if (*remainder >= b) {
                         *remainder -= b;
@@ -99 +99 @@
                 a <<= 1;
         }
-        
+
         return result;
 }
@@ -108 +108 @@
         unsigned int rem;
         int result = (int) divandmod32(ABSVAL(a), ABSVAL(b), &rem);
-        
+
         if (SGN(a) == SGN(b))
                 return result;
-        
+
         return -result;
 }
@@ -120 +120 @@
         unsigned long long rem;
         long long result = (long long) divandmod64(ABSVAL(a), ABSVAL(b), &rem);
-        
+
         if (SGN(a) == SGN(b))
                 return result;
-        
+
         return -result;
 }
@@ -146 +146 @@
         unsigned int rem;
         divandmod32(a, b, &rem);
-        
+
         /* if divident is negative, remainder must be too */
         if (!(SGN(a)))
                 return -((int) rem);
-        
+
         return (int) rem;
 }
@@ -159 +159 @@
         unsigned long long rem;
         divandmod64(a, b, &rem);
-        
+
         /* if divident is negative, remainder must be too */
         if (!(SGN(a)))
                 return -((long long) rem);
-        
+
         return (long long) rem;
 }
@@ -187 +187 @@
         unsigned int rem;
         int result = (int) divandmod32(ABSVAL(a), ABSVAL(b), &rem);
-        
+
         if (SGN(a) == SGN(b)) {
                 *c = rem;
                 return result;
         }
-        
+
         *c = -rem;
         return -result;
@@ -207 +207 @@
         unsigned long long rem;
         long long result = (int) divandmod64(ABSVAL(a), ABSVAL(b), &rem);
-        
+
         if (SGN(a) == SGN(b)) {
                 *c = rem;
                 return result;
         }
-        
+
         *c = -rem;
         return -result;

boot/genarch/src/multiplication.c

@@ -50 +50 @@
         unsigned int b1 = b >> 16;
         unsigned int b2 = b & UINT16_MAX;
-        
+
         unsigned long long t1 = a1 * b1;
         unsigned long long t2 = a1 * b2;
         t2 += a2 * b1;
         unsigned long long t3 = a2 * b2;
-        
+
         t3 = (((t1 << 16) + t2) << 16) + t3;
-        
+
         return t3;
 }
@@ -67 +67 @@
 {
         char neg = 0;
-        
+
         if (a < 0) {
                 neg = !neg;
                 a = -a;
         }
-        
+
         if (b < 0) {
                 neg = !neg;
                 b = -b;
         }
-        
+
         unsigned long long a1 = a >> 32;
         unsigned long long b1 = b >> 32;
-        
+
         unsigned long long a2 = a & (UINT32_MAX);
         unsigned long long b2 = b & (UINT32_MAX);
-        
+
         if (SOFTINT_CHECK_OF && (a1 != 0) && (b1 != 0)) {
                 /* Error (overflow) */
                 return (neg ? INT64_MIN : INT64_MAX);
         }
-        
+
         /* (if OF checked) a1 or b1 is zero => result fits in 64 bits,
          * no need to another overflow check
          */
         unsigned long long t1 = mul(a1, b2) + mul(b1, a2);
-        
+
         if ((SOFTINT_CHECK_OF) && (t1 > UINT32_MAX)) {
                 /* Error (overflow) */
                 return (neg ? INT64_MIN : INT64_MAX);
         }
-        
+
         t1 = t1 << 32;
         unsigned long long t2 = mul(a2, b2);
         t2 += t1;
-        
+
         /* t2 & (1ull << 63) - if this bit is set in unsigned long long,
          * result does not fit in signed one
@@ -110 +110 @@
                 return (neg ? INT64_MIN : INT64_MAX);
         }
-        
+
         long long result = t2;
         if (neg)
                 result = -result;
-        
+
         return result;
 }

boot/genarch/src/ofw.c

@@ -62 +62 @@
         if (ofw_chosen == (phandle) -1)
                 halt();
-        
+
         if ((ofw_ret_t) ofw_get_property(ofw_chosen, "stdout", &ofw_stdout,
             sizeof(ofw_stdout)) <= 0)
                 ofw_stdout = 0;
-        
+
         ofw_root = ofw_find_device("/");
         if (ofw_root == (phandle) -1) {
@@ -72 +72 @@
                 halt();
         }
-        
+
         if ((ofw_ret_t) ofw_get_property(ofw_chosen, "mmu", &ofw_mmu,
             sizeof(ofw_mmu)) <= 0) {
@@ -83 +83 @@
                 halt();
         }
-        
+
         ofw_memory = ofw_find_device("/memory");
         if (ofw_memory == (phandle) -1) {
@@ -110 +110 @@
         args.nargs = nargs;
         args.nret = nret;
-        
+
         va_list list;
         va_start(list, rets);
-        
+
         size_t i;
         for (i = 0; i < nargs; i++)
                 args.args[i] = va_arg(list, ofw_arg_t);
-        
+
         va_end(list);
-        
+
         for (i = 0; i < nret; i++)
                 args.args[i + nargs] = 0;
-        
+
         (void) ofw(&args);
-        
+
         for (i = 1; i < nret; i++)
                 rets[i - 1] = args.args[i + nargs];
-        
+
         return args.args[nargs];
 }
@@ -161 +161 @@
 {
         ofw_prop_t ret = 1;
-        
+
         if ((ofw_ret_t) ofw_get_property(device, "#address-cells", &ret,
             sizeof(ret)) <= 0)
@@ -167 +167 @@
                     sizeof(ret)) <= 0)
                         ret = OFW_ADDRESS_CELLS;
-        
+
         return (size_t) ret;
 }
@@ -174 +174 @@
 {
         ofw_prop_t ret = 1;
-        
+
         if ((ofw_ret_t) ofw_get_property(device, "#size-cells", &ret,
             sizeof(ret)) <= 0)
@@ -180 +180 @@
                     sizeof(ret)) <= 0)
                         ret = OFW_SIZE_CELLS;
-        
+
         return (size_t) ret;
 }
@@ -198 +198 @@
         if (ofw_stdout == 0)
                 return;
-        
+
         ofw_call("write", 3, 1, NULL, ofw_stdout, &ch, 1);
 }
@@ -210 +210 @@
                 halt();
         }
-        
+
         if (result[0] == false) {
                 printf("Error: Unable to translate virtual address %p, halting.\n",
@@ -216 +216 @@
                 halt();
         }
-        
+
 #ifdef __32_BITS__
         return (void *) result[2];
 #endif
-        
+
 #ifdef __64_BITS__
         return (void *) ((result[2] << 32) | result[3]);
@@ -235 +235 @@
                 halt();
         }
-        
+
         return (void *) addr;
 }
@@ -252 +252 @@
 {
         void *addr = ofw_claim_virt_internal(NULL, len, alignment);
-        
+
         if (addr == NULL) {
                 printf("Error: Unable to claim %zu bytes in virtual memory, halting.\n",
@@ -258 +258 @@
                 halt();
         }
-        
+
         return addr;
 }
@@ -276 +276 @@
          * purposes.
          */
-        
+
 #ifdef __32_BITS__
         ofw_arg_t retaddr[1];
@@ -284 +284 @@
                 halt();
         }
-        
+
         return (void *) retaddr[0];
 #endif
-        
+
 #ifdef __64_BITS__
         ofw_arg_t retaddr[2];
@@ -296 +296 @@
                 halt();
         }
-        
+
         return (void *) ((retaddr[0] << 32) | retaddr[1]);
 #endif
@@ -319 +319 @@
                 halt();
         }
-        
+
         return addr;
 }
@@ -328 +328 @@
         ofw_arg_t phys_hi;
         ofw_arg_t phys_lo;
-        
+
 #ifdef __32_BITS__
         phys_hi = (ofw_arg_t) phys;
         phys_lo = 0;
 #endif
-        
+
 #ifdef __64_BITS__
         phys_hi = (ofw_arg_t) phys >> 32;
         phys_lo = (ofw_arg_t) phys & 0xffffffff;
 #endif
-        
+
         ofw_arg_t ret = ofw_call("call-method", 7, 1, NULL, "map", ofw_mmu, mode,
             ALIGN_UP(size, PAGE_SIZE), virt, phys_hi, phys_lo);
-        
+
         if (ret != 0) {
                 printf("Error: Unable to map %p to %p (size %zu), halting.\n",
@@ -360 +360 @@
         size_t sc = ofw_get_size_cells(ofw_memory) /
             (sizeof(uintptr_t) / sizeof(uint32_t));
-        
+
         uintptr_t buf[((ac + sc) * MEMMAP_MAX_RECORDS)];
-        
+
         /* The number of bytes read */
         ofw_ret_t ret = (ofw_ret_t) ofw_get_property(ofw_memory, "reg", buf,
@@ -370 +370 @@
                 halt();
         }
-        
+
         size_t pos;
         map->total = 0;
@@ -378 +378 @@
                 void *start = (void *) (buf[pos + ac - 1]);
                 uintptr_t size = buf[pos + ac + sc - 1];
-                
+
                 /*
                  * This is a hot fix of the issue which occurs on machines
@@ -389 +389 @@
                     map->zones[map->cnt - 1].size < start))
                         break;
-                
+
                 if (size > 0) {
                         map->zones[map->cnt].start = start;
@@ -397 +397 @@
                 }
         }
-        
+
         if (map->total == 0) {
                 printf("Error: No physical memory detected, halting.\n");
@@ -421 +421 @@
                 *base_pa = ofw_claim_phys_any(size, PAGE_SIZE);
         } while (*base_pa <= min_pa);
-        
+
         *base = ofw_claim_virt_any(size, PAGE_SIZE);
         ofw_map(*base_pa, *base, ALIGN_UP(size, PAGE_SIZE), (ofw_arg_t) -1);
@@ -433 +433 @@
             OFW_TREE_PROPERTY_MAX_VALUELEN) <= 0)
                 return;
-        
+
         device_type[OFW_TREE_PROPERTY_MAX_VALUELEN - 1] = '\0';
         if (str_cmp(device_type, "display") != 0)
                 return;
-        
+
         /* Check for 8 bit depth */
         ofw_prop_t depth;
@@ -443 +443 @@
             sizeof(depth)) <= 0)
                 depth = 0;
-        
+
         /* Get device path */
         ofw_arg_t len = ofw_package_to_path(handle, path, OFW_TREE_PATH_MAX_LEN);
         if (len == (ofw_arg_t) -1)
                 return;
-        
+
         path[len] = '\0';
-        
+
         /* Open the display to initialize it */
         ihandle screen = ofw_open(path);
         if (screen == (ihandle) -1)
                 return;
-        
+
         if (depth == 8) {
                 /* Setup the palette so that the (inverted) 3:2:3 scheme is usable */
@@ -470 +470 @@
         while ((current != 0) && (current != (phandle) -1)) {
                 ofw_setup_screen(current);
-                
+
                 /*
                  * Recursively process the potential child node.
@@ -477 +477 @@
                 if ((child != 0) && (child != (phandle) -1))
                         ofw_setup_screens_internal(child);
-                
+
                 /*
                  * Iteratively process the next peer node.
@@ -493 +493 @@
                         continue;
                 }
-                
+
                 /*
                  * No more peers on this level.

boot/genarch/src/ofw_tree.c

@@ -65 +65 @@
         if (addr)
                 addr[size] = '\0';
-        
+
         return addr;
 }
@@ -98 +98 @@
                 current_node->property = NULL;
                 current_node->device = NULL;
-                
+
                 /*
                  * Get the disambigued name.
@@ -105 +105 @@
                 if (len == (size_t) -1)
                         return;
-                
+
                 path[len] = '\0';
-                
+
                 /* Find last slash */
                 size_t i;
                 for (i = len; (i > 0) && (path[i - 1] != '/'); i--);
-                
+
                 /* Do not include the slash */
                 len -= i;
-                
+
                 /* Add space for trailing '\0' */
                 char *da_name = ofw_tree_space_alloc(len + 1);
                 if (!da_name)
                         return;
-                
+
                 memcpy(da_name, &path[i], len);
                 da_name[len] = '\0';
                 current_node->da_name = (char *) balloc_rebase(da_name);
-                
+
                 /*
                  * Recursively process the potential child node.
@@ -137 +137 @@
                         }
                 }
-                
+
                 /*
                  * Count properties.
@@ -146 +146 @@
                         memcpy(name, name2, OFW_TREE_PROPERTY_MAX_NAMELEN);
                 }
-                
+
                 if (!current_node->properties)
                         return;
-                
+
                 /*
                  * Copy properties.
@@ -157 +157 @@
                 if (!property)
                         return;
-                
+
                 name[0] = '\0';
                 for (i = 0; ofw_next_property(current, name, name2) == 1; i++) {
                         if (i == current_node->properties)
                                 break;
-                        
+
                         memcpy(name, name2, OFW_TREE_PROPERTY_MAX_NAMELEN);
                         memcpy(property[i].name, name, OFW_TREE_PROPERTY_MAX_NAMELEN);
                         property[i].name[OFW_TREE_PROPERTY_MAX_NAMELEN - 1] = '\0';
-                        
+
                         size_t size = ofw_get_proplen(current, name);
                         property[i].size = size;
-                        
+
                         if (size) {
                                 void *buf = ofw_tree_space_alloc(size);
@@ -182 +182 @@
                                 property[i].value = NULL;
                 }
-                
+
                 /* Just in case we ran out of memory. */
                 current_node->properties = i;
                 current_node->property = (ofw_tree_property_t *) balloc_rebase(property);
-                
+
                 /*
                  * Iteratively process the next peer node.
@@ -207 +207 @@
                         }
                 }
-                
+
                 /*
                  * No more peers on this level.
@@ -225 +225 @@
         if (root)
                 ofw_tree_node_process(root, NULL, ofw_root);
-        
+
         /*
          * The firmware client interface does not automatically include the
@@ -241 +241 @@
                 }
         }
-        
+
         return (ofw_tree_node_t *) balloc_rebase(root);
 }

boot/generic/include/printf_core.h

@@ -40 +40 @@
         /* String output function, returns number of printed characters or EOF */
         int (*str_write)(const char *, size_t, void *);
-        
+
         /* User data - output stream specification, state, locks, etc. */
         void *data;

boot/generic/src/balloc.c

@@ -49 +49 @@
         if (alignment == 0)
                 return NULL;
-        
+
         /* Enforce minimal alignment. */
         alignment = ALIGN_UP(alignment, 4);
-        
+
         uintptr_t addr = phys_base + ALIGN_UP(ballocs->size, alignment);
-        
+
         if (ALIGN_UP(ballocs->size, alignment) + size >= max_size)
                 return NULL;
-        
+
         ballocs->size = ALIGN_UP(ballocs->size, alignment) + size;
-        
+
         return (void *) addr;
 }

boot/generic/src/inflate.c

@@ -103 +103 @@
         size_t destlen;   /**< Output buffer size */
         size_t destcnt;   /**< Position in the output buffer */
-        
+
         uint8_t *src;     /**< Input buffer */
         size_t srclen;    /**< Input buffer size */
         size_t srccnt;    /**< Position in the input buffer */
-        
+
         uint16_t bitbuf;  /**< Bit buffer */
         size_t bitlen;    /**< Number of bits in the bit buffer */
-        
+
         bool overrun;     /**< Overrun condition */
 } inflate_state_t;
@@ -240 +240 @@
         /* Bit accumulator for at least 20 bits */
         uint32_t val = state->bitbuf;
-        
+
         while (state->bitlen < cnt) {
                 if (state->srccnt == state->srclen) {
@@ -246 +246 @@
                         return 0;
                 }
-                
+
                 /* Load 8 more bits */
                 val |= ((uint32_t) state->src[state->srccnt]) << state->bitlen;
@@ -252 +252 @@
                 state->bitlen += 8;
         }
-        
+
         /* Update bits in the buffer */
         state->bitbuf = (uint16_t) (val >> cnt);
         state->bitlen -= cnt;
-        
+
         return ((uint16_t) (val & ((1 << cnt) - 1)));
 }
@@ -275 +275 @@
         state->bitbuf = 0;
         state->bitlen = 0;
-        
+
         if (state->srccnt + 4 > state->srclen)
                 return ELIMIT;
-        
+
         uint16_t len =
             state->src[state->srccnt] | (state->src[state->srccnt + 1] << 8);
         uint16_t len_compl =
             state->src[state->srccnt + 2] | (state->src[state->srccnt + 3] << 8);
-        
+
         /* Check block length and its complement */
         if (((int16_t) len) != ~((int16_t) len_compl))
                 return EINVAL;
-        
+
         state->srccnt += 4;
-        
+
         /* Check input buffer size */
         if (state->srccnt + len > state->srclen)
                 return ELIMIT;
-        
+
         /* Check output buffer size */
         if (state->destcnt + len > state->destlen)
                 return ENOMEM;
-        
+
         /* Copy data */
         memcpy(state->dest + state->destcnt, state->src + state->srccnt, len);
         state->srccnt += len;
         state->destcnt += len;
-        
+
         return EOK;
 }
@@ -323 +323 @@
         size_t index = 0;  /* Index of the first code of the given length
                               in the symbol table */
-        
+
         size_t len;  /* Current number of bits in the code */
         for (len = 1; len <= MAX_HUFFMAN_BIT; len++) {
@@ -329 +329 @@
                 code |= get_bits(state, 1);
                 CHECK_OVERRUN(*state);
-                
+
                 uint16_t count = huffman->count[len];
                 if (code < first + count) {
@@ -336 +336 @@
                         return EOK;
                 }
-                
+
                 /* Update for next length */
                 index += count;
@@ -343 +343 @@
                 code <<= 1;
         }
-        
+
         return EINVAL;
 }
@@ -364 +364 @@
         for (len = 0; len <= MAX_HUFFMAN_BIT; len++)
                 huffman->count[len] = 0;
-        
+
         /* We assume that the lengths are within bounds */
         size_t symbol;
         for (symbol = 0; symbol < n; symbol++)
                 huffman->count[length[symbol]]++;
-        
+
         if (huffman->count[0] == n) {
                 /* The code is complete, but decoding will fail */
                 return 0;
         }
-        
+
         /* Check for an over-subscribed or incomplete set of lengths */
         int16_t left = 1;
@@ -385 +385 @@
                 }
         }
-        
+
         /* Generate offsets into symbol table */
         uint16_t offs[MAX_HUFFMAN_BIT + 1];
-        
+
         offs[1] = 0;
         for (len = 1; len < MAX_HUFFMAN_BIT; len++)
                 offs[len + 1] = offs[len] + huffman->count[len];
-        
+
         for (symbol = 0; symbol < n; symbol++) {
                 if (length[symbol] != 0) {
@@ -399 +399 @@
                 }
         }
-        
+
         return left;
 }
@@ -422 +422 @@
 {
         uint16_t symbol;
-        
+
         do {
                 int err = huffman_decode(state, len_code, &symbol);
@@ -429 +429 @@
                         return err;
                 }
-                
+
                 if (symbol < 256) {
                         /* Write out literal */
                         if (state->destcnt == state->destlen)
                                 return ENOMEM;
-                        
+
                         state->dest[state->destcnt] = (uint8_t) symbol;
                         state->destcnt++;
@@ -442 +442 @@
                         if (symbol >= 29)
                                 return EINVAL;
-                        
+
                         size_t len = lens[symbol] + get_bits(state, lens_ext[symbol]);
                         CHECK_OVERRUN(*state);
-                        
+
                         /* Get distance */
                         err = huffman_decode(state, dist_code, &symbol);
                         if (err != EOK)
                                 return err;
-                        
+
                         size_t dist = dists[symbol] + get_bits(state, dists_ext[symbol]);
                         if (dist > state->destcnt)
                                 return ENOENT;
-                        
+
                         if (state->destcnt + len > state->destlen)
                                 return ENOMEM;
-                        
+
                         while (len > 0) {
                                 /* Copy len bytes from distance bytes back */
@@ -467 +467 @@
                 }
         } while (symbol != 256);
-        
+
         return EOK;
 }
@@ -510 +510 @@
         huffman_t dyn_len_code;
         huffman_t dyn_dist_code;
-        
+
         dyn_len_code.count = dyn_len_count;
         dyn_len_code.symbol = dyn_len_symbol;
-        
+
         dyn_dist_code.count = dyn_dist_count;
         dyn_dist_code.symbol = dyn_dist_symbol;
-        
+
         /* Get number of bits in each table */
         uint16_t nlen = get_bits(state, 5) + 257;
         CHECK_OVERRUN(*state);
-        
+
         uint16_t ndist = get_bits(state, 5) + 1;
         CHECK_OVERRUN(*state);
-        
+
         uint16_t ncode = get_bits(state, 4) + 4;
         CHECK_OVERRUN(*state);
-        
+
         if ((nlen > MAX_LITLEN) || (ndist > MAX_DIST)
             || (ncode > MAX_ORDER))
                 return EINVAL;
-        
+
         /* Read code length code lengths */
         uint16_t index;
@@ -537 +537 @@
                 CHECK_OVERRUN(*state);
         }
-        
+
         /* Set missing lengths to zero */
         for (index = ncode; index < MAX_ORDER; index++)
                 length[order[index]] = 0;
-        
+
         /* Build Huffman code */
         int16_t rc = huffman_construct(&dyn_len_code, length, MAX_ORDER);
         if (rc != 0)
                 return EINVAL;
-        
+
         /* Read length/literal and distance code length tables */
         index = 0;
@@ -554 +554 @@
                 if (err != EOK)
                         return EOK;
-                
+
                 if (symbol < 16) {
                         length[index] = symbol;
@@ -560 +560 @@
                 } else {
                         uint16_t len = 0;
-                        
+
                         if (symbol == 16) {
                                 if (index == 0)
                                         return EINVAL;
-                                
+
                                 len = length[index - 1];
                                 symbol = get_bits(state, 2) + 3;
@@ -575 +575 @@
                                 CHECK_OVERRUN(*state);
                         }
-                        
+
                         if (index + symbol > nlen + ndist)
                                 return EINVAL;
-                        
+
                         while (symbol > 0) {
                                 length[index] = len;
@@ -586 +586 @@
                 }
         }
-        
+
         /* Check for end-of-block code */
         if (length[256] == 0)
                 return EINVAL;
-        
+
         /* Build Huffman tables for literal/length codes */
         rc = huffman_construct(&dyn_len_code, length, nlen);
         if ((rc < 0) || ((rc > 0) && (dyn_len_code.count[0] + 1 != nlen)))
                 return EINVAL;
-        
+
         /* Build Huffman tables for distance codes */
         rc = huffman_construct(&dyn_dist_code, length + nlen, ndist);
         if ((rc < 0) || ((rc > 0) && (dyn_dist_code.count[0] + 1 != ndist)))
                 return EINVAL;
-        
+
         return inflate_codes(state, &dyn_len_code, &dyn_dist_code);
 }
@@ -622 +622 @@
         /* Initialize the state */
         inflate_state_t state;
-        
+
         state.dest = (uint8_t *) dest;
         state.destlen = destlen;
         state.destcnt = 0;
-        
+
         state.src = (uint8_t *) src;
         state.srclen = srclen;
         state.srccnt = 0;
-        
+
         state.bitbuf = 0;
         state.bitlen = 0;
-        
+
         state.overrun = false;
-        
+
         uint16_t last;
         int ret = 0;
-        
+
         do {
                 /* Last block is indicated by a non-zero bit */
                 last = get_bits(&state, 1);
                 CHECK_OVERRUN(state);
-                
+
                 /* Block type */
                 uint16_t type = get_bits(&state, 2);
                 CHECK_OVERRUN(state);
-                
+
                 switch (type) {
                 case 0:
@@ -662 +662 @@
                 }
         } while ((!last) && (ret == 0));
-        
+
         return ret;
 }

boot/generic/src/memstr.c

@@ -46 +46 @@
         uint8_t *dp = (uint8_t *) dst;
         const uint8_t *sp = (uint8_t *) src;
-        
+
         while (cnt-- != 0)
                 *dp++ = *sp++;
-        
+
         return dst;
 }
@@ -67 +67 @@
 {
         uint8_t *dp = (uint8_t *) dst;
-        
+
         while (cnt-- != 0)
                 *dp++ = val;
-        
+
         return dst;
 }
@@ -91 +91 @@
         if (src == dst)
                 return dst;
-        
+
         /* Non-overlapping? */
         if ((dst >= src + cnt) || (src >= dst + cnt))
                 return memcpy(dst, src, cnt);
-        
+
         uint8_t *dp;
         const uint8_t *sp;
-        
+
         /* Which direction? */
         if (src > dst) {
@@ -104 +104 @@
                 dp = dst;
                 sp = src;
-                
+
                 while (cnt-- != 0)
                         *dp++ = *sp++;
@@ -111 +111 @@
                 dp = dst + (cnt - 1);
                 sp = src + (cnt - 1);
-                
+
                 while (cnt-- != 0)
                         *dp-- = *sp--;
         }
-        
+
         return dst;
 }

boot/generic/src/printf.c

@@ -37 +37 @@
         int ret;
         va_list args;
-        
+
         va_start(args, fmt);
-        
+
         ret = vprintf(fmt, args);
-        
+
         va_end(args);
-        
+
         return ret;
 }

boot/generic/src/printf_core.c

@@ -138 +138 @@
         if (str == NULL)
                 return printf_putnchars(nullstr, str_size(nullstr), ps);
-        
+
         return ps->str_write((void *) str, str_size(str), ps->data);
 }
@@ -154 +154 @@
         if (!ascii_check(ch))
                 return ps->str_write((void *) &invalch, 1, ps->data);
-        
+
         return ps->str_write(&ch, 1, ps->data);
 }
@@ -180 +180 @@
                 }
         }
-        
+
         if (printf_putchar(ch, ps) > 0)
                 counter++;
-        
+
         while (--width > 0) {
                 /*
@@ -192 +192 @@
                         counter++;
         }
-        
+
         return (int) (counter);
 }
@@ -210 +210 @@
         if (str == NULL)
                 return printf_putstr(nullstr, ps);
-        
+
         /* Print leading spaces. */
         size_t strw = str_length(str);
         if ((precision == 0) || (precision > strw))
                 precision = strw;
-        
+
         /* Left padding */
         size_t counter = 0;
@@ -225 +225 @@
                 }
         }
-        
+
         /* Part of @a str fitting into the alloted space. */
         int retval;
@@ -231 +231 @@
         if ((retval = printf_putnchars(str, size, ps)) < 0)
                 return -counter;
-        
+
         counter += retval;
-        
+
         /* Right padding */
         while (width-- > 0) {
@@ -264 +264 @@
         else
                 digits = digits_small;
-        
+
         char data[PRINT_NUMBER_BUFFER_SIZE];
         char *ptr = &data[PRINT_NUMBER_BUFFER_SIZE - 1];
-        
+
         /* Size of number with all prefixes and signs */
         int size = 0;
-        
+
         /* Put zero at end of string */
         *ptr-- = 0;
-        
+
         if (num == 0) {
                 *ptr-- = '0';
@@ -283 +283 @@
                 } while (num /= base);
         }
-        
+
         /* Size of plain number */
         int number_size = size;
-        
+
         /*
          * Collect the sum of all prefixes/signs/etc. to calculate padding and
@@ -305 +305 @@
                 }
         }
-        
+
         char sgn = 0;
         if (flags & __PRINTF_FLAG_SIGNED) {
@@ -319 +319 @@
                 }
         }
-        
+
         if (flags & __PRINTF_FLAG_LEFTALIGNED)
                 flags &= ~__PRINTF_FLAG_ZEROPADDED;
-        
+
         /*
          * If the number is left-aligned or precision is specified then
@@ -331 +331 @@
                         precision = width - size + number_size;
         }
-        
+
         /* Print leading spaces */
         if (number_size > precision) {
@@ -337 +337 @@
                 precision = number_size;
         }
-        
+
         width -= precision + size - number_size;
         size_t counter = 0;
-        
+
         if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) {
                 while (width-- > 0) {
@@ -347 +347 @@
                 }
         }
-        
+
         /* Print sign */
         if (sgn) {
@@ -353 +353 @@
                         counter++;
         }
-        
+
         /* Print prefix */
         if (flags & __PRINTF_FLAG_PREFIX) {
@@ -386 +386 @@
                 }
         }
-        
+
         /* Print leading zeroes */
         precision -= number_size;
@@ -393 +393 @@
                         counter++;
         }
-        
+
         /* Print the number itself */
         int retval;
         if ((retval = printf_putstr(++ptr, ps)) > 0)
                 counter += retval;
-        
+
         /* Print trailing spaces */
-        
+
         while (width-- > 0) {
                 if (printf_putchar(' ', ps) == 1)
                         counter++;
         }
-        
+
         return ((int) counter);
 }
@@ -497 +497 @@
         size_t nxt = 0;  /* Index of the next character from fmt */
         size_t j = 0;    /* Index to the first not printed nonformating character */
-        
+
         size_t counter = 0;   /* Number of characters printed */
         int retval;           /* Return values from nested functions */
-        
+
         while (true) {
                 i = nxt;
                 wchar_t uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
-                
+
                 if (uc == 0)
                         break;
-                
+
                 /* Control character */
                 if (uc == '%') {
@@ -519 +519 @@
                                 counter += retval;
                         }
-                        
+
                         j = i;
-                        
+
                         /* Parse modifiers */
                         uint32_t flags = 0;
                         bool end = false;
-                        
+
                         do {
                                 i = nxt;
@@ -549 +549 @@
                                 };
                         } while (!end);
-                        
+
                         /* Width & '*' operator */
                         int width = 0;
@@ -556 +556 @@
                                         width *= 10;
                                         width += uc - '0';
-                                        
+
                                         i = nxt;
                                         uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
@@ -575 +575 @@
                                 }
                         }
-                        
+
                         /* Precision and '*' operator */
                         int precision = 0;
@@ -585 +585 @@
                                                 precision *= 10;
                                                 precision += uc - '0';
-                                                
+
                                                 i = nxt;
                                                 uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
@@ -604 +604 @@
                                 }
                         }
-                        
+
                         qualifier_t qualifier;
-                        
+
                         switch (uc) {
                         case 't':
@@ -653 +653 @@
                                 qualifier = PrintfQualifierInt;
                         }
-                        
+
                         unsigned int base = 10;
-                        
+
                         switch (uc) {
                         /*
@@ -662 +662 @@
                         case 's':
                                 retval = print_str(va_arg(ap, char *), width, precision, flags, ps);
-                                
+
                                 if (retval < 0) {
                                         counter = -counter;
                                         goto out;
                                 }
-                                
+
                                 counter += retval;
                                 j = nxt;
@@ -673 +673 @@
                         case 'c':
                                 retval = print_char(va_arg(ap, unsigned int), width, flags, ps);
-                                
+
                                 if (retval < 0) {
                                         counter = -counter;
                                         goto out;
                                 };
-                                
+
                                 counter += retval;
                                 j = nxt;
                                 goto next_char;
-                        
+
                         /*
                          * Integer values
@@ -714 +714 @@
                                 base = 16;
                                 break;
-                        
+
                         /* Percentile itself */
                         case '%':
                                 j = i;
                                 goto next_char;
-                        
+
                         /*
                          * Bad formatting.
@@ -730 +730 @@
                                 goto next_char;
                         }
-                        
+
                         /* Print integers */
                         size_t size;
                         uint64_t number;
-                        
+
                         switch (qualifier) {
                         case PrintfQualifierByte:
@@ -774 +774 @@
                                 goto out;
                         }
-                        
+
                         if ((retval = print_number(number, width, precision,
                             base, flags, ps)) < 0) {
@@ -780 +780 @@
                                 goto out;
                         }
-                        
+
                         counter += retval;
                         j = nxt;
@@ -787 +787 @@
                 ;
         }
-        
+
         if (i > j) {
                 if ((retval = printf_putnchars(&fmt[j], i - j, ps)) < 0) {
@@ -796 +796 @@
                 counter += retval;
         }
-        
+
 out:
         return ((int) counter);

boot/generic/src/str.c

@@ -141 +141 @@
         if (*offset + 1 > size)
                 return 0;
-        
+
         /* First byte read from string */
         uint8_t b0 = (uint8_t) str[(*offset)++];
-        
+
         /* Determine code length */
-        
+
         unsigned int b0_bits;  /* Data bits in first byte */
         unsigned int cbytes;   /* Number of continuation bytes */
-        
+
         if ((b0 & 0x80) == 0) {
                 /* 0xxxxxxx (Plain ASCII) */
@@ -170 +170 @@
                 return U_SPECIAL;
         }
-        
+
         if (*offset + cbytes > size)
                 return U_SPECIAL;
-        
+
         wchar_t ch = b0 & LO_MASK_8(b0_bits);
-        
+
         /* Decode continuation bytes */
         while (cbytes > 0) {
                 uint8_t b = (uint8_t) str[(*offset)++];
-                
+
                 /* Must be 10xxxxxx */
                 if ((b & 0xc0) != 0x80)
                         return U_SPECIAL;
-                
+
                 /* Shift data bits to ch */
                 ch = (ch << CONT_BITS) | (wchar_t) (b & LO_MASK_8(CONT_BITS));
                 cbytes--;
         }
-        
+
         return ch;
 }
@@ -211 +211 @@
         if (*offset >= size)
                 return EOVERFLOW;
-        
+
         if (!chr_check(ch))
                 return EINVAL;
-        
+
         /* Unsigned version of ch (bit operations should only be done
            on unsigned types). */
         uint32_t cc = (uint32_t) ch;
-        
+
         /* Determine how many continuation bytes are needed */
-        
+
         unsigned int b0_bits;  /* Data bits in first byte */
         unsigned int cbytes;   /* Number of continuation bytes */
-        
+
         if ((cc & ~LO_MASK_32(7)) == 0) {
                 b0_bits = 7;
@@ -240 +240 @@
                 return EINVAL;
         }
-        
+
         /* Check for available space in buffer */
         if (*offset + cbytes >= size)
                 return EOVERFLOW;
-        
+
         /* Encode continuation bytes */
         unsigned int i;
@@ -251 +251 @@
                 cc = cc >> CONT_BITS;
         }
-        
+
         /* Encode first byte */
         str[*offset] = (cc & LO_MASK_32(b0_bits)) | HI_MASK_8(8 - b0_bits - 1);
-        
+
         /* Advance offset */
         *offset += cbytes + 1;
-        
+
         return EOK;
 }
@@ -274 +274 @@
 {
         size_t size = 0;
-        
+
         while (*str++ != 0)
                 size++;
-        
+
         return size;
 }
@@ -298 +298 @@
         size_t len = 0;
         size_t offset = 0;
-        
+
         while (len < max_len) {
                 if (str_decode(str, &offset, STR_NO_LIMIT) == 0)
                         break;
-                
+
                 len++;
         }
-        
+
         return offset;
 }
@@ -320 +320 @@
         size_t len = 0;
         size_t offset = 0;
-        
+
         while (str_decode(str, &offset, STR_NO_LIMIT) != 0)
                 len++;
-        
+
         return len;
 }
@@ -336 +336 @@
         if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 127))
                 return true;
-        
+
         return false;
 }
@@ -349 +349 @@
         if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 1114111))
                 return true;
-        
+
         return false;
 }
@@ -375 +375 @@
         wchar_t c1 = 0;
         wchar_t c2 = 0;
-        
+
         size_t off1 = 0;
         size_t off2 = 0;
-        
+
         while (true) {
                 c1 = str_decode(s1, &off1, STR_NO_LIMIT);
                 c2 = str_decode(s2, &off2, STR_NO_LIMIT);
-                
+
                 if (c1 < c2)
                         return -1;
-                
+
                 if (c1 > c2)
                         return 1;
-                
+
                 if ((c1 == 0) || (c2 == 0))
                         break;
         }
-        
+
         return 0;
 }
@@ -412 +412 @@
         size_t src_off = 0;
         size_t dest_off = 0;
-        
+
         wchar_t ch;
         while ((ch = str_decode(src, &src_off, STR_NO_LIMIT)) != 0) {
@@ -418 +418 @@
                         break;
         }
-        
+
         dest[dest_off] = '\0';
 }

boot/generic/src/vprintf.c

@@ -40 +40 @@
         size_t offset = 0;
         size_t chars = 0;
-        
+
         while (offset < size) {
                 putchar(str_decode(str, &offset, size));
                 chars++;
         }
-        
+
         return chars;
 }
@@ -54 +54 @@
         size_t chars = 0;
         wchar_t uc;
-        
+
         while ((uc = str_decode(str, &offset, STR_NO_LIMIT)) != 0) {
                 putchar(uc);
                 chars++;
         }
-        
+
         return chars;
 }
@@ -69 +69 @@
                 NULL
         };
-        
+
         int ret = printf_core(fmt, &ps, ap);
-        
+
         return ret;
 }