Changeset a35b458 in mainline for boot/arch/riscv64/src

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/arch/riscv64/src

Files:

• asm.S (modified) (3 diffs)
• main.c (modified) (6 diffs)
• ucb.c (modified) (2 diffs)

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;
 }