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

Timestamp:

2018-03-02T20:10:49Z (7 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/ia64/src

Files:

• main.c (modified) (14 diffs)
• pal.c (modified) (1 diff)
• pal_asm.S (modified) (3 diffs)
• sal.c (modified) (1 diff)
• sal_asm.S (modified) (3 diffs)
• ski.c (modified) (2 diffs)

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